summaryrefslogtreecommitdiffstats
path: root/mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-08-02 11:13:00 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-08-02 11:13:00 +0200
commit0704427510fa18d90170cf13d1fd81e446a1d3b0 (patch)
treef88eb0400bf4608d95808aeea656185634b9c0fc /mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch
parent9f07f141355cd13d40a39a2f123c6516209c5fcf (diff)
downloadtde-packaging-0704427510fa18d90170cf13d1fd81e446a1d3b0.tar.gz
tde-packaging-0704427510fa18d90170cf13d1fd81e446a1d3b0.zip
Mageia: initial QT3 version for TDE 3.5.13
Diffstat (limited to 'mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch')
-rw-r--r--mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch
new file mode 100644
index 000000000..621b7c996
--- /dev/null
+++ b/mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch
@@ -0,0 +1,35 @@
+--- configure.libpng 2011-09-15 07:20:32.000000000 +0200
++++ configure 2011-09-15 07:21:36.000000000 +0200
+@@ -2971,8 +2971,8 @@
+ if [ "$CFG_LIBPNG" = "system" ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG system-png"
+ if [ "$CFG_PNG" = "yes" ]; then
+- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lpng\""
+- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lpng\""
++ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lpng12\""
++ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lpng12\""
+ fi
+ fi
+ if [ "$CFG_PNG" = "no" ]; then
+--- plugins/src/imageformats/png/png.pro.libpng 2011-09-15 07:20:46.000000000 +0200
++++ plugins/src/imageformats/png/png.pro 2011-09-15 07:21:56.000000000 +0200
+@@ -10,7 +10,7 @@
+ SOURCES += main.cpp
+
+ system-png {
+- unix:LIBS += -lpng
++ unix:LIBS += -lpng12
+ win32:LIBS += libpng.lib
+ }
+ !system-png {
+--- src/kernel/qt_gfx.pri.libpng 2011-09-15 07:21:19.000000000 +0200
++++ src/kernel/qt_gfx.pri 2011-09-15 07:22:13.000000000 +0200
+@@ -102,7 +102,7 @@
+ SOURCES+=$$KERNEL_CPP/qpngio.cpp
+ png {
+ system-png {
+- unix:LIBS += -lpng
++ unix:LIBS += -lpng12
+ win32:LIBS += libpng.lib
+ } else {
+ INCLUDEPATH += 3rdparty/libpng