From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 133841395E3 for ; Sun, 13 Nov 2016 01:29:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E673E0C5C; Sun, 13 Nov 2016 01:29:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29B4CE0B2B for ; Sun, 13 Nov 2016 01:29:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38BEC341655 for ; Sun, 13 Nov 2016 01:29:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F4FB24AF for ; Sun, 13 Nov 2016 01:29:27 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1479000545.2a1d3b576aa34dbb58823e5ea82eeb93cabc7267.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/fontforge/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch media-gfx/fontforge/files/fontforge-desktop.patch media-gfx/fontforge/files/fontforge-py27.diff X-VCS-Directories: media-gfx/fontforge/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 2a1d3b576aa34dbb58823e5ea82eeb93cabc7267 X-VCS-Branch: master Date: Sun, 13 Nov 2016 01:29:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: da67dda3-6fc6-42ad-899d-85f71348a1c8 X-Archives-Hash: 04f168e15054b9f6d09bd4d2a57b8e3f commit: 2a1d3b576aa34dbb58823e5ea82eeb93cabc7267 Author: Mike Gilbert gentoo org> AuthorDate: Sun Nov 13 01:29:05 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Nov 13 01:29:05 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1d3b57 media-gfx/fontforge: remove obsolete patches Package-Manager: portage-2.3.2_p5 .../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 deletions(-) diff --git a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch deleted file mode 100644 index 7e01e8a..00000000 --- a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index b344bc9..00000000 --- a/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== 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 deleted file mode 100644 index f7e7152..00000000 --- a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index ba8ac10..00000000 --- a/media-gfx/fontforge/files/fontforge-desktop.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 24f98e1..00000000 --- a/media-gfx/fontforge/files/fontforge-py27.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -