[qt3] - fix the include path for zlib.h in qcstring.cpp to pick up the system version
Kevin Kofler
kkofler at fedoraproject.org
Fri Nov 4 02:40:24 UTC 2011
commit 55fd48a69682401dc48e26506af1f2688964f39c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Fri Nov 4 03:40:15 2011 +0100
- fix the include path for zlib.h in qcstring.cpp to pick up the system version
qt-x11-free-3.3.8b-system-zlib-header.patch | 12 ++++++++++++
qt3.spec | 4 ++++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/qt-x11-free-3.3.8b-system-zlib-header.patch b/qt-x11-free-3.3.8b-system-zlib-header.patch
new file mode 100644
index 0000000..3a03467
--- /dev/null
+++ b/qt-x11-free-3.3.8b-system-zlib-header.patch
@@ -0,0 +1,12 @@
+diff -ur qt-x11-free-3.3.8b/src/tools/qcstring.cpp qt-x11-free-3.3.8b-system-zlib-header/src/tools/qcstring.cpp
+--- qt-x11-free-3.3.8b/src/tools/qcstring.cpp 2008-01-15 20:09:13.000000000 +0100
++++ qt-x11-free-3.3.8b-system-zlib-header/src/tools/qcstring.cpp 2011-11-04 03:36:21.000000000 +0100
+@@ -53,7 +53,7 @@
+ #include <ctype.h>
+ #include <limits.h>
+ #ifndef QT_NO_COMPRESS
+-#include "../3rdparty/zlib/zlib.h"
++#include <zlib.h>
+ #endif
+
+ /*****************************************************************************
diff --git a/qt3.spec b/qt3.spec
index 153c3d2..33e7add 100644
--- a/qt3.spec
+++ b/qt3.spec
@@ -54,6 +54,8 @@ Patch42: qt-x11-free-3.3.8b-qlocale-aliasing.patch
Patch43: qt-x11-free-3.3.8b-system-sqlite2.patch
# silence compiler warning in qimage.h by adding parentheses
Patch44: qt-x11-free-3.3.8b-qimage-parentheses.patch
+# fix the include path for zlib.h in qcstring.cpp to pick up the system version
+Patch45: qt-x11-free-3.3.8b-system-zlib-header.patch
# immodule patches
Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
@@ -293,6 +295,7 @@ sed -i.KDE3_PLUGIN_PATH \
%patch42 -p1 -b .qlocale-aliasing
%patch43 -p1 -b .system-sqlite2
%patch44 -p1 -b .qimage-parentheses
+%patch45 -p1 -b .system-zlib-header
# immodule patches
%if %{immodule}
@@ -607,6 +610,7 @@ rm -rf %{buildroot}
- build against the system sqlite2-devel (patch from Debian)
- BuildRequires: sqlite2-devel instead of unused sqlite-devel (SQLite 3)
- silence compiler warning in qimage.h by adding parentheses
+- fix the include path for zlib.h in qcstring.cpp to pick up the system version
* Sun Aug 14 2011 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-36.1
- Rebuilt for rpm (#728707)
More information about the scm-commits
mailing list