Author: arekm Date: Tue Sep 6 16:29:14 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; enable more stuff; patches from fedora
---- Files affected: packages/fontforge: fontforge.spec (1.29 -> 1.30) , fontforge-20090224-pythondl.patch (NONE -> 1.1) (NEW), fontforge-20100501-select-points-crash.patch (NONE -> 1.1) (NEW), fontforge-20110222-multilib.patch (NONE -> 1.1) (NEW), fontforge-sonames.patch (1.5 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/fontforge/fontforge.spec diff -u packages/fontforge/fontforge.spec:1.29 packages/fontforge/fontforge.spec:1.30 --- packages/fontforge/fontforge.spec:1.29 Wed Aug 24 22:07:37 2011 +++ packages/fontforge/fontforge.spec Tue Sep 6 18:29:09 2011 @@ -3,13 +3,15 @@ Summary(pl.UTF-8): Edytor fontów rysowanych Name: fontforge Version: 20110222 -Release: 1 +Release: 2 License: BSD Group: X11/Applications/Publishing Source0: http://dl.sourceforge.net/fontforge/%{name}_full-%{version}.tar.bz2 # Source0-md5: 5be4dda345b5d73a27cc399df96e463a Patch0: %{name}-link.patch -#Patch0: %{name}-sonames.patch +Patch1: fontforge-20090224-pythondl.patch +Patch2: fontforge-20100501-select-points-crash.patch +Patch3: fontforge-20110222-multilib.patch URL: http://fontforge.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -66,6 +68,9 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p0 %build %{__libtoolize} @@ -73,11 +78,19 @@ %{__autoconf} %configure \ --enable-type3 \ + --enable-multilayer \ --enable-devicetables \ --enable-longdouble \ + --enable-gb12345 \ + --enable-pasteafter \ + --enable-tilepath \ + --enable-pyextension \ --with-freetype-bytecode \ --with-regular-link \ - --without-freetype-src + --without-freetype-src \ + --with-pango \ + --with-cairo \ + --with-x %{__make} @@ -139,6 +152,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2011/09/06 16:29:09 arekm +- rel 2; enable more stuff; patches from fedora + Revision 1.29 2011/08/24 20:07:37 arekm - up to 20110222 ================================================================ Index: packages/fontforge/fontforge-20090224-pythondl.patch diff -u /dev/null packages/fontforge/fontforge-20090224-pythondl.patch:1.1 --- /dev/null Tue Sep 6 18:29:14 2011 +++ packages/fontforge/fontforge-20090224-pythondl.patch Tue Sep 6 18:29:09 2011 @@ -0,0 +1,41 @@ +diff -Nur fontforge-20090224.orig/configure fontforge-20090224/configure +--- fontforge-20090224.orig/configure 2008-12-24 14:04:18.000000000 -0700 ++++ fontforge-20090224/configure 2009-04-01 22:56:07.000000000 -0600 +@@ -26670,6 +26670,7 @@ + else + PYLIBS="" + fi ++ PYDEFINES="$PYDEFINES, ('SOLIBDIR','\"$libdir/\"')" + PY=pyhook/setup.py + fi + +diff -Nur fontforge-20090224.orig/pyhook/loadfontforge.h fontforge-20090224/pyhook/loadfontforge.h +--- fontforge-20090224.orig/pyhook/loadfontforge.h 2007-12-23 19:28:35.000000000 -0700 ++++ fontforge-20090224/pyhook/loadfontforge.h 2009-04-01 22:49:08.000000000 -0600 +@@ -11,7 +11,7 @@ + + if ( (lib = dlopen("libgunicode" SO_EXT,RTLD_LAZY))==NULL ) { + #ifdef PREFIX +- lib = dlopen( PREFIX "/lib/" "libgunicode" SO_EXT,RTLD_LAZY); ++ lib = dlopen( SOLIBDIR "libgunicode.so.3" ,RTLD_LAZY); + #endif + } + if ( lib==NULL ) { +@@ -21,7 +21,7 @@ + + if ( (lib = dlopen("libgutils" SO_EXT,RTLD_LAZY))==NULL ) { + #ifdef PREFIX +- lib = dlopen( PREFIX "/lib/" "libgutils" SO_EXT,RTLD_LAZY); ++ lib = dlopen( SOLIBDIR "libgutils.so.1" ,RTLD_LAZY); + #endif + } + if ( lib==NULL ) { +@@ -31,7 +31,7 @@ + + if ( (lib = dlopen("libfontforge" SO_EXT,RTLD_LAZY))==NULL ) { + #ifdef PREFIX +- lib = dlopen( PREFIX "/lib/" "libfontforge" SO_EXT,RTLD_LAZY); ++ lib = dlopen( SOLIBDIR "libfontforge.so.1" ,RTLD_LAZY); + #endif + } + if ( lib==NULL ) { ================================================================ Index: packages/fontforge/fontforge-20100501-select-points-crash.patch diff -u /dev/null packages/fontforge/fontforge-20100501-select-points-crash.patch:1.1 --- /dev/null Tue Sep 6 18:29:14 2011 +++ packages/fontforge/fontforge-20100501-select-points-crash.patch Tue Sep 6 18:29:09 2011 @@ -0,0 +1,11 @@ +--- fontforge-20100501.orig/fontforge/charview.c 2010-04-15 03:26:28.000000000 +0100 ++++ fontforge-20100501/fontforge/charview.c 2011-03-01 15:09:22.821753002 +0000 +@@ -8597,7 +8597,7 @@ + static int CVNumForePointsSelected(CharView *cv, BasePoint **bp) { + SplineSet *spl; + SplinePoint *test, *first; +- BasePoint *bps[4]; ++ BasePoint *bps[5]; + int i, cnt; + + if ( cv->b.drawmode!=dm_fore ) ================================================================ Index: packages/fontforge/fontforge-20110222-multilib.patch diff -u /dev/null packages/fontforge/fontforge-20110222-multilib.patch:1.1 --- /dev/null Tue Sep 6 18:29:14 2011 +++ packages/fontforge/fontforge-20110222-multilib.patch Tue Sep 6 18:29:09 2011 @@ -0,0 +1,11 @@ +--- configure.bak 2011-02-19 00:55:16.000000000 +0530 ++++ configure 2011-04-07 10:43:26.442012820 +0530 +@@ -4676,7 +4676,7 @@ + LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices $LIBS" + + ;; +-powerpc-*-*linux*) ++powerpc*-*-*linux*) + $as_echo "#define _Keyboard 3" >>confdefs.h + + ;; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fontforge/fontforge.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
