| 1 |
pva 11/10/02 17:43:30 |
| 2 |
|
| 3 |
Added: fontforge-20110222-libz.so-linkage.patch |
| 4 |
Log: |
| 5 |
Fix zlib linkage, bug #367425 thank Siim Ainsaar for the patch. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.20/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: fontforge-20110222-libz.so-linkage.patch |
| 16 |
=================================================================== |
| 17 |
https://bugs.gentoo.org/show_bug.cgi?id=367425 |
| 18 |
|
| 19 |
diff -ruN fontforge-20110222~/fontforge/parsepdf.c fontforge-20110222/fontforge/parsepdf.c |
| 20 |
--- fontforge-20110222~/fontforge/parsepdf.c 2011-02-15 05:37:39.000000000 +0200 |
| 21 |
+++ fontforge-20110222/fontforge/parsepdf.c 2011-05-17 22:19:56.000000000 +0300 |
| 22 |
@@ -759,7 +759,11 @@ |
| 23 |
if ( zlib!=NULL ) |
| 24 |
return( true ); |
| 25 |
|
| 26 |
- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) { |
| 27 |
+ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL |
| 28 |
+#ifdef SO_1_EXT |
| 29 |
+ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL |
| 30 |
+#endif |
| 31 |
+ ) { |
| 32 |
LogError( "%s", dlerror()); |
| 33 |
return( false ); |
| 34 |
} |
| 35 |
diff -ruN fontforge-20110222~/fontforge/svg.c fontforge-20110222/fontforge/svg.c |
| 36 |
--- fontforge-20110222~/fontforge/svg.c 2011-02-18 23:33:27.000000000 +0200 |
| 37 |
+++ fontforge-20110222/fontforge/svg.c 2011-05-17 22:19:56.000000000 +0300 |
| 38 |
@@ -1153,7 +1153,11 @@ |
| 39 |
if ( xmltested ) |
| 40 |
return( libxml!=NULL ); |
| 41 |
|
| 42 |
- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY); |
| 43 |
+ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY) |
| 44 |
+#ifdef SO_1_EXT |
| 45 |
+ || dlopen("libz" SO_1_EXT,RTLD_LAZY) |
| 46 |
+#endif |
| 47 |
+ ; |
| 48 |
|
| 49 |
libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY); |
| 50 |
# ifdef SO_2_EXT |
| 51 |
diff -ruN fontforge-20110222~/fontforge/ufo.c fontforge-20110222/fontforge/ufo.c |
| 52 |
--- fontforge-20110222~/fontforge/ufo.c 2011-02-17 02:20:37.000000000 +0200 |
| 53 |
+++ fontforge-20110222/fontforge/ufo.c 2011-05-17 22:19:56.000000000 +0300 |
| 54 |
@@ -929,7 +929,11 @@ |
| 55 |
if ( xmltested ) |
| 56 |
return( libxml!=NULL ); |
| 57 |
|
| 58 |
- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY); |
| 59 |
+ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY) |
| 60 |
+#ifdef SO_1_EXT |
| 61 |
+ || dlopen("libz" SO_1_EXT,RTLD_LAZY) |
| 62 |
+#endif |
| 63 |
+ ; |
| 64 |
|
| 65 |
libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY); |
| 66 |
# ifdef SO_2_EXT |
| 67 |
diff -ruN fontforge-20110222~/fontforge/woff.c fontforge-20110222/fontforge/woff.c |
| 68 |
--- fontforge-20110222~/fontforge/woff.c 2011-02-15 05:37:40.000000000 +0200 |
| 69 |
+++ fontforge-20110222/fontforge/woff.c 2011-05-17 22:19:56.000000000 +0300 |
| 70 |
@@ -76,7 +76,11 @@ |
| 71 |
if ( zlib!=NULL ) |
| 72 |
return( true ); |
| 73 |
|
| 74 |
- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) { |
| 75 |
+ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL |
| 76 |
+#ifdef SO_1_EXT |
| 77 |
+ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL |
| 78 |
+#endif |
| 79 |
+ ) { |
| 80 |
LogError( "%s", dlerror()); |
| 81 |
return( false ); |
| 82 |
} |
Archives