Author: qboosh Date: Thu Oct 7 19:54:37 2010 GMT Module: packages Tag: HEAD ---- Log message: - added link patch to reduce linking with X libs and libpython
---- Files affected: packages/fontforge: fontforge.spec (1.25 -> 1.26) , fontforge-link.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/fontforge/fontforge.spec diff -u packages/fontforge/fontforge.spec:1.25 packages/fontforge/fontforge.spec:1.26 --- packages/fontforge/fontforge.spec:1.25 Thu Oct 7 07:13:52 2010 +++ packages/fontforge/fontforge.spec Thu Oct 7 21:54:31 2010 @@ -8,8 +8,9 @@ Group: X11/Applications/Publishing Source0: http://dl.sourceforge.net/fontforge/%{name}_full-%{version}.tar.bz2 # Source0-md5: 5f3d20d645ec1aa2b7b4876386df8717 -Patch0: %{name}-sonames.patch +Patch0: %{name}-link.patch Patch1: %{name}-python2.7.patch +#Patch0: %{name}-sonames.patch URL: http://fontforge.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -25,8 +26,8 @@ BuildRequires: libxml2-devel BuildRequires: pango-devel BuildRequires: pkgconfig -BuildRequires: python-devel -BuildRequires: python-modules +BuildRequires: python-devel >= 2.3 +BuildRequires: python-modules >= 2.3 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXi-devel Requires: iconv @@ -64,8 +65,7 @@ %prep %setup -q -# hardcoded in code is +- same as hardcoded at compile time -#%patch0 -p1 +%patch0 -p1 %patch1 -p1 %build @@ -143,6 +143,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.26 2010/10/07 19:54:31 qboosh +- added link patch to reduce linking with X libs and libpython + Revision 1.25 2010/10/07 05:13:52 qboosh - added -devel package - BR: cairo-devel pango-devel ================================================================ Index: packages/fontforge/fontforge-link.patch diff -u /dev/null packages/fontforge/fontforge-link.patch:1.3 --- /dev/null Thu Oct 7 21:54:37 2010 +++ packages/fontforge/fontforge-link.patch Thu Oct 7 21:54:31 2010 @@ -0,0 +1,58 @@ +--- fontforge-20100501/configure.in.orig 2009-12-27 00:18:48.000000000 +0100 ++++ fontforge-20100501/configure.in 2010-10-07 09:20:42.775738529 +0200 +@@ -21,6 +21,8 @@ + AC_SUBST(LINK_WITH_GDRAW) + X_11LIB=-lX11 + GDRAW_LIB=libgdraw ++dnl this is abused later: originally contains -lSM -lICE, which are not needed ++X_PRE_LIBS= + exeOBJECTS=fontforge_UIOBJECTS + LINK_WITH_GDRAW=../libgdraw.la + if test "$no_x" = "yes"; then +@@ -61,7 +63,6 @@ + oldCPPFLAGS="$CPPFLAGS" + gww_extraincludes="" + oldLDFLAGS="$LDFLAGS" +-LDFLAGS="$LDFLAGS -L/usr/local/lib" + + case "$host" in + *-apple-darwin*) +@@ -285,12 +286,17 @@ + fi + PyLib=`$python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('LIBPL') + '/' + distutils.sysconfig.get_config_var('LDLIBRARY'))"` + if test "$py_lib" != "" ; then +- LIBS="$LIBS $py_lib" ++ LIBPYTHON="$py_lib" + elif test "$PyLib" != "" -a -e "$PyLib" ; then +- LIBS="$LIBS $PyLib" ++ LIBPYTHON="$PyLib" + else ++ save_LIBS="$LIBS" ++ LIBS= + AC_SEARCH_LIBS(Py_Main, $PyName python, : , python="no") ++ LIBPYTHON="$LIBS" ++ LIBS="$save_LIBS" + fi ++ AC_SUBST([LIBPYTHON]) + fi + else + python="no" +--- fontforge-20100501/fontforge/Makefile.dynamic.in.orig 2010-10-07 09:25:42.675742720 +0200 ++++ fontforge-20100501/fontforge/Makefile.dynamic.in 2010-10-07 20:30:48.611745234 +0200 +@@ -20,6 +20,7 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + STATIC_LIBS = @STATIC_LIBS@ ++LIBPYTHON = @LIBPYTHON@ + + FF_VERSION=1 + FF_REVISION=0 +@@ -71,7 +72,7 @@ + ../libgunicode.la \ + $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm + LIBLIBS = -rpath $(libdir) ../libgutils.la ../libgunicode.la \ +- @LIBS@ $(STATIC_LIBS) -lm ++ @LIBS@ $(STATIC_LIBS) $(LIBPYTHON) -lm + DLIBS = -rpath $(libdir) ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm + + all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fontforge/fontforge.spec?r1=1.25&r2=1.26&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fontforge/fontforge-link.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
