1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
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 );
}
|
GitWeb
