* Some cleanup.

* Update patches and series. * Update rules. No more stuff TODO in mind ...
author: Fathi Boudra <fabo@debian.org> 2007-08-09 09:34:39 +0000
committer: Fathi Boudra <fabo@debian.org> 2007-08-09 09:34:39 +0000
commit: ff07f00bf37b16a834d5e5dec1d052a3e622a306 (patch)
tree: 032a1c5895a21cbfdbe3afe7f70b8fdb79f95b53
parent: dc9373086a36ba8ef4f6a51f61212e33a4d79b59 (diff)
download: qt4-x11-ff07f00bf37b16a834d5e5dec1d052a3e622a306.tar.gz
61 files changed, 235 insertions, 2109 deletions
diff --git a/debian/changelog b/debian/changelog
index 0c09b1f..0334da9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,21 @@
-qt4-x11 (4.3.1-1) UNRELEASED; urgency=low
+qt4-x11 (4.3.1-1) unstable; urgency=low
 
   * New upstream release.
   * Switch to quilt patch system.
   * Update copyright. Add Trolltech GPL Exception.
   * Update patches for Qt4.3.1.
+  * Remove 51_kfreebsd_mkspecs patch. Moved in rules.
+  * Add 0187-fix-font-fixed-pitch patch:
+    This patch works around broken QFontInfo::fixedPitch by always using a
+    glyph metrics comparison test to guess the information. This has the
+    property of both ignoring (bad) and not relying on (good) any information
+    that might be provided by the OS's font facility. For Mac OS X only.
   * Remove patches merged upstream:
     * 0177-qurl-clear-fix
     * 0183-qprocess-corruption
     * 42_alpha_fetch_and_add
