File abiword-2.8.1-libpng.patch of Package mingw32-abiword

Overview Repositories Revisions Requests Users Attributes Meta

File abiword-2.8.1-libpng.patch of Package mingw32-abiword (Revision 345710af41f199f1d36803fadf7b81d7)

Currently displaying revision 345710af41f199f1d36803fadf7b81d7 , Show latest

--- plugins/rsvg/Makefile.am	(revision 28677)
+++ plugins/rsvg/Makefile.am	(working copy)
@@ -6,7 +6,7 @@
 
 rsvg_la_LIBADD = \
 	xp/libxp.la \
-	$(RSVG_LIBS) -lpng12
+	$(RSVG_LIBS) $(PNG_LIBS)
 
 rsvg_la_LDFLAGS = \
 	-avoid-version \
--- plugins/garble/Makefile.am	(revision 28677)
+++ plugins/garble/Makefile.am	(working copy)
@@ -8,7 +8,7 @@
 
 garble_la_LIBADD = \
 	xp/libxp.la \
-	$(GARBLE_LIBS) -lpng12 -ljpeg
+	$(GARBLE_LIBS) $(PNG_LIBS) -ljpeg
 
 garble_la_LDFLAGS = \
 	$(GARBLE_LIBS) \
--- plugins/bmp/plugin.m4	(revision 28677)
+++ plugins/bmp/plugin.m4	(working copy)
@@ -14,8 +14,8 @@
 
 # TODO check for libpng, well abiword links to it anyways
 
-BMP_CFLAGS="$BMP_CFLAGS "'${PLUGIN_CFLAGS}'
-BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng12'
+BMP_CFLAGS="$BMP_CFLAGS $PNG_CFLAGS "'${PLUGIN_CFLAGS}'
+BMP_LIBS="$BMP_LIBS $PNG_LIBS "'${PLUGIN_LIBS}'
 
 if test "$enable_bmp_builtin" == "yes"; then
 	BMP_CFLAGS="$BMP_CFLAGS -DABI_PLUGIN_BUILTIN"
--- plugins/paint/plugin.m4	(revision 28677)
+++ plugins/paint/plugin.m4	(working copy)
@@ -8,7 +8,8 @@
 
 # TODO check for libpng
 if test "$TOOLKIT" == "win"; then
-	PAINT_LIBS="-lgdi32 -lpng12"
+	PAINT_LIBS="-lgdi32 $PNG_LIBS"
+	PAINT_CFLAGS="$PAINT_CFLAGS $PNG_CFLAGS"
 fi
 
 PAINT_CFLAGS="$PAINT_CFLAGS "'${PLUGIN_CFLAGS}'
--- plugins/psion/plugin.m4	(revision 28601)
+++ plugins/psion/plugin.m4	(working copy)
@@ -60,8 +60,8 @@
 
 test "$enable_psion" == "auto" && PLUGINS="$PLUGINS psion"
 
-PSION_CFLAGS="$PSION_CFLAGS "'${PLUGIN_CFLAGS}'
-PSION_LIBS="$PSION_LIBS "'${PLUGIN_LIBS}'
+PSION_CFLAGS="$PSION_CFLAGS $PNG_CFLAGS "'${PLUGIN_CFLAGS}'
+PSION_LIBS="$PSION_LIBS $PNG_LIBS -lgsf-1 "'${PLUGIN_LIBS}'
 
 fi
 
--- plugins/garble/plugin.m4	(revision 28679)
+++ plugins/garble/plugin.m4	(working copy)
@@ -22,8 +22,8 @@
 
 test "$enable_garble" == "auto" && PLUGINS="$PLUGINS garble"
 
-GARBLE_CFLAGS="$GARBLE_CFLAGS "'${PLUGIN_CFLAGS}'
-GARBLE_LIBS="$GARBLE_LIBS "'${PLUGIN_LIBS}'
+GARBLE_CFLAGS="$GARBLE_CFLAGS $PNG_CFLAGS "'${PLUGIN_CFLAGS}'
+GARBLE_LIBS="$GARBLE_LIBS $PNG_LIBS "'${PLUGIN_LIBS}'
 
 if test "$enable_garble_builtin" == "yes"; then
 	GARBLE_CFLAGS="$GARBLE_CFLAGS -DABI_PLUGIN_BUILTIN"
--- configure.in	(revision 28677)
+++ configure.in	(working copy)
@@ -460,12 +460,25 @@
 # Dependency tests
 #
 
-# TODO need to check for libpng too, at least on win32
-# check using pkg-config instead
-AC_CHECK_HEADER([png.h], [], 
-[
-	AC_MSG_ERROR([`png.h' not found, install libpng or specify CPPFLAGS to include custom locations])
-])
+# We need libpng
+for l in libpng libpng14 libpng12; do
+  AC_MSG_CHECKING(for $l)
+  if $PKG_CONFIG --exists $l ; then
+    AC_MSG_RESULT(yes)
+    PKG_CHECK_MODULES(PNG, $l, [abi_cv_png=yes],[abi_cv_png=no])
+    break
+  else
+    AC_MSG_RESULT(no)
+  fi
+done
+if test x$abi_cv_png != xyes; then
+  AC_CHECK_HEADER([png.h], [], 
+  [
+    AC_MSG_ERROR([`png.h' not found, install libpng or specify CPPFLAGS to include custom locations])
+  ])
+  PNG_CFLAGS=
+  PNG_LIBS=-lpng
+fi
 
 # We need ljpeg
 AC_CHECK_HEADER(jpeglib.h,[
@@ -491,7 +504,7 @@
 	deps_pkgs="$deps_pkgs $win_pkgs"
 	# nonstandard dlls go below the blank line
 	SYSTEM_LIBS="-ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -lkernel32 -lole32 -loleaut32 -lshell32 -luser32 -luuid -lversion -lwinspool \
-		     -lpng12 -lz -ljpeg"
+		      $PNG_LIBS -lz -ljpeg"
 	SYSTEM_CFLAGS="-mthreads"
 elif test "$TOOLKIT" == "cocoa"; then
 	deps_pkgs="$deps_pkgs $cocoa_pkgs"

Places

File abiword-2.8.1-libpng.patch of Package mingw32-abiword (Revision 345710af41f199f1d36803fadf7b81d7)

Places