rev 13745 - in branches/qt4-x11/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Sat Feb 7 09:40:10 UTC 2009


Author: fabo
Date: 2009-02-07 09:40:10 +0000 (Sat, 07 Feb 2009)
New Revision: 13745

Added:
   branches/qt4-x11/debian/patches/20_fix_ftbfs_callgrindChildExitCode.diff
Removed:
   branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
   branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff
Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
   branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
   branches/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
   branches/qt4-x11/debian/patches/series
   branches/qt4-x11/debian/rules
Log:
Sync qt-copy patches.
Disable changelog install for rc.
Add patch to fix ftbfs on Qt 4.5 rc1.


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2009-02-04 12:08:41 UTC (rev 13744)
+++ branches/qt4-x11/debian/changelog	2009-02-07 09:40:10 UTC (rev 13745)
@@ -15,6 +15,10 @@
     - 18_enable_qt3support_qtwebkit_debug_info.diff
       On Qt >= 4.5, debug info are disabled for Qt3Support and QtWebkit.
       This patch enable them.
+    - 19_install_qdoc3.diff
+      Install qdoc3 binary. It is used by Qt Creator.
+    - 20_fix_ftbfs_callgrindChildExitCode.diff
+      Fix ftfbs on qtestcase.cpp. Stolen from snapshot 20090206.
   * Remove Debian patches:
     - 07_trust_dpkg-arch_over_uname-m.diff - Fixed upstream.
     - 12_fix_qmake_pkgconfig.diff
@@ -27,18 +31,20 @@
     - 0167-fix-group-reading.diff - Merged upstream.
     - 0203-qtexthtmlparser-link-color.diff - Merged upstream.
     - 0224-fast-qpixmap-fill.diff - Fixed upstream.
+    - 0226-qtreeview-column_resize_when_needed.diff - Fixed upstream.
     - 0238-fix-qt-qttabbar-size.diff - Merged upstream.
     - 0248-fix-qwidget-scroll-slowness.diff - Fixed upstream.
     - 0249-webkit-stale-frame-pointer.diff - Merged upstream.
     - 0254-fix-qgraphicsproxywidget-deletion-crash.diff - Merged upstream.
     - 0256-fix-recursive-backingstore-sync-crash.diff - Fixed upstream.
+    - 0257-qurl-validate-speedup.diff - Fixed upstream.
     - 0260-fix-qgraphicswidget-deletionclearFocus.diff - Merged upstream.
     - 0261-sync-before-reset-errorhandler.patch - Merged upstream.
     - 0262-fix-treeview-animation-crash.diff - Merged upstream.
   * Refresh qt-copy patches:
-    0180, 0195, 0209, 0216, 0225, 0226, 0234, 0245, 0255, 0257.
+    0180, 0195, 0209, 0216, 0225, 0234, 0245, 0255.
 
- -- Fathi Boudra <fabo at debian.org>  Wed, 04 Feb 2009 10:08:05 +0100
+ -- Fathi Boudra <fabo at debian.org>  Fri, 06 Feb 2009 10:03:16 +0100
 
 qt4-x11 (4.4.3-2) unstable; urgency=low
 

Modified: branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
===================================================================
--- branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch	2009-02-04 12:08:41 UTC (rev 13744)
+++ branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch	2009-02-07 09:40:10 UTC (rev 13745)
@@ -1,5 +1,5 @@
-qt-bugs@ issue : None
-Trolltech task ID : None
+qt-bugs@ issue : 208185 
+Trolltech task ID : 208349
 bugs.kde.org number : 159014
 applied: no
 author: Robert Knight <robertknight at gmail.com>

Deleted: branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff

