From 19aeb17e70095632dbcc9cd71011c2aac5d18f19 Mon Sep 17 00:00:00 2001 From: "Gregory M. Tuner" Date: Mon, 17 Mar 2014 02:19:20 -0700 Subject: media-gfx/fontforge: multilib python header finding Signed-off-by: Gregory M. Tuner --- .../files/fontforge-20110222-libz.so-linkage.patch | 66 ++++++++++++++++++++++ .../files/fontforge-20110222-lxkbui.patch | 13 +++++ .../fontforge-20110222-remove-useless-extern.patch | 11 ++++ media-gfx/fontforge/files/fontforge-desktop.patch | 16 ++++++ media-gfx/fontforge/files/fontforge-py27.diff | 11 ++++ 5 files changed, 117 insertions(+) create mode 100644 media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch create mode 100644 media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch create mode 100644 media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch create mode 100644 media-gfx/fontforge/files/fontforge-desktop.patch create mode 100644 media-gfx/fontforge/files/fontforge-py27.diff (limited to 'media-gfx/fontforge/files') diff --git a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch new file mode 100644 index 0000000..7e01e8a --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch @@ -0,0 +1,66 @@ +https://bugs.gentoo.org/show_bug.cgi?id=367425 + +diff -ruN fontforge-20110222~/fontforge/parsepdf.c fontforge-20110222/fontforge/parsepdf.c +--- fontforge-20110222~/fontforge/parsepdf.c 2011-02-15 05:37:39.000000000 +0200 ++++ fontforge-20110222/fontforge/parsepdf.c 2011-05-17 22:19:56.000000000 +0300 +@@ -759,7 +759,11 @@ + if ( zlib!=NULL ) + return( true ); + +- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) { ++ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ++#ifdef SO_1_EXT ++ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL ++#endif ++ ) { + LogError( "%s", dlerror()); + return( false ); + } +diff -ruN fontforge-20110222~/fontforge/svg.c fontforge-20110222/fontforge/svg.c +--- fontforge-20110222~/fontforge/svg.c 2011-02-18 23:33:27.000000000 +0200 ++++ fontforge-20110222/fontforge/svg.c 2011-05-17 22:19:56.000000000 +0300 +@@ -1153,7 +1153,11 @@ + if ( xmltested ) + return( libxml!=NULL ); + +- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY); ++ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY) ++#ifdef SO_1_EXT ++ || dlopen("libz" SO_1_EXT,RTLD_LAZY) ++#endif ++ ; + + libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY); + # ifdef SO_2_EXT +diff -ruN fontforge-20110222~/fontforge/ufo.c fontforge-20110222/fontforge/ufo.c +--- fontforge-20110222~/fontforge/ufo.c 2011-02-17 02:20:37.000000000 +0200 ++++ fontforge-20110222/fontforge/ufo.c 2011-05-17 22:19:56.000000000 +0300 +@@ -929,7 +929,11 @@ + if ( xmltested ) + return( libxml!=NULL ); + +- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY); ++ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY) ++#ifdef SO_1_EXT ++ || dlopen("libz" SO_1_EXT,RTLD_LAZY) ++#endif ++ ; + + libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY); + # ifdef SO_2_EXT +diff -ruN fontforge-20110222~/fontforge/woff.c fontforge-20110222/fontforge/woff.c +--- fontforge-20110222~/fontforge/woff.c 2011-02-15 05:37:40.000000000 +0200 ++++ fontforge-20110222/fontforge/woff.c 2011-05-17 22:19:56.000000000 +0300 +@@ -76,7 +76,11 @@ + if ( zlib!=NULL ) + return( true ); + +- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) { ++ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ++#ifdef SO_1_EXT ++ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL ++#endif ++ ) { + LogError( "%s", dlerror()); + return( false ); + } diff --git a/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch b/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch new file mode 100644 index 0000000..b344bc9 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch @@ -0,0 +1,13 @@ +=== modified file 'configure.in' +--- a/configure.in ++++ b/configure.in +@@ -36,7 +36,7 @@ + dnl /usr/share/doc/XFree86-doc-4.2.0/Xi/lib.PS + + AC_CHECK_LIB(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 ) +- AC_CHECK_LIB(xkbui, XkbQueryExtension, X_11LIB="$X_11LIB -lxkbui" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm ) ++ AC_CHECK_LIB(X11, XkbQueryExtension, ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm ) + fi + + gww_define_caps_for_alt="dontknow" + diff --git a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch new file mode 100644 index 0000000..f7e7152 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch @@ -0,0 +1,11 @@ +diff -Naur fontforge-20110222.orig/gutils/gimagereadrgb.c fontforge-20110222/gutils/gimagereadrgb.c +--- fontforge-20110222.orig/gutils/gimagereadrgb.c 2013-05-05 18:03:18.884623199 +0000 ++++ fontforge-20110222/gutils/gimagereadrgb.c 2013-05-05 18:03:35.452624126 +0000 +@@ -86,7 +86,6 @@ + + static void find_scanline(FILE *fp,struct sgiheader *header,int cur, + unsigned long *starttab,unsigned char **ptrtab) { +- extern int fgetc(FILE *); + int (*getthingamy)(FILE *) = header->bpc==1?fgetc:getshort; + int ch,i,cnt,val; + unsigned char *pt; diff --git a/media-gfx/fontforge/files/fontforge-desktop.patch b/media-gfx/fontforge/files/fontforge-desktop.patch new file mode 100644 index 0000000..ba8ac10 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-desktop.patch @@ -0,0 +1,16 @@ +diff --git a/Packaging/fontforge.desktop b/Packaging/fontforge.desktop +index a66b28b..18e049c 100644 +--- a/Packaging/fontforge.desktop ++++ b/Packaging/fontforge.desktop +@@ -8,9 +8,8 @@ Comment[ru]=Редактор шрифтов + Comment[fr]=Un constructeur des polices + Comment[zh_TW]=FontForge 描邊字型編輯器 + Exec=fontforge +-Icon=fontforge.png ++Icon=fontforge + Terminal=false + Type=Application +-Categories=Application;Graphics; +-Encoding=UTF-8 ++Categories=Graphics; + MimeType=application/vnd.font-fontforge-sfd;application/x-font-ttf;application/x-font-otf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-tex; diff --git a/media-gfx/fontforge/files/fontforge-py27.diff b/media-gfx/fontforge/files/fontforge-py27.diff new file mode 100644 index 0000000..24f98e1 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-py27.diff @@ -0,0 +1,11 @@ +--- fontforge/ffpython.h 2010/02/04 17:42:36 1.8 ++++ fontforge/ffpython.h 2010/09/12 08:30:00 1.9 +@@ -62,7 +62,7 @@ + #define PyMODINIT_FUNC void + #endif + +-#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 5) ++#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 7) + #define PyBytesObject PyStringObject + #define PyBytes_Type PyString_Type + -- cgit v1.2.3-65-gdbad