--- a/ChangeLog Fri Jan 28 01:12:51 2011 +0000
+++ b/ChangeLog Fri Jan 28 23:44:37 2011 +0000
@@ -1,3 +1,7 @@
+2011-01-29 Milan Jurik <[email protected]>
+
+ * SFEqt4.spec: enforce libpng 1.4
+
2010-01-27 Alex Viskovatoff <[email protected]>
* SFEboost-stdcxx.spec: use -library=stdcxx4
--- a/SFEqt4.spec Fri Jan 28 01:12:51 2011 +0000
+++ b/SFEqt4.spec Fri Jan 28 23:44:37 2011 +0000
@@ -22,6 +22,7 @@
Version: 4.6.3
Group: Development/Libraries
Source: ftp://ftp.trolltech.com/qt/source/%{srcname}-%{version}.tar.gz
+Patch3: qt-03-libpng14.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -45,6 +46,8 @@
%prep
%setup -q -n %{srcname}-%version
+# Enforce libpng 1.4
+%patch3 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -118,10 +121,12 @@
%{_datadir}/doc/*
%changelog
+* Sat Jan 29 2011 - Milan Jurik
+- enforce libpng 1.4
* Thu Jan 20 2011 - Milan Jurik
- update to 4.6.3
- disable demos and examples
-- move to libpng1.4
+- move to libpng 1.4
- enable exceptions again
* Nov 4 2010 - Alex Viskovatoff
- Spec needs "%include osdistro.inc" (pointed out by Thomas Wagner)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/qt-03-libpng14.diff Fri Jan 28 23:44:37 2011 +0000
@@ -0,0 +1,7 @@
+--- qt-everywhere-opensource-src-4.6.3/src/gui/image/qpnghandler.cpp Thu Jan 27 19:53:21 2011
++++ qt-everywhere-opensource-src-4.6.3-patch/src/gui/image/qpnghandler.cpp Thu Jan 27 19:53:10 2011
+@@ -53,2 +53,2 @@
+-#include <png.h>
+-#include <pngconf.h>
++#include <libpng14/png.h>
++#include <libpng14/pngconf.h>