Author: sls Date: Fri Feb 5 16:22:11 2010 GMT Module: packages Tag: HEAD ---- Log message: - added libpngX.patch
---- Files affected: packages/abiword: abiword.spec (1.181 -> 1.182) , libpngX.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/abiword/abiword.spec diff -u packages/abiword/abiword.spec:1.181 packages/abiword/abiword.spec:1.182 --- packages/abiword/abiword.spec:1.181 Fri Jan 29 21:49:12 2010 +++ packages/abiword/abiword.spec Fri Feb 5 17:22:05 2010 @@ -23,6 +23,7 @@ Source0: http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.gz # Source0-md5: 284fe25289c160c3797b527a8aacad12 Patch0: %{name}-desktop.patch +Patch1: libpngX.patch URL: http://www.abisource.com/ BuildRequires: aiksaurus-gtk-devel >= 1.2.1 BuildRequires: aspell-devel >= 0.60.4 @@ -310,6 +311,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # use generic icon name sed -i -e 's|abiword_48.png|abiword.png|' Makefile.am @@ -481,6 +483,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.182 2010/02/05 16:22:05 sls +- added libpngX.patch + Revision 1.181 2010/01/29 20:49:12 arekm - release 3 ================================================================ Index: packages/abiword/libpngX.patch diff -u /dev/null packages/abiword/libpngX.patch:1.1 --- /dev/null Fri Feb 5 17:22:11 2010 +++ packages/abiword/libpngX.patch Fri Feb 5 17:22:06 2010 @@ -0,0 +1,33 @@ +--- abiword-2.8.1/plugins/garble/Makefile.am.orig 2009-10-20 17:07:49.000000000 +0200 ++++ abiword-2.8.1/plugins/garble/Makefile.am 2010-02-05 17:05:16.644285818 +0100 +@@ -8,7 +8,7 @@ plugin_LTLIBRARIES = garble.la + + garble_la_LIBADD = \ + xp/libxp.la \ +- $(GARBLE_LIBS) -lpng12 -ljpeg ++ $(GARBLE_LIBS) -lpng -ljpeg + + garble_la_LDFLAGS = \ + $(GARBLE_LIBS) \ +--- abiword-2.8.1/plugins/rsvg/Makefile.am.orig 2009-10-20 17:07:49.000000000 +0200 ++++ abiword-2.8.1/plugins/rsvg/Makefile.am 2010-02-05 17:05:16.870953670 +0100 +@@ -6,7 +6,7 @@ plugin_LTLIBRARIES = rsvg.la + + rsvg_la_LIBADD = \ + xp/libxp.la \ +- $(RSVG_LIBS) -lpng12 ++ $(RSVG_LIBS) -lpng + + rsvg_la_LDFLAGS = \ + -avoid-version \ +--- abiword-2.8.1/plugin-configure.m4.orig 2010-02-05 17:05:54.863451295 +0100 ++++ abiword-2.8.1/plugin-configure.m4 2010-02-05 17:06:05.057616795 +0100 +@@ -1553,7 +1553,7 @@ if test "$enable_bmp" == "yes" || \ + # TODO check for libpng, well abiword links to it anyways + + BMP_CFLAGS="$BMP_CFLAGS "'${PLUGIN_CFLAGS}' +-BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng12' ++BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng' + + if test "$enable_bmp_builtin" == "yes"; then + BMP_CFLAGS="$BMP_CFLAGS -DABI_PLUGIN_BUILTIN" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/abiword/abiword.spec?r1=1.181&r2=1.182&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
