fontforge: 20110222 -> 20120119

This commit is contained in:
Danny Rawlins 2012-06-25 00:26:46 +10:00
parent 1d87d38fde
commit 24096dc7a8
4 changed files with 17 additions and 82 deletions

View File

@ -90,6 +90,10 @@ lrwxrwxrwx root/root usr/lib/libgutils.so.1 -> libgutils.so.1.0.3
-rwxr-xr-x root/root usr/lib/libgutils.so.1.0.3
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/fontforge.pc
drwxr-xr-x root/root usr/lib/python2.7/
drwxr-xr-x root/root usr/lib/python2.7/site-packages/
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/fontforge.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/psMat.so
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/fontforge.1.gz
@ -98,9 +102,10 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/sfddiff.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/fontforge/
-rw-r--r-- root/root usr/share/fontforge/Adobe-CNS1-5.cidmap
-rw-r--r-- root/root usr/share/fontforge/Adobe-CNS1-6.cidmap
-rw-r--r-- root/root usr/share/fontforge/Adobe-GB1-5.cidmap
-rw-r--r-- root/root usr/share/fontforge/Adobe-Identity-0.cidmap
-rw-r--r-- root/root usr/share/fontforge/Adobe-Japan1-5.cidmap
-rw-r--r-- root/root usr/share/fontforge/Adobe-Japan1-6.cidmap
-rw-r--r-- root/root usr/share/fontforge/Adobe-Japan2-0.cidmap
-rw-r--r-- root/root usr/share/fontforge/Adobe-Korea1-2.cidmap

View File

@ -1,3 +1 @@
063691163e592515b31514515bb3ce8c cidmaps.tgz
d0a4a99a711e60b91bef3e2944e49cdb fontforge-20110222-libz.so-linkage.patch
5be4dda345b5d73a27cc399df96e463a fontforge_full-20110222.tar.bz2
5f302eeb1835019aedc495780d6363f8 fontforge-20120119.tar.xz

View File

@ -5,27 +5,25 @@
# Depends on: freetype libpng libtiff libungif libuninameslist xorg-libxi xorg-libxkbui
name=fontforge
version=20110222
version=20120119
release=1
source=(http://downloads.sourceforge.net/project/$name/fontforge-source/fontforge_full-$version.tar.bz2
http://fontforge.sourceforge.net/cidmaps.tgz
fontforge-20110222-libz.so-linkage.patch)
source=(http://www.hvlinux.net/crux/distfiles/$name/$name-$version.tar.xz)
build() {
cd $name-$version
patch -p 1 -i $SRC/fontforge-20110222-libz.so-linkage.patch
install -d $PKG/usr/share/fontforge
cp $SRC/*.cidmap $PKG/usr/share/fontforge/
./configure \
--prefix=/usr \
--mandir=/usr/man \
--without-freetype-src \
--disable-static
--enable-type3 \
--enable-devicetables \
--enable-double \
--with-regular-link \
--enable-pyextension \
--disable-freetype
make
make install DESTDIR=$PKG
rm -r $PKG/usr/share/locale
rm -r $PKG/usr/share/{locale,doc}
find $PKG -name '*.egg-info' | xargs rm -rf
}

View File

@ -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 );
}