-
-  * TODO:
-    * workaround for 51_kfreebsd_mkspecs patch.
-    * Add comments to patches.
+  * Disable 0172-prefer-xrandr-over-xinerama patch. (Closes: #433931)
+  * Enable 0182-argb-visuals-default patch.
 
  -- Fathi Boudra <fboudra@free.fr>  Wed, 08 Aug 2007 15:08:11 +0200
 
diff --git a/debian/patches-4.3.0/00_0163-fix-gcc43-support.dpatch b/debian/patches-4.3.0/00_0163-fix-gcc43-support.dpatch
deleted file mode 100755
index f6ab802..0000000
--- a/debian/patches-4.3.0/00_0163-fix-gcc43-support.dpatch
+++ /dev/null
@@ -1,174 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0163-fix-gcc43-support.dpatch by Dirk Mueller <mueller@kde.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Various fixes to get Qt 4.3 without hundreds of warnings compiling.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/config.tests/unix/endian.test qt4-x11-4.3.0/config.tests/unix/endian.test
---- qt4-x11-4.3.0~/config.tests/unix/endian.test	2007-05-25 15:24:34.000000000 +0200
-+++ qt4-x11-4.3.0/config.tests/unix/endian.test	2007-06-26 19:54:20.000000000 +0200
-@@ -30,6 +30,7 @@
-     [ "$VERBOSE" = "yes" ] && echo "    Found 'MostSignificantByteFirst' in binary"
-     ENDIAN="BIG"
- fi
-+[ "$VERBOSE" = "yes" ] && make clean || make clean >/dev/null 2>&1
- 
- # done
- if [ "$ENDIAN" = "LITTLE" ]; then
-diff -urNad qt4-x11-4.3.0~/config.tests/x11/glib/glib.cpp qt4-x11-4.3.0/config.tests/x11/glib/glib.cpp
---- qt4-x11-4.3.0~/config.tests/x11/glib/glib.cpp	2007-05-25 15:24:25.000000000 +0200
-+++ qt4-x11-4.3.0/config.tests/x11/glib/glib.cpp	2007-06-26 19:54:20.000000000 +0200
-@@ -6,7 +6,7 @@
- {
-     GMainContext *context;
-     GSource *source;
--    GPollFD *pollfd;
-+    GPollFD *pollfd = NULL;
-     if (!g_thread_supported())
-         g_thread_init(NULL);
-     context = g_main_context_default();
-diff -urNad qt4-x11-4.3.0~/src/corelib/codecs/qtextcodec.cpp qt4-x11-4.3.0/src/corelib/codecs/qtextcodec.cpp
---- qt4-x11-4.3.0~/src/corelib/codecs/qtextcodec.cpp	2007-05-25 15:24:09.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/codecs/qtextcodec.cpp	2007-06-26 19:54:20.000000000 +0200
-@@ -415,7 +415,7 @@
-             localeMapper = checkForCodec(lang);
- 
-         // 5. "@euro"
--        if (!localeMapper && ctype && strstr(ctype, "@euro") || lang && strstr(lang, "@euro"))
-+        if ((!localeMapper && ctype && strstr(ctype, "@euro")) || (lang && strstr(lang, "@euro")))
-             localeMapper = checkForCodec("ISO 8859-15");
- 
-         // 6. guess locale from ctype unless ctype is "C"
-diff -urNad qt4-x11-4.3.0~/src/corelib/io/qtextstream.cpp qt4-x11-4.3.0/src/corelib/io/qtextstream.cpp
---- qt4-x11-4.3.0~/src/corelib/io/qtextstream.cpp	2007-05-25 15:24:10.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/io/qtextstream.cpp	2007-06-26 19:54:20.000000000 +0200
-@@ -541,8 +541,8 @@
-     if (!codec || autoDetectUnicode) {
-         autoDetectUnicode = false;
-         
--        if (bytesRead >= 2 && (uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe
--                               || uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff)) {
-+        if (bytesRead >= 2 && ((uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe)
-+                               || (uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff))) {
-             codec = QTextCodec::codecForName("UTF-16");
-         } else if (!codec) {
-             codec = QTextCodec::codecForLocale();
-diff -urNad qt4-x11-4.3.0~/src/corelib/io/qurl.cpp qt4-x11-4.3.0/src/corelib/io/qurl.cpp
---- qt4-x11-4.3.0~/src/corelib/io/qurl.cpp	2007-05-25 15:24:10.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/io/qurl.cpp	2007-06-26 19:54:21.000000000 +0200
-@@ -4724,9 +4724,9 @@
-     if (include.isEmpty()) {
-         for (int i = 0; i < len; ++i) {
-             unsigned char c = *inputData++;
--            if (c >= 0x61 && c <= 0x7A // ALPHA
--                || c >= 0x41 && c <= 0x5A // ALPHA
--                || c >= 0x30 && c <= 0x39 // DIGIT
-+            if ((c >= 0x61 && c <= 0x7A) // ALPHA
-+                || (c >= 0x41 && c <= 0x5A) // ALPHA
-+                || (c >= 0x30 && c <= 0x39) // DIGIT
-                 || c == 0x2D // -
-                 || c == 0x2E // .
-                 || c == 0x5F // _
-@@ -4743,9 +4743,9 @@
-         const char * alsoEncode = include.constData();
-         for (int i = 0; i < len; ++i) {
-             unsigned char c = *inputData++;
--            if ((c >= 0x61 && c <= 0x7A // ALPHA
--                || c >= 0x41 && c <= 0x5A // ALPHA
--                || c >= 0x30 && c <= 0x39 // DIGIT
-+            if (((c >= 0x61 && c <= 0x7A) // ALPHA
-+                || (c >= 0x41 && c <= 0x5A) // ALPHA
-+                || (c >= 0x30 && c <= 0x39) // DIGIT
-                 || c == 0x2D // -
-                 || c == 0x2E // .
-                 || c == 0x5F // _
-diff -urNad qt4-x11-4.3.0~/src/corelib/tools/qlocale.cpp qt4-x11-4.3.0/src/corelib/tools/qlocale.cpp
---- qt4-x11-4.3.0~/src/corelib/tools/qlocale.cpp	2007-05-25 15:24:11.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/tools/qlocale.cpp	2007-06-26 19:54:21.000000000 +0200
-@@ -2589,8 +2589,8 @@
- 
-         QChar c1 = format.at(i);
-         QChar c2 = format.at(i + 1);
--        if (c1.unicode() == 'a' && c2.unicode() == 'p'
--            || c1.unicode() == 'A' && c2.unicode() == 'P')
-+        if ((c1.unicode() == 'a' && c2.unicode() == 'p')
-+            || (c1.unicode() == 'A' && c2.unicode() == 'P'))
-             return true;
- 
-         ++i;
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qapplication.cpp qt4-x11-4.3.0/src/gui/kernel/qapplication.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qapplication.cpp	2007-05-25 15:24:20.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qapplication.cpp	2007-06-26 19:54:21.000000000 +0200
-@@ -2018,11 +2018,11 @@
- #ifndef QT_NO_TRANSLATION
- static bool qt_detectRTLLanguage()
- {
--    return force_reverse ^
-+    return (force_reverse ^
-         QApplication::tr("QT_LAYOUT_DIRECTION",
-                          "Translate this string to the string 'LTR' in left-to-right"
-                          " languages or to 'RTL' in right-to-left languages (such as Hebrew"
--                         " and Arabic) to get proper widget layout.") == QLatin1String("RTL");
-+                         " and Arabic) to get proper widget layout.") == QLatin1String("RTL"));
- }
- #endif
- 
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qkeymapper_x11.cpp qt4-x11-4.3.0/src/gui/kernel/qkeymapper_x11.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qkeymapper_x11.cpp	2007-05-25 15:24:20.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qkeymapper_x11.cpp	2007-06-26 19:54:21.000000000 +0200
-@@ -1315,8 +1315,8 @@
-         }
- 
-         if (directionKeyEvent && lastWinId == keyWidget->internalWinId()) {
--            if (keysym == XK_Shift_L && directionKeyEvent == XK_Control_L ||
--                keysym == XK_Control_L && directionKeyEvent == XK_Shift_L) {
-+            if ((keysym == XK_Shift_L && directionKeyEvent == XK_Control_L) ||
-+                (keysym == XK_Control_L && directionKeyEvent == XK_Shift_L)) {
-                 directionKeyEvent = Qt::Key_Direction_L;
-             } else if (keysym == XK_Shift_R && directionKeyEvent == XK_Control_R ||
-                        keysym == XK_Control_R && directionKeyEvent == XK_Shift_R) {
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qwidget.cpp qt4-x11-4.3.0/src/gui/kernel/qwidget.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qwidget.cpp	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qwidget.cpp	2007-06-26 19:54:21.000000000 +0200
-@@ -1808,7 +1808,7 @@
- 
-             for (int i = 0; i < pd->children.size(); ++i) {
-                 QWidget *w = qobject_cast<QWidget *>(pd->children.at(i));
--                if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created))
-+                if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created)) {
-                     if (w!=q) {
-                         w->create();
-                     } else {
-@@ -1818,6 +1818,7 @@
-                         if (winid)
-                             w->raise();
-                     }
-+                }
-             }
-         } else {
-             q->create();
-diff -urNad qt4-x11-4.3.0~/src/gui/painting/qregion_unix.cpp qt4-x11-4.3.0/src/gui/painting/qregion_unix.cpp
---- qt4-x11-4.3.0~/src/gui/painting/qregion_unix.cpp	2007-05-25 15:24:13.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/painting/qregion_unix.cpp	2007-06-26 19:54:21.000000000 +0200
-@@ -1929,7 +1929,7 @@
-         else
-             --isInside;
- 
--        if (!inside && !isInside || inside && isInside) {
-+        if ((!inside && !isInside) || (inside && isInside)) {
-             pWETE->nextWETE = AET;
-             pWETE = AET;
-             inside = !inside;
-diff -urNad qt4-x11-4.3.0~/src/tools/uic/driver.cpp qt4-x11-4.3.0/src/tools/uic/driver.cpp
---- qt4-x11-4.3.0~/src/tools/uic/driver.cpp	2007-05-25 15:24:02.000000000 +0200
-+++ qt4-x11-4.3.0/src/tools/uic/driver.cpp	2007-06-26 19:54:21.000000000 +0200
-@@ -160,7 +160,7 @@
- 
- static bool isAnsiCCharacter(const QChar& c)
- {
--    return c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z')
-+    return (c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z'))
-            || c.isDigit() || c == QLatin1Char('_');
- }
- 
diff --git a/debian/patches-4.3.0/00_0167-fix-group-reading.dpatch b/debian/patches-4.3.0/00_0167-fix-group-reading.dpatch
deleted file mode 100755
index d7f8a07..0000000
--- a/debian/patches-4.3.0/00_0167-fix-group-reading.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0167-fix-group-reading.dpatch by Dirk Mueller <mueller@kde.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: In big user environments, getgrgid_r() needs more memory than sysconf() returns.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.3.0/src/corelib/io/qfsfileengine_unix.cpp
---- qt4-x11-4.3.0~/src/corelib/io/qfsfileengine_unix.cpp	2007-05-25 15:24:09.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/io/qfsfileengine_unix.cpp	2007-06-26 19:56:03.000000000 +0200
-@@ -830,9 +830,16 @@
-     } else if (own == OwnerGroup) {
-         struct group *gr = 0;
- #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
--        buf.resize(sysconf(_SC_GETGR_R_SIZE_MAX));
--        struct group entry;
--        getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr);
-+        for (unsigned size = sysconf(_SC_GETGR_R_SIZE_MAX); size < 256000; size += size)
-+        {
-+            buf.resize(size);
-+            struct group entry;
-+            // ERANGE indicates that the buffer was too small
-+            if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr)
-+                || errno != ERANGE)
-+                break;
-+        }
-+
- #else
-         gr = getgrgid(ownerId(own));
- #endif
diff --git a/debian/patches-4.3.0/00_0172-prefer-xrandr-over-xinerama.dpatch b/debian/patches-4.3.0/00_0172-prefer-xrandr-over-xinerama.dpatch
deleted file mode 100755
index 140dd8b..0000000
--- a/debian/patches-4.3.0/00_0172-prefer-xrandr-over-xinerama.dpatch
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0172-prefer-xrandr-over-xinerama.dpatch by Dirk Mueller
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: only trust libxinerama if its not the emulated information
-## DP: coming from xrandr 1.2. xrandr 1.2 is merged fb and libxinerama
-## DP: presents then virtual screens in clone mode, which qt (and KDE)
-## DP: can't deal with.
-## DP: proper fix would be to detect crtcs as virtual screens, but
-## DP: given that qt can't deal with dynamically changing number of screens,
-## DP: this is for "when I have time".
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qdesktopwidget_x11.cpp qt4-x11-4.3.0/src/gui/kernel/qdesktopwidget_x11.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qdesktopwidget_x11.cpp	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qdesktopwidget_x11.cpp	2007-06-30 19:52:05.000000000 +0200
-@@ -109,11 +109,38 @@
-     int unused;
-     use_xinerama = (XineramaQueryExtension(X11->display, &unused, &unused) && XineramaIsActive(X11->display));
- 
-+    // only use xinerama for old Xrandr versions
-+#ifndef QT_NO_XRANDR
-+    int ncrtc = 0;
-+    if (X11->use_xrandr) {
-+        int major, minor;
-+
-+#if RANDR_MAJOR > 1 || RANDR_MINOR > 1
-+        XRRQueryVersion(QPaintDevice::x11AppDisplay(), &major, &minor);
-+        if (major > 1 || (major == 1 && minor >= 2)) {
-+            XRRScreenResources* res;
-+            res = XRRGetScreenResources(QPaintDevice::x11AppDisplay(),
-+                    QPaintDevice::x11AppRootWindow( 0 ));
-+            if (res) {
-+                ncrtc = res->ncrtc;
-+                XRRFreeScreenResources(res);
-+            }
-+        }
-+#endif
-+    }
-+#endif
-+
-     if (use_xinerama) {
-         xinerama_screeninfo =
-             XineramaQueryScreens(X11->display, &screenCount);
-         defaultScreen = 0;
--    } else
-+    }
-+#ifndef QT_NO_XRANDR
-+    if (use_xinerama && screenCount <= ncrtc) {
-+        use_xinerama = FALSE;
-+    }
-+#endif
-+    else
- #endif // QT_NO_XINERAMA
-     {
-         defaultScreen = DefaultScreen(X11->display);
diff --git a/debian/patches-4.3.0/00_0175-fix-s390-qatomic.dpatch b/debian/patches-4.3.0/00_0175-fix-s390-qatomic.dpatch
deleted file mode 100755
index 3342f8d..0000000
--- a/debian/patches-4.3.0/00_0175-fix-s390-qatomic.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0175-fix-s390-qatomic.dpatch by Dirk Mueller <mueller@kde.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix s390(x) build.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/corelib/arch/qatomic_s390.h qt4-x11-4.3.0/src/corelib/arch/qatomic_s390.h
---- qt4-x11-4.3.0~/src/corelib/arch/qatomic_s390.h	2007-05-25 15:24:09.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/arch/qatomic_s390.h	2007-06-26 19:56:59.000000000 +0200
-@@ -182,10 +182,20 @@
- #endif
- }
- 
--#error "fetch-and-add not implemented"
--// int q_atomic_fetch_and_add_int(volatile int *ptr, int value);
--// int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value);
--// int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value);
-+inline int q_atomic_fetch_and_add_int(volatile int *ptr, int value)
-+{
-+    return __sync_fetch_and_add(ptr, value);
-+}
-+
-+inline int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value)
-+{
-+    return __sync_fetch_and_add(ptr, value);
-+}
-+
-+inline int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value)
-+{
-+    return __sync_fetch_and_add(ptr, value);
-+}
- 
- QT_END_HEADER
- 
diff --git a/debian/patches-4.3.0/00_0176-coverity-fixes.dpatch b/debian/patches-4.3.0/00_0176-coverity-fixes.dpatch
deleted file mode 100755
index 2a56f4e..0000000
--- a/debian/patches-4.3.0/00_0176-coverity-fixes.dpatch
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0176-coverity-fixes.diff.dpatch by Dirk Mueller <mueller@kde.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix various obvious memory leaks.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/gui/painting/qimagescale.cpp qt4-x11-4.3.0/src/gui/painting/qimagescale.cpp
---- qt4-x11-4.3.0~/src/gui/painting/qimagescale.cpp	2007-05-25 15:24:12.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/painting/qimagescale.cpp	2007-06-26 19:58:23.000000000 +0200
-@@ -1005,6 +1005,7 @@
-     buffer = QImage(dw, dh, src.format());
-     if (buffer.isNull()) {
-         qWarning("QImage: out of memory, returning null");
-+        qimageFreeScaleInfo(scaleinfo);
-         return QImage();
-     }
- 
-diff -urNad qt4-x11-4.3.0~/src/svg/qsvghandler.cpp qt4-x11-4.3.0/src/svg/qsvghandler.cpp
---- qt4-x11-4.3.0~/src/svg/qsvghandler.cpp	2007-05-25 15:24:21.000000000 +0200
-+++ qt4-x11-4.3.0/src/svg/qsvghandler.cpp	2007-06-26 19:58:23.000000000 +0200
-@@ -1116,15 +1116,9 @@
-         if (!size.isEmpty()) {
-             QSvgHandler::LengthType type;
-             qreal len = parseLength(size, type, handler);
--            //len = convertToPixels(len, false, type);
-             // ### org_module.svg shows that font size
-             // seems to be always in px...
--            type  = QSvgHandler::PX;
--            if (type == QSvgHandler::PX ||
--                type == QSvgHandler::OTHER)
--                font.setPixelSize(int(len));
--            else
--                font.setPointSizeF(len);
-+            font.setPixelSize(int(len));
-         }
-         if (!style.isEmpty()) {
-             if (style == QLatin1String("normal")) {
-diff -urNad qt4-x11-4.3.0~/src/tools/uic/cpp/cppwriteicondata.cpp qt4-x11-4.3.0/src/tools/uic/cpp/cppwriteicondata.cpp
---- qt4-x11-4.3.0~/src/tools/uic/cpp/cppwriteicondata.cpp	2007-05-25 15:24:38.000000000 +0200
-+++ qt4-x11-4.3.0/src/tools/uic/cpp/cppwriteicondata.cpp	2007-06-26 19:58:23.000000000 +0200
-@@ -50,7 +50,7 @@
-         ba[i] = r;
-     }
-     QByteArray ret(reinterpret_cast<const char *>(ba), baSize);
--    delete ba;
-+    delete [] ba;
-     return ret;
- }
- 
diff --git a/debian/patches-4.3.0/00_0177-qurl-clear-fix.dpatch b/debian/patches-4.3.0/00_0177-qurl-clear-fix.dpatch
deleted file mode 100755
index 9793e76..0000000
--- a/debian/patches-4.3.0/00_0177-qurl-clear-fix.dpatch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0177-qurl-clear-fix.dpatch by Trolltech ASA
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix QUrl::clear().
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/corelib/io/qurl.cpp qt4-x11-4.3.0/src/corelib/io/qurl.cpp
---- qt4-x11-4.3.0~/src/corelib/io/qurl.cpp	2007-05-25 15:24:10.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/io/qurl.cpp	2007-06-30 19:52:57.000000000 +0200
-@@ -3421,6 +3421,7 @@
-     fragment.clear();
- 
-     encodedOriginal.clear();
-+    encodedNormalized.clear();
- 
-     isValid = false;
-     hasQuery = false;
-@@ -3429,7 +3430,7 @@
-     valueDelimiter = '=';
-     pairDelimiter = '&';
- 
--    QURL_UNSETFLAG(stateFlags, Parsed | Validated);
-+    QURL_UNSETFLAG(stateFlags, Parsed | Validated | Normalized);
- }
- 
- QByteArray QUrlPrivate::toEncoded(QUrl::FormattingOptions options) const
diff --git a/debian/patches-4.3.0/00_0178-transparency-window-types.dpatch b/debian/patches-4.3.0/00_0178-transparency-window-types.dpatch
deleted file mode 100755
index 9996387..0000000
--- a/debian/patches-4.3.0/00_0178-transparency-window-types.dpatch
+++ /dev/null
@@ -1,342 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0178-transparency-window-types.dpatch by Lubos Lunak <l.lunak@kde.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch adds Qt support for new window types used for compositing.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qapplication_x11.cpp qt4-x11-4.3.0/src/gui/kernel/qapplication_x11.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qapplication_x11.cpp	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qapplication_x11.cpp	2007-07-05 21:04:23.000000000 +0200
-@@ -199,6 +199,11 @@
-     "_NET_WM_WINDOW_TYPE_SPLASH\0"
-     "_NET_WM_WINDOW_TYPE_TOOLBAR\0"
-     "_NET_WM_WINDOW_TYPE_UTILITY\0"
-+    "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0"
-+    "_NET_WM_WINDOW_TYPE_POPUP_MENU\0"
-+    "_NET_WM_WINDOW_TYPE_COMBO\0"
-+    "_NET_WM_WINDOW_TYPE_DND\0"
-+    "_NET_WM_WINDOW_TYPE_TOOLTIP\0"
- 
-     "_KDE_NET_WM_FRAME_STRUT\0"
- 
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qdnd_x11.cpp qt4-x11-4.3.0/src/gui/kernel/qdnd_x11.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qdnd_x11.cpp	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qdnd_x11.cpp	2007-07-05 21:04:23.000000000 +0200
-@@ -254,6 +254,7 @@
-         QWidget(QApplication::desktop()->screen(screen),
-                 Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
-     {
-+    x11SetWindowType( X11WindowTypeDND );
-     }
- 
-     void setPixmap(const QPixmap &pm)
-@@ -1392,6 +1393,7 @@
-         // recreate the pixmap on the new screen...
-         delete xdnd_data.deco;
-         xdnd_data.deco = new QShapedPixmapWidget(screen);
-+        xdnd_data.deco->x11SetWindowTransient( object->source()->topLevelWidget());
-         if (!QWidget::mouseGrabber()) {
-             updatePixmap();
-             xdnd_data.deco->grabMouse();
-@@ -1852,6 +1854,7 @@
-     object = o;
-     object->d_func()->target = 0;
-     xdnd_data.deco = new QShapedPixmapWidget();
-+    xdnd_data.deco->x11SetWindowTransient( object->source()->topLevelWidget());
- 
-     willDrop = false;
- 
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qt_x11_p.h qt4-x11-4.3.0/src/gui/kernel/qt_x11_p.h
---- qt4-x11-4.3.0~/src/gui/kernel/qt_x11_p.h	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qt_x11_p.h	2007-07-05 21:04:23.000000000 +0200
-@@ -514,6 +514,11 @@
-         _NET_WM_WINDOW_TYPE_SPLASH,
-         _NET_WM_WINDOW_TYPE_TOOLBAR,
-         _NET_WM_WINDOW_TYPE_UTILITY,
-+        _NET_WM_WINDOW_TYPE_DROPDOWN_MENU,
-+        _NET_WM_WINDOW_TYPE_POPUP_MENU,
-+        _NET_WM_WINDOW_TYPE_COMBO,
-+        _NET_WM_WINDOW_TYPE_DND,
-+        _NET_WM_WINDOW_TYPE_TOOLTIP,
- 
-         _KDE_NET_WM_FRAME_STRUT,
- 
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qtooltip.cpp qt4-x11-4.3.0/src/gui/kernel/qtooltip.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qtooltip.cpp	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qtooltip.cpp	2007-07-05 21:04:23.000000000 +0200
-@@ -134,6 +134,9 @@
-     setMouseTracking(true);
-     fadingOut = false;
-     reuseTip(text);
-+#ifdef Q_WS_X11
-+    x11SetWindowType( X11WindowTypeTooltip );
-+#endif
- }
- 
- void QTipLabel::restartHideTimer()
-@@ -351,6 +354,10 @@
-             // that is showing (removes flickering)
-             if (QTipLabel::instance->tipChanged(pos, text, w)){
-                 QTipLabel::instance->reuseTip(text);
-+#ifdef Q_WS_X11
-+                if (w)
-+                    QTipLabel::instance->x11SetWindowTransient( w->topLevelWidget());
-+#endif
-                 QTipLabel::instance->setTipRect(w, rect);
-                 QTipLabel::instance->placeTip(pos, w);
-             }
-@@ -360,6 +367,10 @@
- 
-     if (!text.isEmpty()){ // no tip can be reused, create new tip:
-         new QTipLabel(pos, text, w); // sets QTipLabel::instance to itself
-+#ifdef Q_WS_X11
-+        if (w)
-+            QTipLabel::instance->x11SetWindowTransient( w->topLevelWidget());
-+#endif
-         QTipLabel::instance->setTipRect(w, rect);
-         QTipLabel::instance->placeTip(pos, w);
-         QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label"));
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qwidget.h qt4-x11-4.3.0/src/gui/kernel/qwidget.h
---- qt4-x11-4.3.0~/src/gui/kernel/qwidget.h	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qwidget.h	2007-07-05 21:04:23.000000000 +0200
-@@ -339,6 +339,19 @@
- 
-     void setWindowOpacity(qreal level);
-     qreal windowOpacity() const;
-+#if defined(Q_WS_X11)
-+    enum X11WindowType {
-+        X11WindowTypeSelect,
-+        X11WindowTypeCombo,
-+        X11WindowTypeDND,
-+        X11WindowTypeTooltip,
-+        X11WindowTypeMenu, // torn-off
-+        X11WindowTypeDropdown,
-+        X11WindowTypePopup
-+    };
-+    void x11SetWindowType( X11WindowType type = X11WindowTypeSelect );
-+    void x11SetWindowTransient( QWidget* parent );
-+#endif
- 
-     bool isWindowModified() const;
- #ifndef QT_NO_TOOLTIP
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qwidget_x11.cpp qt4-x11-4.3.0/src/gui/kernel/qwidget_x11.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qwidget_x11.cpp	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qwidget_x11.cpp	2007-07-05 21:04:23.000000000 +0200
-@@ -510,10 +510,6 @@
-     }
- #endif // QT_NO_XRENDER
- 
--    // NET window types
--    long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 };
--    int curr_wintype = 0;
--
-     QtMWMHints mwmhints;
-     mwmhints.flags = 0L;
-     mwmhints.functions = MWM_FUNC_ALL;
-@@ -524,15 +520,11 @@
-     if (topLevel) {
-         ulong wsa_mask = 0;
-         if (type == Qt::SplashScreen) {
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_SPLASH);
-         } else { //       if (customize) {
-             mwmhints.decorations = 0L;
-             mwmhints.flags |= MWM_HINTS_DECORATIONS;
- 
--            if (flags & Qt::FramelessWindowHint) {
--                // override netwm type - quick and easy for KDE noborder
--                net_wintypes[curr_wintype++] = ATOM(_KDE_NET_WM_WINDOW_TYPE_OVERRIDE);
--            } else {
-+            if ((flags & Qt::FramelessWindowHint) == 0 ) {
-                 mwmhints.decorations |= MWM_DECOR_BORDER;
-                 mwmhints.decorations |= MWM_DECOR_RESIZEH;
- 
-@@ -554,22 +546,6 @@
-             wsa.save_under = True;
-             wsa_mask |= CWSaveUnder;
-         }
--        // ### need a better way to do this
--        if (q->inherits("QMenu")) {
--            // menu netwm type
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_MENU);
--        } else if (q->inherits("QToolBar")) {
--            // toolbar netwm type
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLBAR);
--        } else if (type == Qt::Tool || type == Qt::Drawer) {
--            // utility netwm type
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_UTILITY);
--        }
--
--        if (dialog) // dialog netwm type
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DIALOG);
--        // normal netwm type - default
--        net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_NORMAL);
- 
-         if (flags & Qt::X11BypassWindowManagerHint) {
-             wsa.override_redirect = True;
-@@ -588,6 +564,7 @@
-         wsa.save_under = True;
-         XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
-                                 &wsa);
-+        q->x11SetWindowType();
-     } else if (topLevel && !desktop) {        // top-level widget
-         if (!X11->wm_client_leader)
-             create_wm_client_leader();
-@@ -632,12 +609,7 @@
-         // set mwm hints
-         SetMWMHints(dpy, id, mwmhints);
- 
--        // set _NET_WM_WINDOW_TYPE
--        if (curr_wintype > 0)
--            XChangeProperty(dpy, id, ATOM(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace,
--                            (unsigned char *) net_wintypes, curr_wintype);
--        else
--            XDeleteProperty(dpy, id, ATOM(_NET_WM_WINDOW_TYPE));
-+        q->x11SetWindowType(); // set _NET_WM_WINDOW_TYPE
- 
-         // set _NET_WM_PID
-         long curr_pid = getpid();
-@@ -733,6 +705,63 @@
-         q->setAttribute(Qt::WA_OutsideWSRange, true);
- }
- 
-+// Sets the EWMH (netwm) window type. Needed as a separate function
-+// because create() may be too soon in some cases.
-+void QWidget::x11SetWindowType( X11WindowType type )
-+{
-+    Display* dpy = X11->display;
-+    // NET window types
-+    long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 };
-+    int curr_wintype = 0;
-+    if( type == X11WindowTypeSelect ) {
-+        if ( windowType() == Qt::SplashScreen ) {
-+            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_SPLASH);
-+        } else if (inherits("QToolBar")) {
-+	    // toolbar netwm type
-+	    net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLBAR);
-+        } else if (windowType() == Qt::Tool || windowType() == Qt::Drawer) {
-+	    // utility netwm type
-+	    net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_UTILITY);
-+        } else if (windowType() == Qt::Dialog || windowType() == Qt::Sheet
-+            || (windowFlags() & Qt::MSWindowsFixedSizeDialogHint)) {
-+            // dialog netwm type
-+            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DIALOG);
-+        }
-+    } else if( type == X11WindowTypeCombo ) {
-+        // combo netwm type
-+	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_COMBO);
-+    } else if( type == X11WindowTypeDND ) {
-+        // dnd netwm type
-+    	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DND);
-+    } else if( type == X11WindowTypeDropdown ) {
-+        // dropdown netwm type
-+    	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DROPDOWN_MENU);
-+    } else if( type == X11WindowTypePopup ) {
-+        // popup netwm type
-+    	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_POPUP_MENU);
-+    } else if( type == X11WindowTypeMenu ) {
-+        // menu netwm type
-+	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_MENU);
-+    } else if( type == X11WindowTypeTooltip ) {
-+        // tooltip netwm type
-+    	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLTIP);
-+    }
-+
-+    // normal netwm type - default
-+    net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_NORMAL);
-+    // set _NET_WM_WINDOW_TYPE
-+    if (curr_wintype > 0)
-+        XChangeProperty(dpy, winId(), ATOM(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace,
-+			(unsigned char *) net_wintypes, curr_wintype);
-+    else
-+        XDeleteProperty(dpy, winId(), ATOM(_NET_WM_WINDOW_TYPE));
-+}
-+
-+void QWidget::x11SetWindowTransient( QWidget* parent )
-+{
-+    XSetTransientForHint( X11->display, winId(), parent->window()->winId());
-+}
-+
- /*!
-     Frees up window system resources. Destroys the widget window if \a
-     destroyWindow is true.
-diff -urNad qt4-x11-4.3.0~/src/gui/widgets/qcombobox.cpp qt4-x11-4.3.0/src/gui/widgets/qcombobox.cpp
---- qt4-x11-4.3.0~/src/gui/widgets/qcombobox.cpp	2007-05-25 15:24:15.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/widgets/qcombobox.cpp	2007-07-05 21:04:23.000000000 +0200
-@@ -370,6 +370,10 @@
-         layout->insertSpacing(0, verticalMargin);
-         layout->addSpacing(verticalMargin);
-     }
-+#ifdef Q_WS_X11
-+    x11SetWindowType( X11WindowTypeCombo );
-+    x11SetWindowTransient( combo->topLevelWidget());
-+#endif
- }
- 
- void QComboBoxPrivateContainer::scrollItemView(int action)
-diff -urNad qt4-x11-4.3.0~/src/gui/widgets/qmenu.cpp qt4-x11-4.3.0/src/gui/widgets/qmenu.cpp
---- qt4-x11-4.3.0~/src/gui/widgets/qmenu.cpp	2007-05-25 15:24:16.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/widgets/qmenu.cpp	2007-07-05 21:04:23.000000000 +0200
-@@ -84,6 +84,9 @@
-     QTornOffMenu(QMenu *p) : QMenu(*(new QTornOffMenuPrivate(p)))
-     {
-         setParent(p, Qt::Window | Qt::Tool);
-+#ifdef Q_WS_X11
-+        x11SetWindowType( X11WindowTypeMenu );
-+#endif
- 	setAttribute(Qt::WA_DeleteOnClose, true);
-         setWindowTitle(p->windowTitle());
-         setEnabled(p->isEnabled());
-@@ -130,6 +133,9 @@
-     }
-     defaultMenuAction = menuAction = new QAction(q);
-     menuAction->d_func()->menu = q;
-+#ifdef Q_WS_X11
-+    q->x11SetWindowType( QWidget::X11WindowTypePopup );
-+#endif
- }
- 
- //Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
-@@ -1611,6 +1617,32 @@
-     }
-     setGeometry(QRect(pos, size));
- 
-+#ifdef Q_WS_X11
-+    QWidget* top = this;
-+    for(;;) {
-+        if( QMenu* m = qobject_cast< QMenu* >( top )) {
-+            if( m->d_func()->causedPopup.widget == NULL )
-+                break; // --->
-+            top = m->d_func()->causedPopup.widget;
-+        } else
-+            break; // -->
-+    }
-+    if( QMenu* m = qobject_cast< QMenu* >( top ))
-+        x11SetWindowType( X11WindowTypePopup );
-+    else
-+        x11SetWindowType( X11WindowTypeDropdown );
-+    // hackish ... try to find the main window related to this popup
-+    QWidget* parent = d_func()->causedPopup.widget;
-+    if( parent == NULL )
-+        parent = parentWidget() ? parentWidget()->topLevelWidget() : NULL;
-+    if( parent == NULL )
-+        parent = QApplication::widgetAt( pos );
-+    if( parent == NULL )
-+        parent = qApp->activeWindow();
-+    if( parent != NULL )
-+        x11SetWindowTransient( parent );
-+#endif
-+
- #ifndef QT_NO_EFFECTS
-     int hGuess = qApp->layoutDirection() == Qt::RightToLeft ? QEffects::LeftScroll : QEffects::RightScroll;
-     int vGuess = QEffects::DownScroll;
-@@ -1807,6 +1839,9 @@
-     if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget))
-         mb->d_func()->setCurrentAction(0);
- #endif
-+#ifdef Q_WS_X11
-+    x11SetWindowType( X11WindowTypePopup ); // reset
-+#endif
-     d->mouseDown = 0;
-     d->hasHadMouse = false;
-     d->causedPopup.widget = 0;
diff --git a/debian/patches-4.3.0/00_0179-transient-hack.dpatch b/debian/patches-4.3.0/00_0179-transient-hack.dpatch
deleted file mode 100755
index 4022100..0000000
--- a/debian/patches-4.3.0/00_0179-transient-hack.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0179-transient-hack.dpatch by Lubos Lunak <l.lunak@kde.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: qt-bugs issue : 166027
-## DP: This patch is just a hackish workaround that makes setting of WM_TRANSIENT_FOR
-## DP: work with some window types (needed basically by the 0178 patch).
-## DP: It is not a proper solution, waiting for TT to come up with something.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qwidget_x11.cpp qt4-x11-4.3.0/src/gui/kernel/qwidget_x11.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qwidget_x11.cpp	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qwidget_x11.cpp	2007-07-05 21:05:27.000000000 +0200
-@@ -1569,7 +1569,7 @@
-         do_size_hints(q, extra);
- 
-         // udpate WM_TRANSIENT_FOR
--        if (isTransient(q)) {
-+        if (isTransient(q) && !( q->windowFlags() & Qt::X11BypassWindowManagerHint)) {
-             QWidget *p = q->parentWidget();
-             if (p)
-                 p = p->window();
diff --git a/debian/patches-4.3.0/00_0180-window-role.dpatch b/debian/patches-4.3.0/00_0180-window-role.dpatch
deleted file mode 100644
index 33a9a8b..0000000
--- a/debian/patches-4.3.0/00_0180-window-role.dpatch
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0180-window-role.dpatch by Lubos Lunak <l.lunak@kde.org
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: several problems with Qt's support for the WM_WINDOW_ROLE property.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/corelib/kernel/qobject.cpp qt4-x11-4.3.0/src/corelib/kernel/qobject.cpp
---- qt4-x11-4.3.0~/src/corelib/kernel/qobject.cpp	2007-05-25 15:24:10.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/kernel/qobject.cpp	2007-06-26 20:02:32.000000000 +0200
-@@ -994,9 +994,18 @@
- {
-     Q_D(QObject);
-     d->objectName = name;
-+#if defined(Q_WS_X11)
-+    d->checkWindowRole();
-+#endif
- }
- 
- 
-+#if defined(Q_WS_X11)
-+void QObjectPrivate::checkWindowRole()
-+{
-+}
-+#endif
-+
- #ifdef QT3_SUPPORT
- /*! \internal
-     QObject::child is compat but needs to call itself recursively,
-diff -urNad qt4-x11-4.3.0~/src/corelib/kernel/qobject_p.h qt4-x11-4.3.0/src/corelib/kernel/qobject_p.h
---- qt4-x11-4.3.0~/src/corelib/kernel/qobject_p.h	2007-05-25 15:24:10.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/kernel/qobject_p.h	2007-06-26 20:02:32.000000000 +0200
-@@ -124,6 +124,9 @@
-     mutable quint32 connectedSignals;
- 
-     QString objectName;
-+#if defined(Q_WS_X11)
-+    virtual void checkWindowRole();
-+#endif
- };
- 
- class QSemaphore;
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qwidget_p.h qt4-x11-4.3.0/src/gui/kernel/qwidget_p.h
---- qt4-x11-4.3.0~/src/gui/kernel/qwidget_p.h	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qwidget_p.h	2007-06-26 20:02:32.000000000 +0200
-@@ -286,6 +286,7 @@
- 
- #if defined(Q_WS_X11)
-     void setWindowRole(const char *role);
-+    virtual void checkWindowRole();
-     void sendStartupMessage(const char *message) const;
- #endif
- 
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qwidget_x11.cpp qt4-x11-4.3.0/src/gui/kernel/qwidget_x11.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qwidget_x11.cpp	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qwidget_x11.cpp	2007-06-26 20:02:32.000000000 +0200
-@@ -647,11 +647,8 @@
-         // when we create a toplevel widget, the frame strut should be dirty
-         data.fstrut_dirty = 1;
- 
--        // declare the widget's object name as window role
--        QByteArray objName = q->objectName().toLocal8Bit();
--        XChangeProperty(dpy, id,
--                        ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
--                        (unsigned char *)objName.constData(), objName.length());
-+        // declare the widget's object name as window role if not set
-+        setWindowRole( !q->windowRole().isEmpty() ? q->windowRole().toUtf8() : q->objectName().toUtf8());
- 
-         // set client leader property
-         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
-@@ -2588,12 +2585,20 @@
- void QWidgetPrivate::setWindowRole(const char *role)
- {
-     Q_Q(QWidget);
--    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
-+    if( !q->testAttribute(Qt::WA_WState_Created))
-+        return;
-     XChangeProperty(X11->display, q->internalWinId(),
-                     ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-                     (unsigned char *)role, qstrlen(role));
- }
- 
-+void QWidgetPrivate::checkWindowRole()
-+{
-+    Q_Q(QWidget);
-+    if( q->windowRole().isEmpty())
-+        setWindowRole( objectName.toUtf8());
-+}
-+
- Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
- QPaintEngine *QWidget::paintEngine() const
- {
diff --git a/debian/patches-4.3.0/00_0181-qdnd-x11-fix.dpatch b/debian/patches-4.3.0/00_0181-qdnd-x11-fix.dpatch
deleted file mode 100644
index c2dbb0e..0000000
--- a/debian/patches-4.3.0/00_0181-qdnd-x11-fix.dpatch
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0181-qdnd-x11-fix.diff.dpatch by Matthias Kretz <kretz@kde.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: qt-bugs issue : 166518
-## Trolltech task ID : 167509
-## DP: This patch makes the algorithm look at _all_ widgets that contain the QPoint.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qdnd_x11.cpp qt4-x11-4.3.0/src/gui/kernel/qdnd_x11.cpp
---- qt4-x11-4.3.0~/src/gui/kernel/qdnd_x11.cpp	2007-05-25 15:24:19.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/kernel/qdnd_x11.cpp	2007-06-26 20:05:15.000000000 +0200
-@@ -42,6 +42,7 @@
- #include "qdebug.h"
- #include "qimagewriter.h"
- #include "qbuffer.h"
-+#include "qstack.h"
- 
- #include "qdnd_p.h"
- #include "qt_x11_p.h"
-@@ -668,7 +669,44 @@
- }
- 
- 
--static QWidget *find_child(QWidget *tlw, QPoint & p)
-+static QWidget *find_next_child(QWidget *child, QPoint &p, QStack<int> &chosenLine)
-+{
-+    p = child->mapToParent(p);
-+    QWidget *widget = child->parentWidget();
-+    if (!widget) {
-+        return widget;
-+    }
-+
-+    bool done = false;
-+    bool backwards = true;
-+    while (!done) {
-+        done = true;
-+        if (((QExtraWidget*)widget)->extraData() &&
-+             ((QExtraWidget*)widget)->extraData()->xDndProxy != 0)
-+            break; // stop searching for widgets under the mouse cursor if found widget is a proxy.
-+        QObjectList children = widget->children();
-+        if (!chosenLine.isEmpty() && !children.isEmpty()) {
-+            for(int i = backwards ? chosenLine.pop() : children.size(); i > 0;) {
-+                --i;
-+                QWidget *w = qobject_cast<QWidget *>(children.at(i));
-+                if (!w)
-+                    continue;
-+                if (w->isVisible() &&
-+                     w->geometry().contains(p) &&
-+                     !w->isWindow()) {
-+                    widget = w;
-+                    done = false;
-+                    backwards = false;
-+                    p = widget->mapFromParent(p);
-+                    chosenLine << i;
-+                    break;
-+                }
-+            }
-+        }
-+    }
-+    return widget;
-+}
-+static QWidget *find_child(QWidget *tlw, QPoint & p, QStack<int> &chosenLine)
- {
-     QWidget *widget = tlw;
- 
-@@ -692,6 +730,7 @@
-                     widget = w;
-                     done = false;
-                     p = widget->mapFromParent(p);
-+                    chosenLine.push(i);
-                     break;
-                 }
-             }
-@@ -780,7 +819,8 @@
-     const unsigned long *l = (const unsigned long *)xe->xclient.data.l;
- 
-     QPoint p((l[2] & 0xffff0000) >> 16, l[2] & 0x0000ffff);
--    QWidget * c = find_child(w, p); // changes p to to c-local coordinates
-+    QStack<int> chosenLine;
-+    QWidget * c = find_child(w, p, chosenLine); // changes p to to c-local coordinates
- 
-     if (!passive && checkEmbedded(c, xe))
-         return;
-@@ -814,8 +854,7 @@
- 
-     if (!passive) { // otherwise just reject
-         while (c && !c->acceptDrops() && !c->isWindow()) {
--            p = c->mapToParent(p);
--            c = c->parentWidget();
-+            c = find_next_child(c, p, chosenLine);
-         }
-         QWidget *target_widget = c && c->acceptDrops() ? c : 0;
- 
diff --git a/debian/patches-4.3.0/00_0183-qprocess-corruption.dpatch b/debian/patches-4.3.0/00_0183-qprocess-corruption.dpatch
deleted file mode 100755
index bf5da11..0000000
--- a/debian/patches-4.3.0/00_0183-qprocess-corruption.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0183-qprocess-corruption.dpatch by Andreas Aardal Hanssen <ahanssen@trolltech.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix plain data loss bug.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/corelib/io/qprocess.cpp qt4-x11-4.3.0/src/corelib/io/qprocess.cpp
---- qt4-x11-4.3.0~/src/corelib/io/qprocess.cpp	2007-05-25 15:24:09.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/io/qprocess.cpp	2007-06-30 19:53:44.000000000 +0200
-@@ -826,15 +826,21 @@
-     read(), readAll(), readLine(), and getChar(). It also determines
-     which channel triggers QProcess to emit readyRead().
- 
--    Changing the read channel will clear the unget buffer.
--
-     \sa readChannel()
- */
- void QProcess::setReadChannel(ProcessChannel channel)
- {
-     Q_D(QProcess);
--    if (d->processChannel != channel)
--        d->buffer.clear();
-+    if (d->processChannel != channel) {
-+        QByteArray buf = d->buffer.readAll();
-+        if (d->processChannel == QProcess::StandardOutput) {
-+            for (int i = buf.size() - 1; i >= 0; --i)
-+                d->outputReadBuffer.ungetChar(buf.at(i));
-+        } else {
-+            for (int i = buf.size() - 1; i >= 0; --i)
-+                d->errorReadBuffer.ungetChar(buf.at(i));
-+        }
-+    }
-     d->processChannel = channel;
- }
- 
diff --git a/debian/patches-4.3.0/00_0185-fix-format-strings.dpatch b/debian/patches-4.3.0/00_0185-fix-format-strings.dpatch
deleted file mode 100755
index 9a6c813..0000000
--- a/debian/patches-4.3.0/00_0185-fix-format-strings.dpatch
+++ /dev/null
@@ -1,271 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0185-fix-format-strings.dpatch by Fathi Boudra <fboudra@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/corelib/global/qglobal.h qt4-x11-4.3.0/src/corelib/global/qglobal.h
---- qt4-x11-4.3.0~/src/corelib/global/qglobal.h	2007-05-25 15:24:09.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/global/qglobal.h	2007-07-30 22:05:17.000000000 +0200
-@@ -1261,8 +1261,16 @@
- #ifdef QT3_SUPPORT
- Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
- #endif /* QT3_SUPPORT */
--Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
--Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
-+Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+    __attribute__ ((format (printf, 2, 3)))
-+#endif
-+    ;
-+Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+    __attribute__ ((format (printf, 1, 2)))
-+#endif
-+    ;
- 
- #if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM)
- #define QT_NO_DEBUG_STREAM
-diff -urNad qt4-x11-4.3.0~/src/corelib/tools/qbytearray.h qt4-x11-4.3.0/src/corelib/tools/qbytearray.h
---- qt4-x11-4.3.0~/src/corelib/tools/qbytearray.h	2007-05-25 15:24:11.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/tools/qbytearray.h	2007-07-30 22:05:17.000000000 +0200
-@@ -71,8 +71,16 @@
- Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
- 
- // implemented in qvsnprintf.cpp
--Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
--Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
-+Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 3, 0)))
-+#endif
-+    ;
-+Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 3, 4)))
-+#endif
-+    ;
- 
- #ifdef QT3_SUPPORT
- inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
-diff -urNad qt4-x11-4.3.0~/src/gui/painting/qprintengine_pdf.cpp qt4-x11-4.3.0/src/gui/painting/qprintengine_pdf.cpp
---- qt4-x11-4.3.0~/src/gui/painting/qprintengine_pdf.cpp	2007-05-25 15:24:13.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/painting/qprintengine_pdf.cpp	2007-07-30 22:05:17.000000000 +0200
-@@ -386,9 +386,8 @@
-         object = addXrefEntry(-1);
-         QByteArray alphaDef;
-         QPdf::ByteStream s(&alphaDef);
--        s << "<< /ca " << (alpha/qreal(255.)) << ">>\n";
--        xprintf(alphaDef.constData());
--        xprintf("endobj\n");
-+        s << "<< /ca " << (alpha/qreal(255.)) << ">>";
-+        xprintf("%s\nendobj\n", alphaDef.constData());
-     }
-     currentPage->graphicStates.append(object);
-     return object;
-diff -urNad qt4-x11-4.3.0~/src/gui/painting/qprintengine_pdf_p.h qt4-x11-4.3.0/src/gui/painting/qprintengine_pdf_p.h
---- qt4-x11-4.3.0~/src/gui/painting/qprintengine_pdf_p.h	2007-05-25 15:24:13.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/painting/qprintengine_pdf_p.h	2007-07-30 22:05:17.000000000 +0200
-@@ -148,7 +148,11 @@
-     void writePage();
- 
-     int addXrefEntry(int object, bool printostr = true);
--    void xprintf(const char* fmt, ...);
-+    void xprintf(const char* fmt, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 2, 3)))
-+#endif
-+        ;
-     inline void write(const QByteArray &data) {
-         stream->writeRawData(data.constData(), data.size());
-         streampos += data.size();
-diff -urNad qt4-x11-4.3.0~/src/qt3support/tools/q3cstring.h qt4-x11-4.3.0/src/qt3support/tools/q3cstring.h
---- qt4-x11-4.3.0~/src/qt3support/tools/q3cstring.h	2007-05-25 15:24:21.000000000 +0200
-+++ qt4-x11-4.3.0/src/qt3support/tools/q3cstring.h	2007-07-30 22:05:17.000000000 +0200
-@@ -57,7 +57,11 @@
-     }
- 
-     Q3CString        copy()        const { return *this; }
--    Q3CString    &sprintf(const char *format, ...);
-+    Q3CString    &sprintf(const char *format, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 2, 3)))
-+#endif
-+        ;
- 
-     Q3CString        left(uint len)  const { return QByteArray::left(len); }
-     Q3CString        right(uint len) const { return QByteArray::right(len); }
-diff -urNad qt4-x11-4.3.0~/src/qt3support/tools/q3gcache.cpp qt4-x11-4.3.0/src/qt3support/tools/q3gcache.cpp
---- qt4-x11-4.3.0~/src/qt3support/tools/q3gcache.cpp	2007-05-25 15:24:20.000000000 +0200
-+++ qt4-x11-4.3.0/src/qt3support/tools/q3gcache.cpp	2007-07-30 22:05:17.000000000 +0200
-@@ -622,7 +622,7 @@
- #if defined(QT_DEBUG)
-     QString line;
-     line.fill(QLatin1Char('*'), 80);
--    qDebug(line.ascii());
-+    qDebug("%s", line.ascii());
-     qDebug("CACHE STATISTICS:");
-     qDebug("cache contains %d item%s, with a total cost of %d",
- 	   count(), count() != 1 ? "s" : "", tCost);
-@@ -643,7 +643,7 @@
- 	   lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts);
-     qDebug("Statistics from internal dictionary class:");
-     dict->statistics();
--    qDebug(line.ascii());
-+    qDebug("%s", line.ascii());
- #endif
- }
- 
-diff -urNad qt4-x11-4.3.0~/src/qt3support/tools/q3gdict.cpp qt4-x11-4.3.0/src/qt3support/tools/q3gdict.cpp
---- qt4-x11-4.3.0~/src/qt3support/tools/q3gdict.cpp	2007-05-25 15:24:20.000000000 +0200
-+++ qt4-x11-4.3.0/src/qt3support/tools/q3gdict.cpp	2007-07-30 22:05:17.000000000 +0200
-@@ -828,11 +828,11 @@
-     QString line;
-     line.fill(QLatin1Char('-'), 60);
-     double real, ideal;
--    qDebug(line.ascii());
-+    qDebug("%s", line.ascii());
-     qDebug("DICTIONARY STATISTICS:");
-     if (count() == 0) {
-         qDebug("Empty!");
--        qDebug(line.ascii());
-+        qDebug("%s", line.ascii());
-         return;
-     }
-     real = 0.0;
-@@ -853,7 +853,7 @@
-         while (b--)
-             *pbuf++ = '*';
-         *pbuf = '\0';
--        qDebug(buf);
-+        qDebug("%s", buf);
-         i++;
-     }
-     qDebug("Array size = %d", size());
-@@ -861,7 +861,7 @@
-     qDebug("Real dist  = %g", real);
-     qDebug("Rand dist  = %g", ideal);
-     qDebug("Real/Rand  = %g", real/ideal);
--    qDebug(line.ascii());
-+    qDebug("%s", line.ascii());
- #endif // QT_DEBUG
- }
- 
-diff -urNad qt4-x11-4.3.0~/tools/assistant/config.cpp qt4-x11-4.3.0/tools/assistant/config.cpp
---- qt4-x11-4.3.0~/tools/assistant/config.cpp	2007-05-25 15:24:32.000000000 +0200
-+++ qt4-x11-4.3.0/tools/assistant/config.cpp	2007-07-30 22:05:17.000000000 +0200
-@@ -73,12 +73,12 @@
- 
-     QFile file(profileFileName);
-     if (!file.exists()) {
--        qWarning( (QLatin1String("File does not exist: ") + profileFileName).toAscii().constData() );
-+        qWarning( "File does not exist: %s", qPrintable(profileFileName) );
-         return 0;
-     }
-     DocuParser *parser = DocuParser::createParser( profileFileName );
-     if (!parser) {
--        qWarning( (QLatin1String("Failed to create parser for file: ") + profileFileName).toAscii().constData() );
-+        qWarning( "Failed to create parser for file: %s", qPrintable(profileFileName) );
-         return 0;
-     }
-     if (parser->parserVersion() < DocuParser::Qt320) {
-@@ -89,7 +89,7 @@
-     parser->parse(&file);
-     config->profil = profileParser->profile();
-     if (!config->profil) {
--        qWarning( (QLatin1String("Config::loadConfig(), no profile in: ") + profileFileName).toAscii().constData() );
-+        qWarning( "Config::loadConfig(), no profile in: %s", qPrintable(profileFileName) );
-         return 0;
-     }
-     config->profil->setProfileType(Profile::UserProfile);
-diff -urNad qt4-x11-4.3.0~/tools/assistant/index.cpp qt4-x11-4.3.0/tools/assistant/index.cpp
---- qt4-x11-4.3.0~/tools/assistant/index.cpp	2007-05-25 15:24:31.000000000 +0200
-+++ qt4-x11-4.3.0/tools/assistant/index.cpp	2007-07-30 22:05:17.000000000 +0200
-@@ -180,7 +180,7 @@
- {
-     QFile file( filename );
-     if ( !file.open(QFile::ReadOnly) ) {
--        qWarning( (QLatin1String("can not open file ") + filename).toAscii().constData() );
-+        qWarning( "can not open file %s", qPrintable(filename) );
-         return;
-     }
- 
-@@ -352,7 +352,7 @@
- 
-     QFile file( fileName );
-     if ( !file.open( QFile::ReadOnly ) ) {
--        qWarning( (QLatin1String("cannot open file ") + fileName).toAscii().constData() );
-+        qWarning( "cannot open file %s", qPrintable(fileName) );
-         return fileName;
-     }
-     QTextStream s( &file );
-@@ -474,7 +474,7 @@
-     QString fName = url.toLocalFile();
-     QFile file( fName );
-     if ( !file.open( QFile::ReadOnly ) ) {
--        qWarning( (QLatin1String("cannot open file ") + fName).toAscii().constData() );
-+        qWarning( "cannot open file %s", qPrintable(fName) );
-         return false;
-     }
- 
-diff -urNad qt4-x11-4.3.0~/tools/designer/src/lib/shared/qdesigner_utils.cpp qt4-x11-4.3.0/tools/designer/src/lib/shared/qdesigner_utils.cpp
---- qt4-x11-4.3.0~/tools/designer/src/lib/shared/qdesigner_utils.cpp	2007-05-25 15:25:01.000000000 +0200
-+++ qt4-x11-4.3.0/tools/designer/src/lib/shared/qdesigner_utils.cpp	2007-07-30 22:05:17.000000000 +0200
-@@ -40,9 +40,7 @@
- {
-     QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message)
-     {
--        QString prefixedMessage = QLatin1String("Designer: ");
--        prefixedMessage += message;
--        qWarning(prefixedMessage.toUtf8().constData());
-+        qWarning("Designer: %s", qPrintable(message));
-     }
- 
-     QString EnumType::id() const
-diff -urNad qt4-x11-4.3.0~/tools/designer/src/lib/uilib/formbuilderextra.cpp qt4-x11-4.3.0/tools/designer/src/lib/uilib/formbuilderextra.cpp
---- qt4-x11-4.3.0~/tools/designer/src/lib/uilib/formbuilderextra.cpp	2007-05-25 15:25:01.000000000 +0200
-+++ qt4-x11-4.3.0/tools/designer/src/lib/uilib/formbuilderextra.cpp	2007-07-30 22:05:17.000000000 +0200
-@@ -33,9 +33,7 @@
- #endif
- 
- void uiLibWarning(const QString &message) {
--    QString prefixedMessage = QLatin1String("Designer: ");
--    prefixedMessage += message;
--    qWarning(prefixedMessage.toUtf8().constData());
-+    qWarning("Designer: %s", qPrintable(message));
- }
- 
- QFormBuilderExtra::QFormBuilderExtra() :
-diff -urNad qt4-x11-4.3.0~/tools/linguist/shared/profileevaluator.h qt4-x11-4.3.0/tools/linguist/shared/profileevaluator.h
---- qt4-x11-4.3.0~/tools/linguist/shared/profileevaluator.h	2007-05-25 15:24:24.000000000 +0200
-+++ qt4-x11-4.3.0/tools/linguist/shared/profileevaluator.h	2007-07-30 22:05:17.000000000 +0200
-@@ -88,7 +88,11 @@
- 
- private:
-     void logMessage(const QString &msg, MessageType mt = MT_DebugLevel2);
--    void logMessage(MessageType mt, const char *msg, ...);
-+    void logMessage(MessageType mt, const char *msg, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 3, 4)))
-+#endif
-+        ;
-     QString expandVariableReferences(const QString &value);
-     QString evaluateExpandFunction(const QByteArray &func, const QString &arguments);
- 
-diff -urNad qt4-x11-4.3.0~/tools/qtestlib/src/qtest_global.h qt4-x11-4.3.0/tools/qtestlib/src/qtest_global.h
---- qt4-x11-4.3.0~/tools/qtestlib/src/qtest_global.h	2007-05-25 15:24:23.000000000 +0200
-+++ qt4-x11-4.3.0/tools/qtestlib/src/qtest_global.h	2007-07-30 22:05:17.000000000 +0200
-@@ -59,7 +59,11 @@
-     enum SkipMode { SkipSingle = 1, SkipAll = 2 };
-     enum TestFailMode { Abort = 1, Continue = 2 };
- 
--    int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...);
-+    int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 3, 4)))
-+#endif
-+        ;
- }
- 
- QT_END_HEADER
diff --git a/debian/patches-4.3.0/00_0186-fix-component-alpha-text.dpatch b/debian/patches-4.3.0/00_0186-fix-component-alpha-text.dpatch
deleted file mode 100755
index d341908..0000000
--- a/debian/patches-4.3.0/00_0186-fix-component-alpha-text.dpatch
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_0186-fix-component-alpha-text.diff.dpatch by Fathi Boudra <fboudra@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/gui/text/qfontengine_ft.cpp qt4-x11-4.3.0/src/gui/text/qfontengine_ft.cpp
---- qt4-x11-4.3.0~/src/gui/text/qfontengine_ft.cpp	2007-05-25 15:24:14.000000000 +0200
-+++ qt4-x11-4.3.0/src/gui/text/qfontengine_ft.cpp	2007-07-30 21:58:21.000000000 +0200
-@@ -699,7 +699,8 @@
-                         uint red = src[x];
-                         uint green = src[x+1];
-                         uint blue = src[x+2];
--                        uint res = (red << 16) + (green << 8) + blue;
-+                        uint alpha = green;
-+                        uint res = (alpha << 24) + (red << 16) + (green << 8) + blue;
-                         *dd = res;
-                         ++dd;
-                     }
-@@ -713,7 +714,8 @@
-                         uint blue = src[x];
-                         uint green = src[x+1];
-                         uint red = src[x+2];
--                        uint res = (red << 16) + (green << 8) + blue;
-+                        uint alpha = green;
-+                        uint res = (alpha << 24) + (red << 16) + (green << 8) + blue;
-                         *dd = res;
-                         ++dd;
-                     }
-@@ -737,7 +739,7 @@
-                         uint high = (red*subpixel_filter[0][0] + green*subpixel_filter[0][1] + blue*subpixel_filter[0][2]) >> 8;
-                         uint mid = (red*subpixel_filter[1][0] + green*subpixel_filter[1][1] + blue*subpixel_filter[1][2]) >> 8;
-                         uint low = (red*subpixel_filter[2][0] + green*subpixel_filter[2][1] + blue*subpixel_filter[2][2]) >> 8;
--                        uint res = (high << 16) + (mid << 8) + low;
-+                        uint res = (mid << 24) + (high << 16) + (mid << 8) + low;
-                         dst[x] = res;
-                     }
-                     dst += info.width;
-@@ -752,7 +754,7 @@
-                         uint high = (red*subpixel_filter[0][0] + green*subpixel_filter[0][1] + blue*subpixel_filter[0][2]) >> 8;
-                         uint mid = (red*subpixel_filter[1][0] + green*subpixel_filter[1][1] + blue*subpixel_filter[1][2]) >> 8;
-                         uint low = (red*subpixel_filter[2][0] + green*subpixel_filter[2][1] + blue*subpixel_filter[2][2]) >> 8;
--                        uint res = (high << 16) + (mid << 8) + low;
-+                        uint res = (mid << 24) + (high << 16) + (mid << 8) + low;
-                         dst[x] = res;
-                     }
-                     dst += info.width;
diff --git a/debian/patches-4.3.0/00list b/debian/patches-4.3.0/00list
deleted file mode 100644
index 88cc4e5..0000000
--- a/debian/patches-4.3.0/00list
+++ /dev/null
@@ -1,30 +0,0 @@
-00_0163-fix-gcc43-support
-00_0167-fix-group-reading
-00_0172-prefer-xrandr-over-xinerama
-00_0175-fix-s390-qatomic
-#00_0176-coverity-fixes
-#00_0177-qurl-clear-fix
-00_0178-transparency-window-types
-00_0179-transient-hack
-00_0180-window-role
-#00_0181-qdnd-x11-fix
-#00_0183-qprocess-corruption
-00_0185-fix-format-strings
-00_0186-fix-component-alpha-text
-01_qmake_for_debian
-02_launch_assistant-qt4
-03_launch_moc-qt4
-04_launch_uic-qt4
-05_append_qt4_target
-06_qtdemo_destdir
-20_mips_atomic_ops
-#30_arm_ftbfs_fixes
-31_arm_eabi_fix
-40_alpha_ice
-41_disable_opengl_visibility
-#42_alpha_fetch_and_add
-50_kfreebsd_build_fix
-51_kfreebsd_mkspecs
-60_m68k_inotify_fix
-70_hppa_ldcw_fix
-80_hurd_max_path
diff --git a/debian/patches-4.3.0/01_qmake_for_debian.dpatch b/debian/patches-4.3.0/01_qmake_for_debian.dpatch
deleted file mode 100755
index de6086f..0000000
--- a/debian/patches-4.3.0/01_qmake_for_debian.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_qmake_use_qt4_tools.dpatch by Brian Nelson <pyro@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ensures qmake generates Makefiles that use the -qt4 tools and
-## DP: that use recursively link against all indirectly-used libraries.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/mkspecs/common/linux.conf qt4-x11-4.3.0/mkspecs/common/linux.conf
---- qt4-x11-4.3.0~/mkspecs/common/linux.conf	2007-05-25 15:24:01.000000000 +0200
-+++ qt4-x11-4.3.0/mkspecs/common/linux.conf	2007-07-30 22:18:23.000000000 +0200
-@@ -23,8 +23,8 @@
- QMAKE_LIBS_OPENGL_QT  = -lGL
- QMAKE_LIBS_THREAD     = -lpthread
- 
--QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
--QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
-+QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc-qt4
-+QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic-qt4
- 
- QMAKE_AR              = ar cqs
- QMAKE_RANLIB          =
-diff -urNad qt4-x11-4.3.0~/mkspecs/linux-g++/qmake.conf qt4-x11-4.3.0/mkspecs/linux-g++/qmake.conf
---- qt4-x11-4.3.0~/mkspecs/linux-g++/qmake.conf	2007-05-25 15:24:01.000000000 +0200
-+++ qt4-x11-4.3.0/mkspecs/linux-g++/qmake.conf	2007-07-30 22:19:35.000000000 +0200
-@@ -4,8 +4,9 @@
- 
- MAKEFILE_GENERATOR	= UNIX
- TEMPLATE		= app
--CONFIG			+= qt warn_on release incremental link_prl
-+CONFIG			+= qt warn_on release incremental
- QT			+= core gui
-+DEFINES		+= QT_SHARED
- QMAKE_INCREMENTAL_STYLE = sublib
- 
- include(../common/g++.conf)
diff --git a/debian/patches-4.3.0/02_launch_assistant-qt4.dpatch b/debian/patches-4.3.0/02_launch_assistant-qt4.dpatch
deleted file mode 100755
index e831a2c..0000000
--- a/debian/patches-4.3.0/02_launch_assistant-qt4.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_launch_assistant-qt4.dpatch by Brian Nelson <pyro@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~rc1~/tools/assistant/lib/qassistantclient.cpp qt4-x11-4.3.0~rc1/tools/assistant/lib/qassistantclient.cpp
---- qt4-x11-4.3.0~rc1~/tools/assistant/lib/qassistantclient.cpp	2007-05-06 17:54:36.000000000 +0200
-+++ qt4-x11-4.3.0~rc1/tools/assistant/lib/qassistantclient.cpp	2007-05-18 09:43:26.000000000 +0200
-@@ -172,11 +172,11 @@
-     : QObject( parent ), host ( QLatin1String("localhost") )
- {
-     if ( path.isEmpty() )
--        assistantCommand = QLatin1String("assistant");
-+        assistantCommand = QLatin1String("assistant-qt4");
-     else {
-         QFileInfo fi( path );
-         if ( fi.isDir() )
--            assistantCommand = path + QLatin1String("/assistant");
-+            assistantCommand = path + QLatin1String("/assistant-qt4");
-         else
-             assistantCommand = path;
-     }
diff --git a/debian/patches-4.3.0/03_launch_moc-qt4.dpatch b/debian/patches-4.3.0/03_launch_moc-qt4.dpatch
deleted file mode 100755
index dc621df..0000000
--- a/debian/patches-4.3.0/03_launch_moc-qt4.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_launch_moc-qt4.dpatch by Brian Nelson <pyro@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ensure the Qt4 version of moc is launched.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~rc1~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp qt4-x11-4.3.0~rc1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
---- qt4-x11-4.3.0~rc1~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2007-05-06 17:54:54.000000000 +0200
-+++ qt4-x11-4.3.0~rc1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2007-05-18 09:44:18.000000000 +0200
-@@ -376,7 +376,7 @@
-         else {
-             // run moc on this file
-             QProcess proc;
--            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
-+            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
- 
-             if (!proc.waitForStarted()) {
-                 fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");
diff --git a/debian/patches-4.3.0/04_launch_uic-qt4.dpatch b/debian/patches-4.3.0/04_launch_uic-qt4.dpatch
deleted file mode 100755
index b760f75..0000000
--- a/debian/patches-4.3.0/04_launch_uic-qt4.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ensure-uic.dpatch by Fathi Boudra <fboudra@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/tools/designer/src/lib/shared/qdesigner_utils.cpp qt4-x11-4.3.0/tools/designer/src/lib/shared/qdesigner_utils.cpp
---- qt4-x11-4.3.0~/tools/designer/src/lib/shared/qdesigner_utils.cpp	2007-05-25 15:25:01.000000000 +0200
-+++ qt4-x11-4.3.0/tools/designer/src/lib/shared/qdesigner_utils.cpp	2007-07-01 11:14:29.000000000 +0200
-@@ -120,7 +120,7 @@
-         binary += QDir::separator();
-         switch (mode) {
-         case UIC_GenerateCode:
--            binary += QLatin1String("uic");
-+            binary += QLatin1String("uic-qt4");
-             break;
-         case UIC_ConvertV3:
-             binary += QLatin1String("uic3");
diff --git a/debian/patches-4.3.0/05_append_qt4_target.dpatch b/debian/patches-4.3.0/05_append_qt4_target.dpatch
deleted file mode 100755
index 0b2a998..0000000
--- a/debian/patches-4.3.0/05_append_qt4_target.dpatch
+++ /dev/null
@@ -1,244 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-target.dpatch by Fathi Boudra <fboudra@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/configure qt4-x11-4.3.0/configure
---- qt4-x11-4.3.0~/configure	2007-05-25 15:24:55.000000000 +0200
-+++ qt4-x11-4.3.0/configure	2007-07-01 11:54:42.000000000 +0200
-@@ -3398,7 +3398,7 @@
- }
- 
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if true; then ###[ '!' -f "$outpath/bin/qmake-qt4" ];
-     echo "Creating qmake. Please wait..."
- 
-     OLD_QCONFIG_H=
-@@ -5312,8 +5312,8 @@
- QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
- 
- #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
--QMAKE_MOC        = \$\$QT_BUILD_TREE/bin/moc
--QMAKE_UIC        = \$\$QT_BUILD_TREE/bin/uic
-+QMAKE_MOC        = \$\$QT_BUILD_TREE/bin/moc-qt4
-+QMAKE_UIC        = \$\$QT_BUILD_TREE/bin/uic-qt4
- QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
- QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
- QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -5577,11 +5577,11 @@
- #-------------------------------------------------------------------------------
- 
- echo "Finding project files. Please wait..."
--"$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
-+"$outpath/bin/qmake-qt4" -prl -r "${relpath}/projects.pro"
- if [ -f "${relpath}/projects.pro" ]; then
-     mkfile="${outpath}/Makefile"
-     [ -f "$mkfile" ] && chmod +w "$mkfile"
--    QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
-+    QTDIR="$outpath" "$outpath/bin/qmake-qt4" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
- fi
- 
- # .projects      -> projects to process
-@@ -5754,7 +5754,7 @@
-             echo "  for $a\c"
-         fi
- 
--        QMAKE="$outpath/bin/qmake"
-+        QMAKE="$outpath/bin/qmake-qt4"
- 	QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
-         if [ "$file" = ".projects.3" ]; then
-             if echo '\c' | grep '\c' >/dev/null; then
-diff -urNad qt4-x11-4.3.0~/config.tests/unix/compile.test qt4-x11-4.3.0/config.tests/unix/compile.test
---- qt4-x11-4.3.0~/config.tests/unix/compile.test	2007-05-25 15:24:34.000000000 +0200
-+++ qt4-x11-4.3.0/config.tests/unix/compile.test	2007-07-01 12:16:50.000000000 +0200
-@@ -51,7 +51,7 @@
- cd "$OUTDIR/$TEST"
- 
- make distclean >/dev/null 2>&1
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
-+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
- 
- if [ "$VERBOSE" = "yes" ]; then
-     make
-diff -urNad qt4-x11-4.3.0~/config.tests/unix/doubleformat.test qt4-x11-4.3.0/config.tests/unix/doubleformat.test
---- qt4-x11-4.3.0~/config.tests/unix/doubleformat.test	2007-05-25 15:24:34.000000000 +0200
-+++ qt4-x11-4.3.0/config.tests/unix/doubleformat.test	2007-07-01 12:15:52.000000000 +0200
-@@ -10,7 +10,7 @@
- 
- # build and run a test program
- test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tests/unix/doubleformat"
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
-+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
- cd "$OUTDIR/config.tests/unix/doubleformat"
- 
- DOUBLEFORMAT="UNKNOWN"
-diff -urNad qt4-x11-4.3.0~/config.tests/unix/endian.test qt4-x11-4.3.0/config.tests/unix/endian.test
---- qt4-x11-4.3.0~/config.tests/unix/endian.test	2007-05-25 15:24:34.000000000 +0200
-+++ qt4-x11-4.3.0/config.tests/unix/endian.test	2007-07-01 12:16:11.000000000 +0200
-@@ -10,7 +10,7 @@
- 
- # build and run a test program
- test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian"
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
-+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
- cd "$OUTDIR/config.tests/unix/endian"
- 
- ENDIAN="UNKNOWN"
-diff -urNad qt4-x11-4.3.0~/config.tests/unix/ptrsize.test qt4-x11-4.3.0/config.tests/unix/ptrsize.test
---- qt4-x11-4.3.0~/config.tests/unix/ptrsize.test	2007-05-25 15:24:34.000000000 +0200
-+++ qt4-x11-4.3.0/config.tests/unix/ptrsize.test	2007-07-01 12:16:28.000000000 +0200
-@@ -10,7 +10,7 @@
- 
- # build and run a test program
- test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
-+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
- cd "$OUTDIR/config.tests/unix/ptrsize"
- 
- if [ "$VERBOSE" = "yes" ]; then
-diff -urNad qt4-x11-4.3.0~/config.tests/x11/notype.test qt4-x11-4.3.0/config.tests/x11/notype.test
---- qt4-x11-4.3.0~/config.tests/x11/notype.test	2007-05-25 15:24:34.000000000 +0200
-+++ qt4-x11-4.3.0/config.tests/x11/notype.test	2007-07-01 12:17:08.000000000 +0200
-@@ -27,7 +27,7 @@
-     NOTYPE=yes
- 
-     test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype"
--    "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
-+    "$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
-     cd "$OUTDIR/config.tests/x11/notype"
- 
-     if [ "$VERBOSE" = "yes" ]; then
-diff -urNad qt4-x11-4.3.0~/qmake/Makefile.unix qt4-x11-4.3.0/qmake/Makefile.unix
---- qt4-x11-4.3.0~/qmake/Makefile.unix	2007-05-25 15:24:08.000000000 +0200
-+++ qt4-x11-4.3.0/qmake/Makefile.unix	2007-07-01 11:51:51.000000000 +0200
-@@ -89,17 +89,17 @@
- 
- CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
- 
--first all: $(BUILD_PATH)/bin/qmake
--qmake: $(BUILD_PATH)/bin/qmake
-+first all: $(BUILD_PATH)/bin/qmake-qt4
-+qmake: $(BUILD_PATH)/bin/qmake-qt4
- 
--$(BUILD_PATH)/bin/qmake: $(OBJS) $(QOBJS)
-+$(BUILD_PATH)/bin/qmake-qt4: $(OBJS) $(QOBJS)
- 	$(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS)
- 
- clean::
- 	rm -f $(OBJS) $(QOBJS)
- 
- distclean:: clean
--	rm -rf $(BUILD_PATH)/bin/qmake .deps
-+	rm -rf $(BUILD_PATH)/bin/qmake-qt4 .deps
- 
- depend:
- 	makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
-diff -urNad qt4-x11-4.3.0~/projects.pro qt4-x11-4.3.0/projects.pro
---- qt4-x11-4.3.0~/projects.pro	2007-05-25 15:24:11.000000000 +0200
-+++ qt4-x11-4.3.0/projects.pro	2007-07-01 15:25:25.000000000 +0200
-@@ -115,7 +115,7 @@
- win32 {
-    qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
- } else {
--   qmake.files=$$QT_BUILD_TREE/bin/qmake
-+   qmake.files=$$QT_BUILD_TREE/bin/qmake-qt4
- }
- INSTALLS += qmake
- 
-diff -urNad qt4-x11-4.3.0~/src/tools/moc/moc.pro qt4-x11-4.3.0/src/tools/moc/moc.pro
---- qt4-x11-4.3.0~/src/tools/moc/moc.pro	2007-05-25 15:24:02.000000000 +0200
-+++ qt4-x11-4.3.0/src/tools/moc/moc.pro	2007-07-01 11:27:06.000000000 +0200
-@@ -1,5 +1,5 @@
- TEMPLATE	= app
--TARGET		= moc
-+TARGET		= moc-qt4
- 
- CONFIG 	       += console qtinc
- CONFIG         -= qt
-diff -urNad qt4-x11-4.3.0~/src/tools/uic/uic.pro qt4-x11-4.3.0/src/tools/uic/uic.pro
---- qt4-x11-4.3.0~/src/tools/uic/uic.pro	2007-05-25 15:24:02.000000000 +0200
-+++ qt4-x11-4.3.0/src/tools/uic/uic.pro	2007-07-01 11:26:41.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- unix:!contains(QT_CONFIG, zlib):LIBS        += -lz
- 
--TARGET = uic
-+TARGET = uic-qt4
- DESTDIR = ../../../bin
- 
- DEFINES	       += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \
-diff -urNad qt4-x11-4.3.0~/tools/assistant/assistant.pro qt4-x11-4.3.0/tools/assistant/assistant.pro
---- qt4-x11-4.3.0~/tools/assistant/assistant.pro	2007-05-25 15:24:32.000000000 +0200
-+++ qt4-x11-4.3.0/tools/assistant/assistant.pro	2007-07-01 11:28:01.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- TEMPLATE = app
- LANGUAGE = C++
--TARGET = assistant
-+TARGET = assistant-qt4
- 
- CONFIG += qt warn_on
- 
-diff -urNad qt4-x11-4.3.0~/tools/designer/src/designer/designer.pro qt4-x11-4.3.0/tools/designer/src/designer/designer.pro
---- qt4-x11-4.3.0~/tools/designer/src/designer/designer.pro	2007-05-25 15:24:45.000000000 +0200
-+++ qt4-x11-4.3.0/tools/designer/src/designer/designer.pro	2007-07-01 11:28:47.000000000 +0200
-@@ -25,7 +25,7 @@
-     DEFINES += QT_DESIGNER_STATIC
- }
- 
--TARGET = designer
-+TARGET = designer-qt4
- 
- include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
- 
-diff -urNad qt4-x11-4.3.0~/tools/linguist/linguist/linguist.pro qt4-x11-4.3.0/tools/linguist/linguist/linguist.pro
---- qt4-x11-4.3.0~/tools/linguist/linguist/linguist.pro	2007-05-25 15:24:23.000000000 +0200
-+++ qt4-x11-4.3.0/tools/linguist/linguist/linguist.pro	2007-07-01 11:29:34.000000000 +0200
-@@ -50,7 +50,7 @@
- DEFINES        += QT_KEYWORDS
- 
- DESTDIR                = ../../../bin
--TARGET                = linguist
-+TARGET                = linguist-qt4
- 
- win32:RC_FILE        = linguist.rc
- 
-diff -urNad qt4-x11-4.3.0~/tools/linguist/lrelease/lrelease.pro qt4-x11-4.3.0/tools/linguist/lrelease/lrelease.pro
---- qt4-x11-4.3.0~/tools/linguist/lrelease/lrelease.pro	2007-05-25 15:24:24.000000000 +0200
-+++ qt4-x11-4.3.0/tools/linguist/lrelease/lrelease.pro	2007-07-01 11:25:42.000000000 +0200
-@@ -29,7 +29,7 @@
- SOURCES += $$PROPARSERPATH/proitems.cpp \
-         $$PROPARSERPATH/proreader.cpp
- 
--TARGET          = lrelease
-+TARGET          = lrelease-qt4
- INCLUDEPATH     += ../shared
- DESTDIR         = ../../../bin
- 
-diff -urNad qt4-x11-4.3.0~/tools/linguist/lupdate/lupdate.pro qt4-x11-4.3.0/tools/linguist/lupdate/lupdate.pro
---- qt4-x11-4.3.0~/tools/linguist/lupdate/lupdate.pro	2007-05-25 15:24:24.000000000 +0200
-+++ qt4-x11-4.3.0/tools/linguist/lupdate/lupdate.pro	2007-07-01 11:25:25.000000000 +0200
-@@ -39,7 +39,7 @@
-         $$PROPARSERPATH/proreader.cpp
- 
- 
--TARGET          = lupdate
-+TARGET          = lupdate-qt4
- INCLUDEPATH     += ../shared
- DESTDIR          = ../../../bin
- 
-diff -urNad qt4-x11-4.3.0~/tools/qtconfig/qtconfig.pro qt4-x11-4.3.0/tools/qtconfig/qtconfig.pro
---- qt4-x11-4.3.0~/tools/qtconfig/qtconfig.pro	2007-05-25 15:24:28.000000000 +0200
-+++ qt4-x11-4.3.0/tools/qtconfig/qtconfig.pro	2007-07-01 11:30:02.000000000 +0200
-@@ -16,7 +16,7 @@
- RESOURCES    = qtconfig.qrc
- 
- PROJECTNAME        = Qt Configuration
--TARGET                = qtconfig
-+TARGET                = qtconfig-qt4
- DESTDIR                = ../../bin
- 
- target.path=$$[QT_INSTALL_BINS]
-\ No newline at end of file
diff --git a/debian/patches-4.3.0/06_qtdemo_destdir.dpatch b/debian/patches-4.3.0/06_qtdemo_destdir.dpatch
deleted file mode 100755
index 4dcd7dc..0000000
--- a/debian/patches-4.3.0/06_qtdemo_destdir.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_qtdemo_destdir.dpatch by Fathi Boudra <fboudra@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix qtdemo destdir.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/demos/qtdemo/qtdemo.pro qt4-x11-4.3.0/demos/qtdemo/qtdemo.pro
---- qt4-x11-4.3.0~/demos/qtdemo/qtdemo.pro	2007-05-25 15:24:38.000000000 +0200
-+++ qt4-x11-4.3.0/demos/qtdemo/qtdemo.pro	2007-06-30 21:12:45.000000000 +0200
-@@ -1,6 +1,6 @@
- CONFIG += assistant x11inc
- TARGET = qtdemo
--DESTDIR = $$QT_BUILD_TREE/bin
-+DESTDIR = bin
- OBJECTS_DIR = .obj
- MOC_DIR = .moc
- INSTALLS += target sources
-diff -urNad qt4-x11-4.3.0~/demos/arthurplugin/arthurplugin.pro qt4-x11-4.3.0/demos/arthurplugin/arthurplugin.pro
---- qt4-x11-4.3.0~/demos/arthurplugin/arthurplugin.pro	2007-05-25 15:24:45.000000000 +0200
-+++ qt4-x11-4.3.0/demos/arthurplugin/arthurplugin.pro	2007-06-30 21:18:35.000000000 +0200
-@@ -3,7 +3,7 @@
- 
- CONFIG      += designer plugin debug_and_release
- TEMPLATE    = lib
--QTDIR_build:DESTDIR     = $$QT_BUILD_TREE/plugins/designer
-+QTDIR_build:DESTDIR     = plugins/designer
- 
- contains(QT_CONFIG, opengl) {
- 	DEFINES += QT_OPENGL_SUPPORT
diff --git a/debian/patches-4.3.0/20_mips_atomic_ops.dpatch b/debian/patches-4.3.0/20_mips_atomic_ops.dpatch
deleted file mode 100644
index c3f9a21..0000000
--- a/debian/patches-4.3.0/20_mips_atomic_ops.dpatch
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_mips_atomic_ops.dpatch by Thiemo Seufer <ths@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix compilation for Linux MIPS-I code.
-
-@DPATCH@
-diff -urNad qt4-x11-4.1.0~/src/corelib/arch/mips/qatomic32.s qt4-x11-4.1.0/src/corelib/arch/mips/qatomic32.s
---- qt4-x11-4.1.0~/src/corelib/arch/mips/qatomic32.s	2005-12-16 03:52:19.000000000 -0800
-+++ qt4-x11-4.1.0/src/corelib/arch/mips/qatomic32.s	2006-01-16 10:39:45.000000000 -0800
-@@ -6,10 +6,12 @@
- 	.globl	q_atomic_test_and_set_int
- 	.ent	q_atomic_test_and_set_int
- q_atomic_test_and_set_int:
-+	.set mips2
- 1:	ll   $8,0($4)
- 	bne  $8,$5,2f
- 	move $2,$6
- 	sc   $2,0($4)
-+	.set mips0
- 	beqz $2,1b
- 	nop
- 	jr   $31
-@@ -21,6 +23,7 @@
- 	.globl	q_atomic_test_and_set_acquire_int
- 	.ent	q_atomic_test_and_set_acquire_int
- q_atomic_test_and_set_acquire_int:
-+	.set mips2
- 1:	ll   $8,0($4)
- 	bne  $8,$5,2f
- 	move $2,$6
-@@ -30,6 +33,7 @@
- 	jr   $31
- 	nop
- 2:	sync
-+	.set mips0
- 	jr   $31
- 	move $2,$0
- 	.end	q_atomic_test_and_set_acquire_int
-@@ -37,11 +41,13 @@
- 	.globl	q_atomic_test_and_set_release_int
- 	.ent	q_atomic_test_and_set_release_int
- q_atomic_test_and_set_release_int:
-+	.set mips2
- 	sync
- 1:	ll   $8,0($4)
- 	bne  $8,$5,2f
- 	move $2,$6
- 	sc   $2,0($4)
-+	.set mips0
- 	beqz $2,1b
- 	nop
- 	jr   $31
-@@ -53,10 +59,12 @@
- 	.globl	q_atomic_test_and_set_ptr
- 	.ent	q_atomic_test_and_set_ptr
- q_atomic_test_and_set_ptr:
-+	.set mips2
- 1:	ll   $8,0($4)
- 	bne  $8,$5,2f
- 	move $2,$6
- 	sc   $2,0($4)
-+	.set mips0
- 	beqz $2,1b
- 	nop
- 	jr   $31
diff --git a/debian/patches-4.3.0/30_arm_ftbfs_fixes.dpatch b/debian/patches-4.3.0/30_arm_ftbfs_fixes.dpatch
deleted file mode 100755
index 32b7851..0000000
--- a/debian/patches-4.3.0/30_arm_ftbfs_fixes.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_arm_ftbfs_fixes.dpatch by Fathi Boudra <fboudra@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix arm FTBFS. Add arm target to configure script.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~rc1~/configure qt4-x11-4.3.0~rc1/configure
---- qt4-x11-4.3.0~rc1~/configure	2007-05-06 17:54:53.000000000 +0200
-+++ qt4-x11-4.3.0~rc1/configure	2007-05-20 16:10:15.000000000 +0200
-@@ -2204,6 +2204,12 @@
-     	fi
-     	ARCH=s390
-     	;;
-+    *:*:arm*)
-+        if [ "$OPT_VERBOSE" = "yes" ]; then
-+            echo "    ARM (arm)"
-+        fi
-+        ARCH=arm
-+        ;;
-     *:*:*)
-         if [ "$OPT_VERBOSE" = "yes" ]; then
-             echo "    Trying '$UNAME_MACHINE'..."
-diff -urNad qt4-x11-4.3.0~rc1~/tools/qtestlib/src/qtestcase.h qt4-x11-4.3.0~rc1/tools/qtestlib/src/qtestcase.h
---- qt4-x11-4.3.0~rc1~/tools/qtestlib/src/qtestcase.h	2007-05-06 17:54:35.000000000 +0200
-+++ qt4-x11-4.3.0~rc1/tools/qtestlib/src/qtestcase.h	2007-05-20 16:11:07.000000000 +0200
-@@ -195,7 +195,7 @@
-     template <typename T1, typename T2>
-     bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
- 
--#if defined(QT_COORD_TYPE) || defined(__arm__)
-+#if defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM)
-     template <>
-     inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual,
-                                  const char *expected, const char *file, int line)
diff --git a/debian/patches-4.3.0/31_arm_eabi_fix.dpatch b/debian/patches-4.3.0/31_arm_eabi_fix.dpatch
deleted file mode 100644
index a826663..0000000
--- a/debian/patches-4.3.0/31_arm_eabi_fix.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh -e
-## 90_armeabi.dpatch.dpatch by Lennert Buytenhek <buytenh@wantstofly.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add support for EABI ARM platforms to Qt.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
---- qt4-x11-4.2.1/src/corelib/global/qglobal.h.orig	2007-01-04 23:57:34.000000000 +0000
-+++ qt4-x11-4.2.1/src/corelib/global/qglobal.h	2007-01-04 23:58:06.000000000 +0000
-@@ -290,7 +290,7 @@
- #  if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
- #    define Q_BROKEN_DEBUG_STREAM
- #  endif
--#  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
-+#  if (defined(__arm__) || defined(__ARMEL__)) && !defined(__ARM_EABI__) && !defined(QT_MOC_CPP)
- #    define Q_PACKED __attribute__ ((__packed__))
- #    define Q_NO_PACKED_REFERENCE
- #  endif
diff --git a/debian/patches-4.3.0/40_alpha_ice.dpatch b/debian/patches-4.3.0/40_alpha_ice.dpatch
deleted file mode 100644
index 8529bff..0000000
--- a/debian/patches-4.3.0/40_alpha_ice.dpatch
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt4-x11-4.1.3~/src/corelib/global/qlibraryinfo.cpp qt4-x11-4.1.3/src/corelib/global/qlibraryinfo.cpp
---- qt4-x11-4.1.3~/src/corelib/global/qlibraryinfo.cpp	2006-05-14 03:46:59.000000000 -0700
-+++ qt4-x11-4.1.3/src/corelib/global/qlibraryinfo.cpp	2006-06-03 11:55:29.000000000 -0700
-@@ -47,14 +47,7 @@
- {
- public:
-     static QSettings *findConfiguration();
--    static void cleanup()
--    {
--        QLibrarySettings *ls = qt_library_settings();
--        if (ls) {
--            delete static_cast<QSettings *>(ls->settings);
--            ls->settings = 0;
--        }
--    }
-+    static void cleanup();
-     static QSettings *configuration()
-     {
- #ifdef QT_NO_THREAD
-@@ -75,6 +68,15 @@
-     Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings)
- };
- 
-+void QLibraryInfoPrivate::cleanup()
-+{
-+    QLibrarySettings *ls = qt_library_settings();
-+    if (ls) {
-+        delete static_cast<QSettings *>(ls->settings);
-+        ls->settings = 0;
-+    }
-+}
-+
- QLibrarySettings::QLibrarySettings()
- {
-     settings = QLibraryInfoPrivate::findConfiguration();
-diff -urNad qt4-x11-4.1.3~/src/corelib/tools/qhash.h qt4-x11-4.1.3/src/corelib/tools/qhash.h
---- qt4-x11-4.1.3~/src/corelib/tools/qhash.h	2006-05-14 03:46:59.000000000 -0700
-+++ qt4-x11-4.1.3/src/corelib/tools/qhash.h	2006-06-03 11:55:29.000000000 -0700
-@@ -405,7 +405,7 @@
- }
- 
- template <class Key, class T>
--Q_INLINE_TEMPLATE void QHash<Key, T>::duplicateNode(QHashData::Node *node, void *newNode)
-+void QHash<Key, T>::duplicateNode(QHashData::Node *node, void *newNode)
- {
-     Node *concreteNode = concrete(node);
-     if (QTypeInfo<T>::isDummy) {
diff --git a/debian/patches-4.3.0/41_disable_opengl_visibility.dpatch b/debian/patches-4.3.0/41_disable_opengl_visibility.dpatch
deleted file mode 100755
index 040e695..0000000
--- a/debian/patches-4.3.0/41_disable_opengl_visibility.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
-
-@DPATCH@
-diff -urNad qt4-x11-4.1.3~/src/opengl/opengl.pro qt4-x11-4.1.3/src/opengl/opengl.pro
---- qt4-x11-4.1.3~/src/opengl/opengl.pro	2006-05-14 03:46:44.000000000 -0700
-+++ qt4-x11-4.1.3/src/opengl/opengl.pro	2006-06-21 10:17:37.000000000 -0700
-@@ -5,6 +5,7 @@
- win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
- solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
- 
-+QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden
- 
- include(../qbase.pri)
- 
diff --git a/debian/patches-4.3.0/42_alpha_fetch_and_add.dpatch b/debian/patches-4.3.0/42_alpha_fetch_and_add.dpatch
deleted file mode 100755
index 4a25ee2..0000000
--- a/debian/patches-4.3.0/42_alpha_fetch_and_add.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 42_alpha_fetch_and_add.dpatch by Bradley Hughes <bhughes@trolltech.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fetch-and-add is supposed to return the original value before the addition.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~/src/corelib/arch/qatomic_alpha.h qt4-x11-4.3.0/src/corelib/arch/qatomic_alpha.h
---- qt4-x11-4.3.0~/src/corelib/arch/qatomic_alpha.h	2007-05-25 15:24:09.000000000 +0200
-+++ qt4-x11-4.3.0/src/corelib/arch/qatomic_alpha.h	2007-07-16 21:52:20.000000000 +0200
-@@ -190,7 +190,7 @@
-                  : "=&r" (old), "=&r" (tmp), "+m"(*ptr)
-                  : "r" (value)
-                  : "memory");
--    return old != -1;
-+    return old;
- }
- 
- inline int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value)
-@@ -208,7 +208,7 @@
-                  : "=&r" (old), "=&r" (tmp), "+m"(*ptr)
-                  : "r" (value)
-                  : "memory");
--    return old != -1;
-+    return old;
- }
- 
- inline int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value)
-@@ -226,7 +226,7 @@
-                  : "=&r" (old), "=&r" (tmp), "+m"(*ptr)
-                  : "r" (value)
-                  : "memory");
--    return old != -1;
-+    return old;
- }
- 
- #else // !Q_CC_GNU
diff --git a/debian/patches-4.3.0/50_kfreebsd_build_fix.dpatch b/debian/patches-4.3.0/50_kfreebsd_build_fix.dpatch
deleted file mode 100755
index 2b20436..0000000
--- a/debian/patches-4.3.0/50_kfreebsd_build_fix.dpatch
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger@seznam.cz>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/global/qglobal.h qt4-x11-4.3.0~rc1/src/corelib/global/qglobal.h
---- qt4-x11-4.3.0~rc1~/src/corelib/global/qglobal.h	2007-05-06 17:54:22.000000000 +0200
-+++ qt4-x11-4.3.0~rc1/src/corelib/global/qglobal.h	2007-05-18 10:48:20.000000000 +0200
-@@ -110,6 +110,12 @@
- #  define Q_OS_RELIANT
- #elif defined(__linux__) || defined(__linux)
- #  define Q_OS_LINUX
-+#  define Q_OS_GLIBC
-+#elif defined(__GNU_HURD__) || defined(__GNU__)
-+#  define Q_OS_HURD
-+#  define Q_OS_GLIBC
-+#elif defined(__GLIBC__)
-+#  define Q_OS_GLIBC
- #elif defined(__FreeBSD__) || defined(__DragonFly__)
- #  define Q_OS_FREEBSD
- #  define Q_OS_BSD4
-@@ -130,8 +136,6 @@
- #  define Q_OS_AIX
- #elif defined(__Lynx__)
- #  define Q_OS_LYNX
--#elif defined(__GNU__)
--#  define Q_OS_HURD
- #elif defined(__DGUX__)
- #  define Q_OS_DGUX
- #elif defined(__QNXNTO__)
-diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/plugin/qlibrary.cpp qt4-x11-4.3.0~rc1/src/corelib/plugin/qlibrary.cpp
---- qt4-x11-4.3.0~rc1~/src/corelib/plugin/qlibrary.cpp	2007-05-06 17:54:24.000000000 +0200
-+++ qt4-x11-4.3.0~rc1/src/corelib/plugin/qlibrary.cpp	2007-05-18 10:50:38.000000000 +0200
-@@ -278,11 +278,11 @@
- 
- #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
- 
--#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
-+#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
- #  define USE_MMAP
- #  include <sys/types.h>
- #  include <sys/mman.h>
--#endif // Q_OS_FREEBSD || Q_OS_LINUX
-+#endif // Q_OS_FREEBSD || Q_OS_GLIBC
- 
- static long qt_find_pattern(const char *s, ulong s_len,
-                              const char *pattern, ulong p_len)
-diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp
---- qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp	2007-05-06 17:54:24.000000000 +0200
-+++ qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp	2007-05-18 10:51:21.000000000 +0200
-@@ -48,7 +48,7 @@
- #include <qdebug.h>
- #include <time.h>
- 
--#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-+#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
- #    include <fenv.h>
- #endif
- 
-@@ -5906,7 +5906,7 @@
-     _control87(MCW_EM, MCW_EM);
- #endif
- 
--#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-+#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
-     fenv_t envp;
-     feholdexcept(&envp);
- #endif
-@@ -5922,7 +5922,7 @@
- #endif //_M_X64
- #endif //Q_OS_WIN
- 
--#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-+#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
-     fesetenv(&envp);
- #endif
- 
diff --git a/debian/patches-4.3.0/51_kfreebsd_mkspecs.dpatch b/debian/patches-4.3.0/51_kfreebsd_mkspecs.dpatch
deleted file mode 100644
index 3039acb..0000000
--- a/debian/patches-4.3.0/51_kfreebsd_mkspecs.dpatch
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh -e
-## 90_kfreebsd_mkspecs.dpatch by Petr Salinger <Petr.Salinger@seznam.cz>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
-## DP: we cannot use directly linux-g++ due to src/corelib/io/io.pri
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) 
-    	rm -rvf mkspecs/glibc-g++
-    	cp -av mkspecs/linux-g++ mkspecs/glibc-g++
-    ;;
-    -unpatch) 
-    	rm -rvf mkspecs/glibc-g++
-    ;;	
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
diff --git a/debian/patches-4.3.0/60_m68k_inotify_fix.dpatch b/debian/patches-4.3.0/60_m68k_inotify_fix.dpatch
deleted file mode 100755
index 9dd507d..0000000
--- a/debian/patches-4.3.0/60_m68k_inotify_fix.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 19_m68k_inotify_fix.dpatch by Brian Nelson <pyro@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: From Roman Zippel <zippel@linux-m68k.org>: These defines are
-## DP: taken from the m68k tree, they should appear like this soon also
-## DP: in the upstream source.
-
-@DPATCH@
-diff -urNad qt4-x11-4.2.2~/src/corelib/io/qfilesystemwatcher_inotify.cpp qt4-x11-4.2.2/src/corelib/io/qfilesystemwatcher_inotify.cpp
---- qt4-x11-4.2.2~/src/corelib/io/qfilesystemwatcher_inotify.cpp	2006-11-27 12:26:05.000000000 -0500
-+++ qt4-x11-4.2.2/src/corelib/io/qfilesystemwatcher_inotify.cpp	2007-03-03 12:30:28.000000000 -0500
-@@ -88,6 +88,10 @@
- # define __NR_inotify_init      269
- # define __NR_inotify_add_watch 270
- # define __NR_inotify_rm_watch  271
-+#elif defined (__mc68000__)
-+# define __NR_inotify_init      284
-+# define __NR_inotify_add_watch 285
-+# define __NR_inotify_rm_watch  286
- #else
- # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com"
- #endif
diff --git a/debian/patches-4.3.0/70_hppa_ldcw_fix.dpatch b/debian/patches-4.3.0/70_hppa_ldcw_fix.dpatch
deleted file mode 100644
index 0405799..0000000
--- a/debian/patches-4.3.0/70_hppa_ldcw_fix.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_hppa_ldcw.dpatch by  <lamont@bld-4.mmjgroup.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch from Ubuntu to properly support hppa
-
-@DPATCH@
-diff -urNad qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s
---- qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s	2006-02-03 01:50:30.000000000 +0000
-+++ qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s	2006-02-03 02:00:36.000000000 +0000
-@@ -1,17 +1,7 @@
--	.SPACE $PRIVATE$
--	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
--	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
--	.SPACE $TEXT$
--	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
--	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
--	.IMPORT $global$,DATA
--	.IMPORT $$dyncall,MILLICODE
--	.SPACE $TEXT$
--	.SUBSPA $CODE$
--
-+	.text
- 	.align 4
- 	.EXPORT q_ldcw,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
--q_ldcw
-+	.label q_ldcw
- 	.PROC
- 	.CALLINFO FRAME=0,CALLS,SAVE_RP
- 	.ENTRY
diff --git a/debian/patches-4.3.0/80_hurd_max_path.dpatch b/debian/patches-4.3.0/80_hurd_max_path.dpatch
deleted file mode 100644
index f43dfd5..0000000
--- a/debian/patches-4.3.0/80_hurd_max_path.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_hurd_max_path.dpatch by Brian Nelson <pyro@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp
---- qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp	2007-05-06 17:54:23.000000000 +0200
-+++ qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp	2007-05-18 11:11:35.000000000 +0200
-@@ -40,6 +40,10 @@
- # include <private/qcore_mac_p.h>
- #endif
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- /*!
-     \internal
- 
diff --git a/debian/patches/0163-fix-gcc43-support.diff b/debian/patches/0163-fix-gcc43-support.diff
index b3ec46e..fd44a40 100644
--- a/debian/patches/0163-fix-gcc43-support.diff
+++ b/debian/patches/0163-fix-gcc43-support.diff
@@ -1,3 +1,11 @@
+qt-bugs@ issue : none
+Trolltech task ID : N154723
+bugs.kde.org number : None
+applied: no
+author: Dirk Mueller <mueller@kde.org>
+
+various fixes to get Qt 4.3 without hundreds of warnings compiling
+
 --- qt4-x11-4.3.1.orig/config.tests/unix/endian.test
 +++ qt4-x11-4.3.1/config.tests/unix/endian.test
 @@ -30,6 +30,7 @@
diff --git a/debian/patches/0167-fix-group-reading.diff b/debian/patches/0167-fix-group-reading.diff
index 9a0e8f2..365cef3 100644
--- a/debian/patches/0167-fix-group-reading.diff
+++ b/debian/patches/0167-fix-group-reading.diff
@@ -1,3 +1,12 @@
+qt-bugs@ issue : none
+Trolltech task ID : none yet
+bugs.kde.org number : None
+applied: no
+author: Dirk Mueller <mueller@kde.org>
+
+in big user environments, getgrgid_r() needs more memory than sysconf() returns.
+Try a bit harder.
+
 --- qt4-x11-4.3.1.orig/src/corelib/io/qfsfileengine_unix.cpp
 +++ qt4-x11-4.3.1/src/corelib/io/qfsfileengine_unix.cpp
 @@ -845,9 +845,16 @@
diff --git a/debian/patches/0172-prefer-xrandr-over-xinerama.diff b/debian/patches/0172-prefer-xrandr-over-xinerama.diff
index d8d5be7..6b1e8fe 100644
--- a/debian/patches/0172-prefer-xrandr-over-xinerama.diff
+++ b/debian/patches/0172-prefer-xrandr-over-xinerama.diff
@@ -1,3 +1,18 @@
+qt-bugs@ issue :  none
+Trolltech task ID : none
+bugs.kde.org number :
+applied: yes
+author: Dirk Mueller
+
+only trust libxinerama if its not the emulated information
+coming from xrandr 1.2. xrandr 1.2 is merged fb and libxinerama
+presents then virtual screens in clone mode, which qt (and KDE)
+can't deal with.
+
+proper fix would be to detect crtcs as virtual screens, but
+given that qt can't deal with dynamically changing number of screens,
+this is for "when I have time".
+
 --- qt4-x11-4.3.1.orig/src/gui/kernel/qdesktopwidget_x11.cpp
 +++ qt4-x11-4.3.1/src/gui/kernel/qdesktopwidget_x11.cpp
 @@ -124,11 +124,38 @@
diff --git a/debian/patches/0175-fix-s390-qatomic.diff b/debian/patches/0175-fix-s390-qatomic.diff
index 60ab8fa..ef27e63 100644
--- a/debian/patches/0175-fix-s390-qatomic.diff
+++ b/debian/patches/0175-fix-s390-qatomic.diff
@@ -1,3 +1,11 @@
+qt-bugs@ issue :  none
+Trolltech task ID : none
+bugs.kde.org number :
+applied: no
+author: Dirk Mueller
+
+fix s390(x) build
+
 --- qt4-x11-4.3.1.orig/src/corelib/arch/qatomic_s390.h
 +++ qt4-x11-4.3.1/src/corelib/arch/qatomic_s390.h
 @@ -197,10 +197,20 @@
diff --git a/debian/patches/0176-coverity-fixes.diff b/debian/patches/0176-coverity-fixes.diff
index e97c80f..2f0d1d9 100644
--- a/debian/patches/0176-coverity-fixes.diff
+++ b/debian/patches/0176-coverity-fixes.diff
@@ -1,3 +1,11 @@
+qt-bugs@ issue :  none
+Trolltech task ID : none
+bugs.kde.org number :
+applied: no
+author: Dirk Mueller
+
+fix various obvious memory leaks etc
+
 --- qt4-x11-4.3.1.orig/src/gui/painting/qimagescale.cpp
 +++ qt4-x11-4.3.1/src/gui/painting/qimagescale.cpp
 @@ -1020,6 +1020,7 @@
diff --git a/debian/patches/0178-transparency-window-types.diff b/debian/patches/0178-transparency-window-types.diff
index 2f3c188..e0ef3d8 100644
--- a/debian/patches/0178-transparency-window-types.diff
+++ b/debian/patches/0178-transparency-window-types.diff
@@ -1,3 +1,11 @@
+qt-bugs@ issue : none yet
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: Lubos Lunak <l.lunak@kde.org>
+
+This patch adds Qt support for new window types used for compositing.
+
 --- qt4-x11-4.3.1.orig/src/gui/kernel/qapplication_x11.cpp
 +++ qt4-x11-4.3.1/src/gui/kernel/qapplication_x11.cpp
 @@ -214,6 +214,11 @@
diff --git a/debian/patches/0179-transient-hack.diff b/debian/patches/0179-transient-hack.diff
index 6689a99..b29f044 100644
--- a/debian/patches/0179-transient-hack.diff
+++ b/debian/patches/0179-transient-hack.diff
@@ -1,3 +1,13 @@
+qt-bugs@ issue : 166027
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: Lubos Lunak <l.lunak@kde.org>
+
+This patch is just a hackish workaround that makes setting of WM_TRANSIENT_FOR
+work with some window types (needed basically by the #0178 qt-copy patch).
+It is not a proper solution, waiting for TT to come up with something.
+
 --- qt4-x11-4.3.1.orig/src/gui/kernel/qwidget_x11.cpp
 +++ qt4-x11-4.3.1/src/gui/kernel/qwidget_x11.cpp
 @@ -1650,7 +1650,7 @@
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index 8d26609..532dd04 100644
--- a/debian/patches/0180-window-role.diff
+++ b/debian/patches/0180-window-role.diff
@@ -1,3 +1,39 @@
+qt-bugs@ issue : none yet
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: Lubos Lunak <l.lunak@kde.org>
+
+ Hello,
+
+ there are several problems with Qt's support for the WM_WINDOW_ROLE property:
+
+- plain "QWidget w; w.setWindowRole( "test" );" aborts with 
+Qt::WA_WState_Created not being set
+
+- while QWidgetPrivate::create_sys() uses QObject object name for initial 
+setting of WM_WINDOW_ROLE, later calls to QObject::setObjectName() have no 
+effect on it
+
+- Qt3 used the QObject object name for setting the window role, however Qt4 
+uses some strange mix of object name and what's set manually with 
+setWindowRole().
+
+ The result is that that Qt3 and KDE3 apps that had WM_WINDOW_ROLE set don't 
+in their Qt4 and KDE4 versions. I suggest using the attached patch which 
+fixed all of the above problems:
+
+- set explicit window role is used when actually set, otherwise the object 
+name is used. This e.g. takes care of apps ported using setObjectName() from 
+their Qt3/KDE3 versions (including e.g. Qt Designer) and generally makes it 
+somewhat less demanding to actually set a usable window role (I can't quite 
+see how many developers would be bothered to explicitly call 
+setWindowRole()).
+
+- calls to QObject::setObjectName() update the WM_WINDOW_ROLE property. Since 
+QObjectPrivate already has a virtual dtor I think adding another virtual for 
+handling the QWidget-related functionality from QtCore is fine.
+
 --- qt4-x11-4.3.1.orig/src/corelib/kernel/qobject.cpp
 +++ qt4-x11-4.3.1/src/corelib/kernel/qobject.cpp
 @@ -1008,9 +1008,18 @@
diff --git a/debian/patches/0181-qdnd-x11-fix.diff b/debian/patches/0181-qdnd-x11-fix.diff
index c2e07c3..d0e2a48 100644
--- a/debian/patches/0181-qdnd-x11-fix.diff
+++ b/debian/patches/0181-qdnd-x11-fix.diff
@@ -1,3 +1,29 @@
+qt-bugs@ issue : 166518
+Trolltech task ID : 167509
+bugs.kde.org number :
+applied: no
+author: Matthias Kretz <kretz@kde.org>
+os: unix
+
+Consider:
+QWidget toplevel;
+QWidget dropWidget(&toplevel);
+dropWidget.setAcceptDrops(true);
+QWidget visibleFooWidget(&toplevel);
+
+find_child in qdnd_x11.cpp will find visibleFooWidget because it's the last
+entry in toplevel.children() and the QPoint of the drop is contained in it.
+But since it does not acceptDrops() handle_xdnd_position will now look at the
+parent widget which is toplevel. That one isWindow() so the iteration stops
+and no QDragEnterEvent will be sent.
+But it never even looked at dropWidget even though it also contains the QPoint
+of the drop!
+
+This patch makes the algorithm look at _all_ widgets that contain the QPoint.
+
+This bug effectively breaks all drops on QAbstractScrollArea subclasses with
+the KDE4 Oxygen widget style.
+
 --- qt4-x11-4.3.1.orig/src/gui/kernel/qdnd_x11.cpp
 +++ qt4-x11-4.3.1/src/gui/kernel/qdnd_x11.cpp
 @@ -58,6 +58,7 @@
diff --git a/debian/patches/0182-argb-visuals-default.diff b/debian/patches/0182-argb-visuals-default.diff
index dc440d4..3d4a13a 100644
--- a/debian/patches/0182-argb-visuals-default.diff
+++ b/debian/patches/0182-argb-visuals-default.diff
@@ -1,3 +1,14 @@
+qt-bugs@ issue : none, in Qt 4.4 already
+Trolltech task ID : 120338
+applied: no
+author: Zack Rusin <zrusin@trolltech.com>
+os: unix
+
+Fixes:    Qt handling argb visuals on X11
+Details:  we make Qt pick ARGB visuals when available.
+this allows people writing properly semi-transparent
+apps on X11.
+
 --- qt4-x11-4.3.1.orig/src/gui/kernel/qapplication_x11.cpp
 +++ qt4-x11-4.3.1/src/gui/kernel/qapplication_x11.cpp
 @@ -1567,6 +1567,30 @@
diff --git a/debian/patches/0185-fix-format-strings.diff b/debian/patches/0185-fix-format-strings.diff
index a664127..175cc9d 100644
--- a/debian/patches/0185-fix-format-strings.diff
+++ b/debian/patches/0185-fix-format-strings.diff
@@ -1,3 +1,13 @@
+qt-bugs@ issue : N171087
+Trolltech task ID : 
+bugs.kde.org number :
+applied: no
+author: Dirk Mueller <mueller@kde.org>
+
+This patch fixes various code issues with handling format strings
+None of them seem to be exceptionally bad, but its better safe
+than sorry.
+
 --- qt4-x11-4.3.1.orig/src/corelib/global/qglobal.h
 +++ qt4-x11-4.3.1/src/corelib/global/qglobal.h
 @@ -1276,8 +1276,16 @@
diff --git a/debian/patches/0186-fix-component-alpha-text.diff b/debian/patches/0186-fix-component-alpha-text.diff
index 0f63254..33a1b13 100644
--- a/debian/patches/0186-fix-component-alpha-text.diff
+++ b/debian/patches/0186-fix-component-alpha-text.diff
@@ -1,3 +1,14 @@
+qt-bugs@ issue :
+Trolltech task ID :
+applied: yes
+author: Fredrik Höglund <fredrik@kde.org>
+os: unix
+
+This patch fixes component alpha (LCD hinted) text when it's drawn on a
+non-opaque background. Qt doesn't initialize the alpha channel in the glyph
+masks, which causes problems in Konsole when transparency is enabled, and
+in other situations where the background isn't fully opaque.
+
 --- qt4-x11-4.3.1.orig/src/gui/text/qfontengine_ft.cpp
 +++ qt4-x11-4.3.1/src/gui/text/qfontengine_ft.cpp
 @@ -716,7 +716,8 @@
diff --git a/debian/patches/0187-fix-font-fixed-pitch.diff b/debian/patches/0187-fix-font-fixed-pitch.diff
index f82eb1a..b2e57c5 100644
--- a/debian/patches/0187-fix-font-fixed-pitch.diff
+++ b/debian/patches/0187-fix-font-fixed-pitch.diff
@@ -1,3 +1,13 @@
+qt-bugs@ issue :
+Trolltech task ID :
+applied: no
+author: Matthew Woehlke <mw_triad@users.sourceforge.net>
+
+This patch works around broken QFontInfo::fixedPitch by always using a
+glyph metrics comparison test to guess the information. This has the
+property of both ignoring (bad) and not relying on (good) any information
+that might be provided by the OS's font facility.
+
 --- qt4-x11-4.3.1.orig/src/gui/text/qfont.cpp
 +++ qt4-x11-4.3.1/src/gui/text/qfont.cpp
 @@ -2093,7 +2093,6 @@
diff --git a/debian/patches/01_qmake_for_debian.diff b/debian/patches/01_qmake_for_debian.diff
index 667ea46..9ec3ed4 100644
--- a/debian/patches/01_qmake_for_debian.diff
+++ b/debian/patches/01_qmake_for_debian.diff
@@ -1,3 +1,8 @@
+author: Brian Nelson <pyro@debian.org>
+
+Ensures qmake generates Makefiles that use the -qt4 tools and that use
+recursively link against all indirectly-used libraries.
+
 --- qt4-x11-4.3.1.orig/mkspecs/common/linux.conf
 +++ qt4-x11-4.3.1/mkspecs/common/linux.conf
 @@ -23,8 +23,8 @@
diff --git a/debian/patches/02_launch_assistant-qt4.diff b/debian/patches/02_launch_assistant-qt4.diff
index 2bbf41b..cc17d64 100644
--- a/debian/patches/02_launch_assistant-qt4.diff
+++ b/debian/patches/02_launch_assistant-qt4.diff
@@ -1,3 +1,5 @@
+author: Brian Nelson <pyro@debian.org>
+
 --- qt4-x11-4.3.1.orig/tools/assistant/lib/qassistantclient.cpp
 +++ qt4-x11-4.3.1/tools/assistant/lib/qassistantclient.cpp
 @@ -187,11 +187,11 @@
diff --git a/debian/patches/03_launch_moc-qt4.diff b/debian/patches/03_launch_moc-qt4.diff
index 9322c4f..c996965 100644
--- a/debian/patches/03_launch_moc-qt4.diff
+++ b/debian/patches/03_launch_moc-qt4.diff
@@ -1,3 +1,7 @@
+author: Brian Nelson <pyro@debian.org>
+
+Ensure the Qt4 version of moc is launched.
+
 --- qt4-x11-4.3.1.orig/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
 +++ qt4-x11-4.3.1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
 @@ -391,7 +391,7 @@
diff --git a/debian/patches/04_launch_uic-qt4.diff b/debian/patches/04_launch_uic-qt4.diff
index a44ed6a..08afd29 100644
--- a/debian/patches/04_launch_uic-qt4.diff
+++ b/debian/patches/04_launch_uic-qt4.diff
@@ -1,3 +1,5 @@
+author: Fathi Boudra <fboudra@free.fr>
+
 --- qt4-x11-4.3.1.orig/tools/designer/src/lib/shared/qdesigner_utils.cpp
 +++ qt4-x11-4.3.1/tools/designer/src/lib/shared/qdesigner_utils.cpp
 @@ -133,7 +133,7 @@
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index c1726e2..48297c3 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/05_append_qt4_target.diff
@@ -1,3 +1,5 @@
+author: Fathi Boudra <fboudra@free.fr>
+
 --- qt4-x11-4.3.1.orig/config.tests/unix/compile.test
 +++ qt4-x11-4.3.1/config.tests/unix/compile.test
 @@ -51,7 +51,7 @@
diff --git a/debian/patches/06_qtdemo_destdir.diff b/debian/patches/06_qtdemo_destdir.diff
index 862a59e..70b1650 100644
--- a/debian/patches/06_qtdemo_destdir.diff
+++ b/debian/patches/06_qtdemo_destdir.diff
@@ -1,3 +1,7 @@
+author: Fathi Boudra <fboudra@free.fr>
+
+Fix qtdemo destdir.
+
 --- qt4-x11-4.3.1.orig/demos/arthurplugin/arthurplugin.pro
 +++ qt4-x11-4.3.1/demos/arthurplugin/arthurplugin.pro
 @@ -3,7 +3,7 @@
diff --git a/debian/patches/20_mips_atomic_ops.diff b/debian/patches/20_mips_atomic_ops.diff
index ac7fe36..823692f 100644
--- a/debian/patches/20_mips_atomic_ops.diff
+++ b/debian/patches/20_mips_atomic_ops.diff
@@ -1,3 +1,7 @@
+author: Thiemo Seufer <ths@debian.org>
+
+Fix compilation for Linux MIPS-I code.
+
 --- qt4-x11-4.3.1.orig/src/corelib/arch/mips/qatomic32.s
 +++ qt4-x11-4.3.1/src/corelib/arch/mips/qatomic32.s
 @@ -6,10 +6,12 @@
diff --git a/debian/patches/30_arm_ftbfs_fixes.diff b/debian/patches/30_arm_ftbfs_fixes.diff
index b26ce77..0dce6cb 100644
--- a/debian/patches/30_arm_ftbfs_fixes.diff
+++ b/debian/patches/30_arm_ftbfs_fixes.diff
@@ -1,3 +1,7 @@
+author: Fathi Boudra <fboudra@free.fr>
+
+Fix arm FTBFS.
+
 --- qt4-x11-4.3.1.orig/tools/qtestlib/src/qtestcase.h
 +++ qt4-x11-4.3.1/tools/qtestlib/src/qtestcase.h
 @@ -210,7 +210,7 @@
diff --git a/debian/patches/31_arm_eabi_fix.diff b/debian/patches/31_arm_eabi_fix.diff
index 0931fb1..1edb3fc 100644
--- a/debian/patches/31_arm_eabi_fix.diff
+++ b/debian/patches/31_arm_eabi_fix.diff
@@ -1,3 +1,7 @@
+author: Lennert Buytenhek <buytenh@wantstofly.org>
+
+Add support for EABI ARM platforms to Qt.
+
 --- qt4-x11-4.3.1.orig/src/corelib/global/qglobal.h
 +++ qt4-x11-4.3.1/src/corelib/global/qglobal.h
 @@ -331,7 +331,7 @@
diff --git a/debian/patches/41_disable_opengl_visibility.diff b/debian/patches/41_disable_opengl_visibility.diff
index 51d6dbe..5685bb0 100644
--- a/debian/patches/41_disable_opengl_visibility.diff
+++ b/debian/patches/41_disable_opengl_visibility.diff
@@ -1,3 +1,5 @@
+temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
+
 --- qt4-x11-4.3.1.orig/src/opengl/opengl.pro
 +++ qt4-x11-4.3.1/src/opengl/opengl.pro
 @@ -5,6 +5,7 @@
diff --git a/debian/patches/50_kfreebsd_build_fix.diff b/debian/patches/50_kfreebsd_build_fix.diff
index 52b2d70..05a1d99 100644
--- a/debian/patches/50_kfreebsd_build_fix.diff
+++ b/debian/patches/50_kfreebsd_build_fix.diff
@@ -1,3 +1,7 @@
+author: Petr Salinger <Petr.Salinger@seznam.cz>
+
+Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
+
 --- qt4-x11-4.3.1.orig/src/corelib/global/qglobal.h
 +++ qt4-x11-4.3.1/src/corelib/global/qglobal.h
 @@ -125,6 +125,12 @@
diff --git a/debian/patches/60_m68k_inotify_fix.diff b/debian/patches/60_m68k_inotify_fix.diff
index 956dd95..2c07545 100644
--- a/debian/patches/60_m68k_inotify_fix.diff
+++ b/debian/patches/60_m68k_inotify_fix.diff
@@ -1,3 +1,8 @@
+author: Brian Nelson <pyro@debian.org>
+
+From Roman Zippel <zippel@linux-m68k.org>: These defines are taken from the
+m68k tree, they should appear like this soon also in the upstream source.
+
 --- qt4-x11-4.3.1.orig/src/corelib/io/qfilesystemwatcher_inotify.cpp
 +++ qt4-x11-4.3.1/src/corelib/io/qfilesystemwatcher_inotify.cpp
 @@ -103,6 +103,10 @@
diff --git a/debian/patches/70_hppa_ldcw_fix.diff b/debian/patches/70_hppa_ldcw_fix.diff
index d4f1680..2825283 100644
--- a/debian/patches/70_hppa_ldcw_fix.diff
+++ b/debian/patches/70_hppa_ldcw_fix.diff
@@ -1,3 +1,7 @@
+author: LaMont Jones <lamont@bld-4.mmjgroup.com>
+
+patch from Ubuntu to properly support hppa.
+
 --- qt4-x11-4.3.1.orig/src/corelib/arch/parisc/q_ldcw.s
 +++ qt4-x11-4.3.1/src/corelib/arch/parisc/q_ldcw.s
 @@ -1,17 +1,7 @@
diff --git a/debian/patches/80_hurd_max_path.diff b/debian/patches/80_hurd_max_path.diff
index 3fa639c..c4dcb17 100644
--- a/debian/patches/80_hurd_max_path.diff
+++ b/debian/patches/80_hurd_max_path.diff
@@ -1,3 +1,5 @@
+author: Brian Nelson <pyro@debian.org>
+
 --- qt4-x11-4.3.1.orig/src/corelib/io/qfsfileengine_unix.cpp
 +++ qt4-x11-4.3.1/src/corelib/io/qfsfileengine_unix.cpp
 @@ -55,6 +55,10 @@
diff --git a/debian/patches/series b/debian/patches/series
index e4f80aa..caa1386 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,14 @@
 # qt-copy patches
 0163-fix-gcc43-support.diff
 0167-fix-group-reading.diff
-0172-prefer-xrandr-over-xinerama.diff
+#0172-prefer-xrandr-over-xinerama.diff
 0175-fix-s390-qatomic.diff
 0176-coverity-fixes.diff
 0178-transparency-window-types.diff
 0179-transient-hack.diff
 0180-window-role.diff
 0181-qdnd-x11-fix.diff
-#0182-argb-visuals-default.diff
+0182-argb-visuals-default.diff
 0185-fix-format-strings.diff
 0186-fix-component-alpha-text.diff
 0187-fix-font-fixed-pitch.diff
diff --git a/debian/rules b/debian/rules
index 6460dca..b4ce4a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,11 @@ else
 endif
 
 common-configure-arch::
+	# Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
+	# we cannot use directly linux-g++ due to src/corelib/io/io.pri
+	rm -rf mkspecs/glibc-g++
+	cp -a mkspecs/linux-g++ mkspecs/glibc-g++
+
 	./configure -confirm-license \
 	            -prefix "/usr" \
 	            -bindir "/usr/bin" \
@@ -87,7 +92,7 @@ clean::
 	      examples/qdbus/complexpingpong/Makefile* \
 	      examples/qdbus/pingpong/Makefile*
 
-	rm -rf lib/ plugins/
+	rm -rf lib/ plugins/ mkspecs/glibc-g++
 
 	find bin/ config.tests/ qmake/ -exec file {} \; | grep ELF | sed 's/:.*//'  | xargs rm -f
author	Fathi Boudra <fabo@debian.org>	2007-08-09 09:34:39 +0000
committer	Fathi Boudra <fabo@debian.org>	2007-08-09 09:34:39 +0000
commit	ff07f00bf37b16a834d5e5dec1d052a3e622a306 (patch)
tree	032a1c5895a21cbfdbe3afe7f70b8fdb79f95b53
parent	dc9373086a36ba8ef4f6a51f61212e33a4d79b59 (diff)
download	qt4-x11-ff07f00bf37b16a834d5e5dec1d052a3e622a306.tar.gz