package qt: patch file housekeeping

1 files changed, 99 insertions, 26 deletions

diff --git a/src/qt-1-win32.patch b/src/qt-1-win32.patch
index 0272522..3ddf587 100644
--- a/src/qt-1-win32.patch
+++ b/src/qt-1-win32.patch
@@ -1742,7 +1742,105 @@ index 8bc8e59..c383bcb 100644
  // ======== duplicated from qcolor_p
  
 
-commit 9d48a599f8a29067346bc6f257b4e0a767717349
+commit 91396840d9a182a56fec73d9f15f83aad8b88847
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Sun Oct 10 11:14:20 2010 +0200
+
+    use specified pkg-config
+    
+    Respect the pkg-config tool specified in qmake.conf. This is
+    useful when crossbuilding.
+
+diff --git a/mkspecs/features/link_pkgconfig.prf b/mkspecs/features/link_pkgconfig.prf
+index 4c528aa..90cc836 100644
+--- a/mkspecs/features/link_pkgconfig.prf
++++ b/mkspecs/features/link_pkgconfig.prf
+@@ -1,6 +1,7 @@
+ # handle pkg-config files
++isEmpty(PKG_CONFIG):PKG_CONFIG=pkg-config
+ for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {
+-    QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
+-    QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
+-    LIBS += $$system(pkg-config --libs $$PKGCONFIG_LIB)
++    QMAKE_CXXFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
++    QMAKE_CFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
++    LIBS += $$system($$PKG_CONFIG --libs $$PKGCONFIG_LIB)
+ }
+
+commit e4db94db6af14a2b9a187b33424c63473cf15391
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Thu Oct 14 20:55:31 2010 +0200
+
+    removed obsolete -qt-gif configure option
+    
+    Since "-system-gif" is not offered, offering "-qt-gif" is unnecessary
+    and perhaps misleading. By default the GIF handler is built from code
+    included with Qt, unless suppressed by "-no-gif".
+
+diff --git a/configure b/configure
+index ea390d5..4d9bb9f 100755
+--- a/configure
++++ b/configure
+@@ -1527,8 +1527,7 @@ while [ "$#" -gt 0 ]; do
+         fi
+         ;;
+     gif)
+-        [ "$VAL" = "qt" ] && VAL=auto
+-        if [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then
++        if [ "$VAL" = "no" ]; then
+             CFG_GIF="$VAL"
+         else
+             UNKNOWN_OPT=yes
+@@ -3447,7 +3446,7 @@ Usage:  $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
+         [-accessibility] [-no-stl] [-stl] [-no-sql-<driver>] [-sql-<driver>]
+         [-plugin-sql-<driver>] [-system-sqlite] [-no-qt3support] [-qt3support]
+         [-platform] [-D <string>] [-I <string>] [-L <string>] [-help]
+-        [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff]
++        [-qt-zlib] [-system-zlib] [-no-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff]
+         [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng]
+         [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make <part>]
+         [-nomake <part>] [-R <string>]  [-l <string>] [-no-rpath]  [-rpath] [-continue]
+@@ -3662,8 +3661,6 @@ Third Party Libraries:
+                          See http://www.gzip.org/zlib
+ 
+     -no-gif ............ Do not compile GIF reading support.
+- *  -qt-gif ............ Compile GIF reading support.
+-                         See also src/gui/image/qgifhandler_p.h
+ 
+     -no-libtiff ........ Do not compile TIFF support.
+     -qt-libtiff ........ Use the libtiff bundled with Qt.
+diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
+index 5b3d714..8c207df 100644
+--- a/tools/configure/configureapp.cpp
++++ b/tools/configure/configureapp.cpp
+@@ -581,8 +581,6 @@ void Configure::parseCmdLine()
+         // Image formats --------------------------------------------
+         else if (configCmdLine.at(i) == "-no-gif")
+             dictionary[ "GIF" ] = "no";
+-        else if (configCmdLine.at(i) == "-qt-gif")
+-            dictionary[ "GIF" ] = "plugin";
+ 
+         else if (configCmdLine.at(i) == "-no-libtiff") {
+             dictionary[ "TIFF"] = "no";
+@@ -1616,7 +1614,7 @@ bool Configure::displayHelp()
+                     "[-no-qmake] [-qmake] [-dont-process] [-process]\n"
+                     "[-no-style-<style>] [-qt-style-<style>] [-redo]\n"
+                     "[-saveconfig <config>] [-loadconfig <config>]\n"
+-                    "[-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libpng]\n"
++                    "[-qt-zlib] [-system-zlib] [-no-gif] [-no-libpng]\n"
+                     "[-qt-libpng] [-system-libpng] [-no-libtiff] [-qt-libtiff]\n"
+                     "[-system-libtiff] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg]\n"
+                     "[-no-libmng] [-qt-libmng] [-system-libmng] [-no-qt3support] [-mmx]\n"
+@@ -1746,7 +1744,6 @@ bool Configure::displayHelp()
+         desc("ZLIB", "system",  "-system-zlib",         "Use zlib from the operating system.\nSee http://www.gzip.org/zlib\n");
+ 
+         desc("GIF", "no",       "-no-gif",              "Do not compile GIF reading support.");
+-        desc("GIF", "auto",     "-qt-gif",              "Compile GIF reading support.\nSee also src/gui/image/qgifhandler_p.h\n");
+ 
+         desc("LIBPNG", "no",    "-no-libpng",           "Do not compile PNG support.");
+         desc("LIBPNG", "qt",    "-qt-libpng",           "Use the libpng bundled with Qt.");
+
+commit 79facb99cd75f142b734668a4cf2a3376966de2a
 Author: Mark Brand <mabrand@mabrand.nl>
 Date:   Sat Jun 5 23:41:04 2010 +0200
 
@@ -1768,28 +1866,3 @@ index 3f1ac86..602cb8d 100644
  contains(QT_CONFIG, embedded):CONFIG += embedded
  
  CONFIG(QTDIR_build) {
-
-commit f9b9cf2a816380f70e41155344a769c2ad71ad28
-Author: Mark Brand <mabrand@mabrand.nl>
-Date:   Sun Oct 10 11:14:20 2010 +0200
-
-    use specified pkg-config
-    
-    Respect the pkg-config tool specified in qmake.conf. This is
-    useful when crossbuilding.
-
-diff --git a/mkspecs/features/link_pkgconfig.prf b/mkspecs/features/link_pkgconfig.prf
-index 4c528aa..90cc836 100644
---- a/mkspecs/features/link_pkgconfig.prf
-+++ b/mkspecs/features/link_pkgconfig.prf
-@@ -1,6 +1,7 @@
- # handle pkg-config files
-+isEmpty(PKG_CONFIG):PKG_CONFIG=pkg-config
- for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {
--    QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
--    QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
--    LIBS += $$system(pkg-config --libs $$PKGCONFIG_LIB)
-+    QMAKE_CXXFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
-+    QMAKE_CFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
-+    LIBS += $$system($$PKG_CONFIG --libs $$PKGCONFIG_LIB)
- }