packages: gd/gd.spec - fixed build for libpng >= 1.4

amateja amateja at pld-linux.org
Thu Jan 28 13:35:44 CET 2010


Author: amateja                      Date: Thu Jan 28 12:35:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build for libpng >= 1.4

---- Files affected:
packages/gd:
   gd.spec (1.131 -> 1.132) 

---- Diffs:

================================================================
Index: packages/gd/gd.spec
diff -u packages/gd/gd.spec:1.131 packages/gd/gd.spec:1.132
--- packages/gd/gd.spec:1.131	Thu Jan 28 12:31:54 2010
+++ packages/gd/gd.spec	Thu Jan 28 13:35:39 2010
@@ -23,7 +23,7 @@
 %{?with_fontconfig:BuildRequires:	fontconfig-devel}
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gettext-devel
-BuildRequires:	libpng-devel
+BuildRequires:	libpng-devel >= 2:1.4.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.3
@@ -148,6 +148,9 @@
 # hack to avoid inclusion of -s in --ldflags
 %{__perl} -pi -e 's,\@LDFLAGS\@,,g' config/gdlib-config.in
 
+# png_check_sig was replaced by png_sig_cmp in libpng
+%{__sed} -i -e 's/if (!png_check_sig (sig, 8))/if (png_sig_cmp(sig, 0, 8))/g' gd_png.c
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -198,6 +201,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2010/01/28 12:35:39  amateja
+- fixed build for libpng >= 1.4
+
 Revision 1.131  2010/01/28 11:31:54  amateja
 - release 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gd/gd.spec?r1=1.131&r2=1.132&f=u



More information about the pld-cvs-commit mailing list