Some updates for 4.4.0

6 files changed, 10 insertions, 60 deletions

diff --git a/debian/changelog b/debian/changelog
index 5166deb..bba4780 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 qt4-x11 (4.4.0-1) UNRELEASED; urgency=low
 
-  * New upstream release (rumoured, but source N/A yet).
+  * New upstream release.
 
   +++ Changes by Modestas Vainius:
 
@@ -18,8 +18,13 @@ qt4-x11 (4.4.0-1) UNRELEASED; urgency=low
   * Use ${binary:Version} instead of ${source:Version} in dependences of
     libqt4-core and libqt4-gui transitional packages.
   * Require just libqtcore4 to install libqt4-dbg instead of libqt4-gui.
+  * Resync patches:
+    - 05_append_qt4_target.diff - fix offsets.
+    - 11_qdbus_to_dbus_fix.diff - remove, fixed upstream.
+    - Revert to "runtime" configuration for xcursor, xinerama, xfixes and drop
+      16_always_init_qt_x11data_ptrx.diff patch. Fixed upstream.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 01 May 2008 13:39:50 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 02 May 2008 19:30:48 +0300
 
 qt4-x11 (4.4.0~rc1-5) unstable; urgency=high
 
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index 66e4d5c..d2f3b1a 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/05_append_qt4_target.diff
@@ -66,7 +66,7 @@ author: Fathi Boudra <fabo@debian.org>
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -5999,8 +5999,8 @@
+@@ -6012,8 +6012,8 @@
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@ author: Fathi Boudra <fabo@debian.org>
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -6300,11 +6300,11 @@
+@@ -6313,11 +6313,11 @@
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@ author: Fathi Boudra <fabo@debian.org>
  fi
  
  # .projects      -> projects to process
-@@ -6477,7 +6477,7 @@
+@@ -6490,7 +6490,7 @@
              echo "  for $a\c"
          fi
  
diff --git a/debian/patches/11_qdbus_to_dbus_fix.diff b/debian/patches/11_qdbus_to_dbus_fix.diff
deleted file mode 100644
index 626b8b5..0000000
--- a/debian/patches/11_qdbus_to_dbus_fix.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/phonon/phonon.pro
-+++ b/src/phonon/phonon.pro
-@@ -104,7 +104,7 @@
-            $$PHONON_DIR/volumefadereffect.cpp \
-            $$PHONON_DIR/volumeslider.cpp
- 
--contains(QT_CONFIG, qdbus) {
-+contains(QT_CONFIG, dbus) {
-        CONFIG += qdbus
-        HEADERS += $$PHONON_DIR/audiooutputadaptor.h
-        SOURCES += $$PHONON_DIR/audiooutputadaptor.cpp
---- a/src/plugins/script/script.pro
-+++ b/src/plugins/script/script.pro
-@@ -1,2 +1,2 @@
- TEMPLATE = subdirs
--contains(QT_CONFIG, qdbus):SUBDIRS += qtdbus
-+contains(QT_CONFIG, dbus):SUBDIRS += qtdbus
diff --git a/debian/patches/16_always_init_qt_x11data_ptrx.diff b/debian/patches/16_always_init_qt_x11data_ptrx.diff
deleted file mode 100644
index 7427f0e..0000000
--- a/debian/patches/16_always_init_qt_x11data_ptrx.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- qt4-x11-4.4.0~rc1.orig/src/gui/kernel/qapplication_x11.cpp	2008-04-21 19:16:19.000000000 +0300
-+++ qt4-x11-4.4.0~rc1/src/gui/kernel/qapplication_x11.cpp	2008-04-27 03:40:39.000000000 +0300
-@@ -1743,6 +1743,10 @@
-             xfixesFound = X11->ptrXFixesQueryExtension
-                           && X11->ptrXFixesQueryVersion
-                           && X11->ptrXFixesSetCursorName;
-+        } else {
-+            X11->ptrXFixesQueryExtension = 0;
-+            X11->ptrXFixesQueryVersion = 0;
-+            X11->ptrXFixesSetCursorName = 0;
-         }
- #else
-         bool xfixesFound = true;
-@@ -1778,6 +1782,8 @@
-         if (xcursorLib.load()) {
-             X11->ptrXcursorLibraryLoadCursor =
-                 (PtrXcursorLibraryLoadCursor) xcursorLib.resolve("XcursorLibraryLoadCursor");
-+        } else {
-+            X11->ptrXcursorLibraryLoadCursor = 0;
-         }
- #else
-         X11->ptrXcursorLibraryLoadCursor = XcursorLibraryLoadCursor;
-@@ -1794,6 +1800,10 @@
-                 (PtrXineramaIsActive) xineramaLib.resolve("XineramaIsActive");
-             X11->ptrXineramaQueryScreens =
-                 (PtrXineramaQueryScreens) xineramaLib.resolve("XineramaQueryScreens");
-+        } else {
-+            X11->ptrXineramaQueryExtension = 0;
-+            X11->ptrXineramaIsActive = 0;
-+            X11->ptrXineramaQueryScreens = 0;
-         }
- #else
-         X11->ptrXineramaQueryScreens = XineramaQueryScreens;
diff --git a/debian/patches/series b/debian/patches/series
index 212fd27..f580f8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,11 +21,9 @@
 07_trust_dpkg-arch_over_uname-m.diff
 09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
-11_qdbus_to_dbus_fix.diff
 12_fix_qmake_pkgconfig.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
-16_always_init_qt_x11data_ptrx.diff
 20_mips_atomic_ops.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff
diff --git a/debian/rules b/debian/rules
index 1c1b535..25d1fc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,9 +94,6 @@ endif
 	            -system-libpng \
 	            -system-libjpeg \
 	            -system-nas-sound \
-	            -xfixes \
-	            -xcursor \
-	            -xinerama \
 	            -qt-gif \
 	            -plugin-sql-mysql \
 	            -plugin-sql-odbc \