diff options
| author | Treeve Jelbert | 2014-12-19 21:48:51 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2014-12-19 21:48:51 +0100 |
| commit | 49cdee5510033c94303511bde2ec31aca21efa09 (patch) | |
| tree | 2af7a2077183e8fce3ec384f0a2163d6eb2810cf /xorg-lib | |
| parent | deb3ca90c2aa4fee28f6ecd0d16e4230f11c1f99 (diff) | |
| parent | a5b16150d2c1e8d0aa7668eb0d218ef15a9a8a1b (diff) | |
Merge remote-tracking branch 'origin/master' into devel-xorg-modular
Conflicts:
gnu/gcc/HISTORY
gnu/gcc/PRE_BUILD
Diffstat (limited to 'xorg-lib')
| -rw-r--r-- | xorg-lib/libxft/HISTORY | 3 | ||||
| -rwxr-xr-x | xorg-lib/libxft/PRE_BUILD | 4 | ||||
| -rw-r--r-- | xorg-lib/libxft/fix-freetype-includes.patch | 19 |
3 files changed, 26 insertions, 0 deletions
diff --git a/xorg-lib/libxft/HISTORY b/xorg-lib/libxft/HISTORY index 0f6e8fcd6e..29c8d1b04c 100644 --- a/xorg-lib/libxft/HISTORY +++ b/xorg-lib/libxft/HISTORY @@ -1,3 +1,6 @@ +2014-12-04 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD, fix-freetype-includes.patch: Added to compile against freetype2 2.5.0+ + 2014-09-25 Remko van der Vossen <wich@sourcemage.org> * DEPENDS: missing depends diff --git a/xorg-lib/libxft/PRE_BUILD b/xorg-lib/libxft/PRE_BUILD new file mode 100755 index 0000000000..2fb1dad860 --- /dev/null +++ b/xorg-lib/libxft/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +message "${MESSAGE_COLOR}Fixing compilation against ${SPELL_COLOR}freetype2${DEFAULT_COLOR}" && +patch "${SOURCE_DIRECTORY}"/src/xftglyphs.c \ + "${SPELL_DIRECTORY}"/fix-freetype-includes.patch diff --git a/xorg-lib/libxft/fix-freetype-includes.patch b/xorg-lib/libxft/fix-freetype-includes.patch new file mode 100644 index 0000000000..d36c3a7b15 --- /dev/null +++ b/xorg-lib/libxft/fix-freetype-includes.patch @@ -0,0 +1,19 @@ +# Modified from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733385 +diff -Naur libXft-2.2.0.orig/src/xftglyphs.c libXft-2.2.0/src/xftglyphs.c +--- libXft-2.2.0.orig/src/xftglyphs.c 2009-10-16 14:27:08.000000000 -0700 ++++ libXft-2.2.0/src/xftglyphs.c 2014-12-04 15:03:54.485358680 -0800 +@@ -21,10 +21,12 @@ + */ + + #include "xftint.h" +-#include <freetype/ftoutln.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H ++#include FT_LCD_FILTER_H + + #if HAVE_FT_GLYPHSLOT_EMBOLDEN +-#include <freetype/ftsynth.h> ++#include FT_SYNTHESIS_H + #endif + + static const int filters[3][3] = { |