From 3b7ac5bfc337a1f092a52fb8d85dea400436e36c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 1 Sep 2011 14:36:58 +0200 Subject: update package qt --- src/qt-1-cherrypicks.patch | 600 ++++++++++++--------------------------------- src/qt-2-kfreebsd.patch | 42 ---- src/qt-3-dragonfly.patch | 19 -- src/qt.mk | 4 +- 4 files changed, 162 insertions(+), 503 deletions(-) delete mode 100644 src/qt-2-kfreebsd.patch delete mode 100644 src/qt-3-dragonfly.patch diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch index 993e9fe..ae52068 100644 --- a/src/qt-1-cherrypicks.patch +++ b/src/qt-1-cherrypicks.patch @@ -4,10 +4,10 @@ See doc/index.html for further information. Commits backported (cherry-picked) from Qt 4.7 branch. http://qt.gitorious.org/qt -From bb75d02785da59c967dee09006700488af9f482e Mon Sep 17 00:00:00 2001 +From f536051241fe2be447ce57b5ad2410d786a16eaa Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 15 Oct 2010 14:56:03 +0200 -Subject: [PATCH 01/17] removed obsolete -qt-gif configure option +Subject: [PATCH 01/15] 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 @@ -22,10 +22,10 @@ Reviewed-by: Oswald Buddenhagen 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/configure b/configure -index 7abe0eb..c159cd4 100755 +index 3b7a1f3..4257e68 100755 --- a/configure +++ b/configure -@@ -1570,8 +1570,7 @@ while [ "$#" -gt 0 ]; do +@@ -1540,8 +1540,7 @@ while [ "$#" -gt 0 ]; do fi ;; gif) @@ -35,7 +35,7 @@ index 7abe0eb..c159cd4 100755 CFG_GIF="$VAL" else UNKNOWN_OPT=yes -@@ -3544,7 +3543,7 @@ Usage: $relconf [-h] [-prefix ] [-prefix-install] [-bindir ] [-libdir +@@ -3518,7 +3517,7 @@ Usage: $relconf [-h] [-prefix ] [-prefix-install] [-bindir ] [-libdir [-accessibility] [-no-stl] [-stl] [-no-sql-] [-sql-] [-plugin-sql-] [-system-sqlite] [-no-qt3support] [-qt3support] [-platform] [-D ] [-I ] [-L ] [-help] @@ -44,7 +44,7 @@ index 7abe0eb..c159cd4 100755 [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng] [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make ] [-nomake ] [-R ] [-l ] [-no-rpath] [-rpath] [-continue] -@@ -3773,8 +3772,6 @@ Third Party Libraries: +@@ -3747,8 +3746,6 @@ Third Party Libraries: See http://www.gzip.org/zlib -no-gif ............ Do not compile GIF reading support. @@ -54,7 +54,7 @@ index 7abe0eb..c159cd4 100755 -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 15c0ddb..dd5647b 100644 +index 69cd70b..307b845 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -590,8 +590,6 @@ void Configure::parseCmdLine() @@ -66,7 +66,7 @@ index 15c0ddb..dd5647b 100644 else if (configCmdLine.at(i) == "-no-libtiff") { dictionary[ "TIFF"] = "no"; -@@ -1661,7 +1659,7 @@ bool Configure::displayHelp() +@@ -1663,7 +1661,7 @@ bool Configure::displayHelp() "[-no-qmake] [-qmake] [-dont-process] [-process]\n" "[-no-style-