Modified: branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
===================================================================
--- branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff	2009-02-04 12:08:41 UTC (rev 13744)
+++ branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff	2009-02-07 09:40:10 UTC (rev 13745)
@@ -9,7 +9,7 @@
 
 --- a/src/gui/kernel/qapplication_x11.cpp
 +++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -3336,11 +3336,11 @@ int QApplication::x11ProcessEvent(XEvent
+@@ -3339,11 +3339,11 @@ int QApplication::x11ProcessEvent(XEvent
          QSize oldSize(w->size());
          w->data->crect.setWidth(DisplayWidth(X11->display, scr));
          w->data->crect.setHeight(DisplayHeight(X11->display, scr));

Modified: branches/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
===================================================================
--- branches/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff	2009-02-04 12:08:41 UTC (rev 13744)
+++ branches/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff	2009-02-07 09:40:10 UTC (rev 13745)
@@ -31,7 +31,7 @@
 
 --- a/src/gui/itemviews/qtreeview.cpp
 +++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3562,7 +3562,7 @@ QList<QPair<int, int> > QTreeViewPrivate
+@@ -3526,7 +3526,7 @@ QList<QPair<int, int> > QTreeViewPrivate
      current.first = -2; // -1 is not enough because -1+1 = 0
      current.second = -2;
      foreach (int logicalColumn, logicalIndexes) {

Deleted: branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff

Added: branches/qt4-x11/debian/patches/20_fix_ftbfs_callgrindChildExitCode.diff
===================================================================
--- branches/qt4-x11/debian/patches/20_fix_ftbfs_callgrindChildExitCode.diff	                        (rev 0)
+++ branches/qt4-x11/debian/patches/20_fix_ftbfs_callgrindChildExitCode.diff	2009-02-07 09:40:10 UTC (rev 13745)
@@ -0,0 +1,28 @@
+--- a/src/testlib/qtestcase.cpp
++++ b/src/testlib/qtestcase.cpp
+@@ -1359,6 +1359,9 @@ int QTest::qExec(QObject *testObject, in
+     QBenchmarkGlobalData benchmarkData;
+     QBenchmarkGlobalData::current = &benchmarkData;
+ 
++#ifdef QTESTLIB_USE_VALGRIND
++    int callgrindChildExitCode = 0;
++#endif
+ 
+ #ifdef Q_WS_MAC
+      bool macNeedsActivate = qApp && qstrcmp(qApp->metaObject()->className(), "QApplicaion");
+@@ -1411,7 +1414,6 @@ int QTest::qExec(QObject *testObject, in
+     QTestResult::setCurrentTestObject(metaObject->className());
+     qParseArgs(argc, argv);
+ #ifdef QTESTLIB_USE_VALGRIND
+-    int callgrindChildExitCode;
+     if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) {
+         const QStringList origAppArgs(QCoreApplication::arguments());
+         if (!QBenchmarkValgrindUtils::rerunThroughCallgrind(origAppArgs, callgrindChildExitCode))
+@@ -1436,6 +1438,7 @@ int QTest::qExec(QObject *testObject, in
+              QTestResult::setCurrentTestFunction(0);
+          }
+ 
++        QTestLog::stopLogging();
+ #ifdef QT_MAC_USE_COCOA
+          if (macNeedsActivate) {
+              IOPMAssertionRelease(powerID);

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2009-02-04 12:08:41 UTC (rev 13744)
+++ branches/qt4-x11/debian/patches/series	2009-02-07 09:40:10 UTC (rev 13745)
@@ -4,11 +4,9 @@
 0209-prevent-qt-mixing.diff
 0216-allow-isystem-for-headers.diff
 0225-invalidate-tabbar-geometry-on-refresh.patch
-0226-qtreeview-column_resize_when_needed.diff
 0234-fix-mysql-threaded.diff
 0245-fix-randr-changes-detecting.diff
 0255-qtreeview-selection-columns-hidden.diff
-0257-qurl-validate-speedup.diff
 
 # debian patches
 01_qmake_for_debian.diff
@@ -25,6 +23,7 @@
 17_add_postgresql_8.3_support.diff
 18_enable_qt3support_qtwebkit_debug_info.diff
 19_install_qdoc3.diff
+20_fix_ftbfs_callgrindChildExitCode.diff
 30_webkit_unaligned_access.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff

Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules	2009-02-04 12:08:41 UTC (rev 13744)
+++ branches/qt4-x11/debian/rules	2009-02-07 09:40:10 UTC (rev 13745)
@@ -28,14 +28,15 @@
 # Shlibs of the current upstream version
 #DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 # Specific shlibs version
-SHLIBSVERSION := 4.4.3
+SHLIBSVERSION := 4.5.0
 $(foreach libpkg,$(filter-out %-dev %-dbg,$(filter lib%,$(DEB_ARCH_PACKAGES))),$(eval DEB_DH_MAKESHLIBS_ARGS_$(libpkg) := -V'$(libpkg) (>= $(SHLIBSVERSION))'))
 
 DEB_DH_STRIP_ARGS_libqt4-dbg := --exclude=.debug
 
 DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
 
-DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
+# Disable for rc
+#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
 
 DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
 




More information about the pkg-kde-commits mailing list