packages: libwmf/libwmf-png12.patch, libwmf/libwmf.spec - rel 19; link with...

[arekm]

Author: arekm                        Date: Wed Feb  8 18:42:49 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 19; link with libpng instead of libpng14

---- Files affected:
packages/libwmf:
   libwmf-png12.patch (1.2 -> 1.3) , libwmf.spec (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: packages/libwmf/libwmf-png12.patch
diff -u packages/libwmf/libwmf-png12.patch:1.2 packages/libwmf/libwmf-png12.patch:1.3
--- packages/libwmf/libwmf-png12.patch:1.2	Thu Jan 28 17:55:59 2010
+++ packages/libwmf/libwmf-png12.patch	Wed Feb  8 19:42:43 2012
@@ -1,31 +1,3 @@
-diff -aurN libwmf-0.2.8.4.orig/configure.ac libwmf-0.2.8.4/configure.ac
---- libwmf-0.2.8.4.orig/configure.ac	2005-07-27 22:48:39.000000000 +0200
-+++ libwmf-0.2.8.4/configure.ac	2006-07-12 21:05:54.101107895 +0200
-@@ -520,12 +520,12 @@
- CPPFLAGS="$CPPFLAGS $WMF_Z_CFLAGS"
- 
- AC_CHECK_HEADER(png.h,[
--	AC_CHECK_LIB(png,png_write_image,[
-+	AC_CHECK_LIB(png14,png_write_image,[
- 		if [ test "x$PNG_DIR" != "x" ]; then
- 			WMF_PNG_CFLAGS="-I$PNG_DIR/include"
--			WMF_PNG_LDFLAGS="-L$PNG_DIR/lib -lpng"
-+			WMF_PNG_LDFLAGS="-L$PNG_DIR/lib -lpng14"
- 		else
--			WMF_PNG_LDFLAGS="-lpng"
-+			WMF_PNG_LDFLAGS="-lpng14"
- 		fi
- 	],[	AC_MSG_ERROR(* * * unable to find libpng which is required by libwmf * * *)
- 	],-lz -lm)
-@@ -645,7 +645,7 @@
- 
- 	CPPFLAGS="$CPPFLAGS $WMF_FT_CFLAGS $WMF_PNG_CFLAGS $WMF_Z_CFLAGS"
- 	LDFLAGS="$LDFLAGS $WMF_FT_LDFLAGS $WMF_PNG_LDFLAGS $WMF_Z_LDFLAGS"
--	other_libs="$other_libs -lfreetype -lpng -lz -lm"
-+	other_libs="$other_libs -lfreetype -lpng14 -lz -lm"
- 
- 	AC_CHECK_HEADER(gd.h,[
- 		AC_CHECK_LIB(gd,gdClipSetAdd,[
 --- libwmf-0.2.8.4/src/extra/gd/gd_png.c	2005-07-27 22:35:06.000000000 +0200
 +++ libwmf-0.2.8.4/src/extra/gd/gd_png.c.new	2010-01-28 18:47:25.381590959 +0100
 @@ -136,7 +136,7 @@

================================================================
Index: packages/libwmf/libwmf.spec
diff -u packages/libwmf/libwmf.spec:1.103 packages/libwmf/libwmf.spec:1.104
--- packages/libwmf/libwmf.spec:1.103	Wed Feb  8 14:30:55 2012
+++ packages/libwmf/libwmf.spec	Wed Feb  8 19:42:43 2012
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	libwmf - biblioteka z funkcjami do konwersji plików WMF
 Name:		libwmf
 Version:	0.2.8.4
-Release:	18
+Release:	19
 Epoch:		2
 License:	LGPL v2+
 Group:		Applications/Text
@@ -209,6 +209,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2012/02/08 18:42:43  arekm
+- rel 19; link with libpng instead of libpng14
+
 Revision 1.103  2012/02/08 13:30:55  arekm
 - release 18
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libwmf/libwmf-png12.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libwmf/libwmf.spec?r1=1.103&r2=1.104&f=u