SOURCES: libwmf-png12.patch (NEW) - fix libpng detedtion/linking c...

freetz freetz at pld-linux.org
Wed Jul 12 21:09:48 CEST 2006


Author: freetz                       Date: Wed Jul 12 19:09:48 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix libpng detedtion/linking caused by braindamaged libpng soname change

---- Files affected:
SOURCES:
   libwmf-png12.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/libwmf-png12.patch
diff -u /dev/null SOURCES/libwmf-png12.patch:1.1
--- /dev/null	Wed Jul 12 21:09:48 2006
+++ SOURCES/libwmf-png12.patch	Wed Jul 12 21:09:42 2006
@@ -0,0 +1,28 @@
+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(png12,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 -lpng12"
+ 		else
+-			WMF_PNG_LDFLAGS="-lpng"
++			WMF_PNG_LDFLAGS="-lpng12"
+ 		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 -lpng12 -lz -lm"
+ 
+ 	AC_CHECK_HEADER(gd.h,[
+ 		AC_CHECK_LIB(gd,gdClipSetAdd,[
================================================================


More information about the pld-cvs-commit mailing list