From 9643b6bcde1b754c67dfec3fcad430b2bcebb066 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 29 Jun 2011 09:50:42 +0200 Subject: package qt: fix build of qdbus tools --- src/qt-1-cherrypicks.patch | 117 ++++++++++++++++++++++++++++++--------------- 1 file changed, 79 insertions(+), 38 deletions(-) diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch index b78f870..07cc647 100644 --- a/src/qt-1-cherrypicks.patch +++ b/src/qt-1-cherrypicks.patch @@ -84,7 +84,7 @@ index 15c0ddb..dd5647b 100644 desc("LIBPNG", "no", "-no-libpng", "Do not compile PNG support."); desc("LIBPNG", "qt", "-qt-libpng", "Use the libpng bundled with Qt."); -- -1.7.5.4 +1.7.6 From b5e382d8335628edf5d5c5a1671682de7c50c6d2 Mon Sep 17 00:00:00 2001 @@ -120,7 +120,7 @@ index df580fd..81a379f 100644 if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR")); -- -1.7.5.4 +1.7.6 From f35c452aaf665489060d317ce180d192433abd24 Mon Sep 17 00:00:00 2001 @@ -548,7 +548,7 @@ index 81a379f..1846d56 100644 - QT_END_NAMESPACE -- -1.7.5.4 +1.7.6 From e8afbb5a998931c154aa83ed87be6521cb8d50d3 Mon Sep 17 00:00:00 2001 @@ -602,7 +602,7 @@ index 8af7ddd..6d0a5c4 100644 QString lib_target = getLibTarget(); lib_target.remove('"'); -- -1.7.5.4 +1.7.6 From 175b395655d3f24aea0e4232069853dca1c33efd Mon Sep 17 00:00:00 2001 @@ -935,7 +935,7 @@ index 7b94587..6e0a247 100644 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET -- -1.7.5.4 +1.7.6 From 5ef7985e6015c09735094545a07ed93832075507 Mon Sep 17 00:00:00 2001 @@ -1122,7 +1122,7 @@ index ee5c7d9..cdff46c 100644 int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const { -- -1.7.5.4 +1.7.6 From 3411ae8c3d83b3eb9407c8c338336e95fe74edf3 Mon Sep 17 00:00:00 2001 @@ -1231,7 +1231,7 @@ index dd5647b..b6e80ea 100644 // IDE project generation ----------------------------------- else if (configCmdLine.at(i) == "-no-dsp") -- -1.7.5.4 +1.7.6 From 8d719e67c51987fb6439ea1d05a2b10684b974e1 Mon Sep 17 00:00:00 2001 @@ -1258,7 +1258,7 @@ index ffb98de..c213e09 100644 } else { include($$PWD/../../3rdparty/libmng.pri) -- -1.7.5.4 +1.7.6 From c34bd635af9263d1a719cd270db123b1a787640c Mon Sep 17 00:00:00 2001 @@ -1291,7 +1291,7 @@ index a805170..027eb0f 100644 CONFIG(QTDIR_build) { -- -1.7.5.4 +1.7.6 From c56ec08a3e3af1a9beae552872b443c6a7cf401c Mon Sep 17 00:00:00 2001 @@ -1324,7 +1324,7 @@ index 207dcc1..b10b0a2 100755 CFG_CONCURRENT="yes" if [ "$canBuildQtConcurrent" = "no" ]; then -- -1.7.5.4 +1.7.6 From 074e13614d6071247600eea3c3d6a1f4c4f4a0d5 Mon Sep 17 00:00:00 2001 @@ -1353,7 +1353,7 @@ index 027eb0f..44bbc3f 100644 + QMAKE_PKGCONFIG_DESTDIR = pkgconfig +} -- -1.7.5.4 +1.7.6 From c907c7c1f0922416fd5f19cb477b71c6f97fee45 Mon Sep 17 00:00:00 2001 @@ -1385,7 +1385,7 @@ index 4464686..ba0c45b 100644 include(../common/mac-g++.conf) -- -1.7.5.4 +1.7.6 From ac552171a0729e1fae026741e4ec89a415298667 Mon Sep 17 00:00:00 2001 @@ -1419,7 +1419,7 @@ index ec216aa..2d9833b 100644 QMAKE_LFLAGS_RELEASE = -Wl,-s QMAKE_LFLAGS_DEBUG = -- -1.7.5.4 +1.7.6 From 0e32298cb08ef1168dc6c06dd48bab8ee62c6e5d Mon Sep 17 00:00:00 2001 @@ -1455,7 +1455,7 @@ index 7e077a1..efc3de2 100644 QMAKE_LFLAGS_RELEASE = -Wl,-s QMAKE_LFLAGS_DEBUG = -- -1.7.5.4 +1.7.6 From 0a9731cad65337c7084791b54db8bfeb0939dc7d Mon Sep 17 00:00:00 2001 @@ -1537,7 +1537,7 @@ index 8f46a2e..3a0ab12 100644 qnx { -- -1.7.5.4 +1.7.6 From c4a1848f4178fe99daa2c12ad1f14e8de14cc389 Mon Sep 17 00:00:00 2001 @@ -1570,43 +1570,84 @@ index efc3de2..6eed244 100644 QMAKE_LIBS_NETWORK = -lws2_32 QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 -- -1.7.5.4 +1.7.6 -From 1ffce5a22631ab83f7baa35618c7a97725e4552e Mon Sep 17 00:00:00 2001 +From f6eb05daf463a25bb045ce81dcc889cf4b73a140 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 28 Jun 2011 23:02:29 +0200 -Subject: [PATCH 17/17] use static text codec plugins for qdbusviewer - (mingw-cross-env specific) +Subject: [PATCH 17/17] link static text codec plugins (mingw-cross-env + specific) +Static QtCore for Windows introduces dependencies on the text codec plugins. --- - tools/qdbus/qdbusviewer/qdbusviewer.pro | 2 ++ - tools/qdbus/qdbusviewer/staticplugins.cpp | 5 +++++ - 2 files changed, 7 insertions(+), 0 deletions(-) - create mode 100644 tools/qdbus/qdbusviewer/staticplugins.cpp - -diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.pro b/tools/qdbus/qdbusviewer/qdbusviewer.pro -index 6727691..21ce253 100644 ---- a/tools/qdbus/qdbusviewer/qdbusviewer.pro -+++ b/tools/qdbus/qdbusviewer/qdbusviewer.pro -@@ -27,4 +27,6 @@ mac { - - win32 { - RC_FILE = qdbusviewer.rc -+ QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs -+ SOURCES += staticplugins.cpp - } -diff --git a/tools/qdbus/qdbusviewer/staticplugins.cpp b/tools/qdbus/qdbusviewer/staticplugins.cpp + staticcodecplugins/staticcodecplugins.cpp | 5 +++++ + staticcodecplugins/staticcodecplugins.pri | 4 ++++ + tools/qdbus/qdbus/qdbus.pro | 1 + + tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro | 1 + + tools/qdbus/qdbusviewer/qdbusviewer.pro | 1 + + tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro | 1 + + 6 files changed, 13 insertions(+), 0 deletions(-) + create mode 100644 staticcodecplugins/staticcodecplugins.cpp + create mode 100644 staticcodecplugins/staticcodecplugins.pri + +diff --git a/staticcodecplugins/staticcodecplugins.cpp b/staticcodecplugins/staticcodecplugins.cpp new file mode 100644 index 0000000..47f5bf3 --- /dev/null -+++ b/tools/qdbus/qdbusviewer/staticplugins.cpp ++++ b/staticcodecplugins/staticcodecplugins.cpp @@ -0,0 +1,5 @@ +#include +Q_IMPORT_PLUGIN(qcncodecs) +Q_IMPORT_PLUGIN(qjpcodecs) +Q_IMPORT_PLUGIN(qtwcodecs) +Q_IMPORT_PLUGIN(qkrcodecs) +diff --git a/staticcodecplugins/staticcodecplugins.pri b/staticcodecplugins/staticcodecplugins.pri +new file mode 100644 +index 0000000..4efe0a6 +--- /dev/null ++++ b/staticcodecplugins/staticcodecplugins.pri +@@ -0,0 +1,4 @@ ++win32 { ++ QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs ++ SOURCES += $$PWD/staticcodecplugins.cpp ++} +diff --git a/tools/qdbus/qdbus/qdbus.pro b/tools/qdbus/qdbus/qdbus.pro +index ea732ef..705c83d 100644 +--- a/tools/qdbus/qdbus/qdbus.pro ++++ b/tools/qdbus/qdbus/qdbus.pro +@@ -8,3 +8,4 @@ win32:CONFIG += console + + target.path=$$[QT_INSTALL_BINS] + INSTALLS += target ++include(../../../staticcodecplugins/staticcodecplugins.pri) +diff --git a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro +index 9ee1d37..17ac7ab 100644 +--- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro ++++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.pro +@@ -8,3 +8,4 @@ win32:CONFIG += console + + target.path=$$[QT_INSTALL_BINS] + INSTALLS += target ++include(../../../staticcodecplugins/staticcodecplugins.pri) +diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.pro b/tools/qdbus/qdbusviewer/qdbusviewer.pro +index 6727691..1e0e374 100644 +--- a/tools/qdbus/qdbusviewer/qdbusviewer.pro ++++ b/tools/qdbus/qdbusviewer/qdbusviewer.pro +@@ -28,3 +28,4 @@ mac { + win32 { + RC_FILE = qdbusviewer.rc + } ++include(../../../staticcodecplugins/staticcodecplugins.pri) +diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro +index 6f78c7c..a953206 100644 +--- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro ++++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.pro +@@ -8,3 +8,4 @@ win32:CONFIG += console + + target.path=$$[QT_INSTALL_BINS] + INSTALLS += target ++include(../../../staticcodecplugins/staticcodecplugins.pri) -- -1.7.5.4 +1.7.6 -- cgit v0.12