rev 15131 - in trunk/packages/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-07-05 19:29:57 +0000 (Sun, 05 Jul 2009)
New Revision: 15131

Added:
   trunk/packages/qt4-x11/debian/patches/81_hurd_clock_gettime.diff
Modified:
   trunk/packages/qt4-x11/debian/TODO.Debian
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/libphonon4.lintian
   trunk/packages/qt4-x11/debian/patches/91_s390_-gstabs.diff
   trunk/packages/qt4-x11/debian/patches/series
Log:
Cleanup TODO
Add patch from Samuel Thibault related to fix FTBFS on hurd
Add a lintian override for libphonon4
Add comment to patch for s390 build (-gstabs)


Modified: trunk/packages/qt4-x11/debian/TODO.Debian
===================================================================
--- trunk/packages/qt4-x11/debian/TODO.Debian	2009-07-05 18:13:48 UTC (rev 15130)
+++ trunk/packages/qt4-x11/debian/TODO.Debian	2009-07-05 19:29:57 UTC (rev 15131)
@@ -1,8 +1,4 @@
   +++ TODO:
 
   * Review bug reports.
-  * TT changed the build key generation and added backwards compatibility.
-    We need to re-add 07_trust_dpkg-arch_over_uname-m.diff patch for our
-    backward compatibility *and* figure out what to do with the new build key
-    generation.
 

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-07-05 18:13:48 UTC (rev 15130)
+++ trunk/packages/qt4-x11/debian/changelog	2009-07-05 19:29:57 UTC (rev 15131)
@@ -1,4 +1,4 @@
-qt4-x11 (4:4.5.2-1) UNRELEASED; urgency=low
+qt4-x11 (4:4.5.2-1) unstable; urgency=low
 
   * New upstream release:
     - QtWebKit
@@ -37,6 +37,8 @@
     - 0287-attempt-to-fix-header-installation-for-phonon.diff
       This is the long-standing issue of whether Phonon headers should be
       written with a capital P or a lowercase one.
+    - 81_hurd_clock_gettime.diff
+      Fix FTBFS on hurd-i386. Thanks to Samuel Thibault. (Closes #533526)
   * Add epoch 4 to avoid headache for Phonon handling.
   * Build Phonon from Qt sources:
     - Remove libphonon-dev build dependency.

Modified: trunk/packages/qt4-x11/debian/libphonon4.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libphonon4.lintian	2009-07-05 18:13:48 UTC (rev 15130)
+++ trunk/packages/qt4-x11/debian/libphonon4.lintian	2009-07-05 19:29:57 UTC (rev 15131)
@@ -1 +1,4 @@
+# They are harmless .when dpkg-dev has everything needed for c++ symbols,
+# the symbols file will be converted and dpkg-gensymbols will no longer complain.
+libphonon4: symbols-file-contains-current-version-with-debian-revision on symbol _Z6qDebugv at Base and 12 others
 libphonon4: symbols-declares-dependency-on-other-package phonon #MINVER#

Added: trunk/packages/qt4-x11/debian/patches/81_hurd_clock_gettime.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/81_hurd_clock_gettime.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/81_hurd_clock_gettime.diff	2009-07-05 19:29:57 UTC (rev 15131)
@@ -0,0 +1,20 @@
+author: Samuel Thibault <sthibault at debian.org>
+
+FTBFS on hurd-i386 because since clock_gettime is not available there
+qt4-x11 reverts to using gettimeofday, but it doesn't include <sys/time.h>
+where the latter is defined.
+
+Debian bug #533526
+
+--- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
++++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
+@@ -49,6 +49,9 @@
+ 
+ #elif defined(Q_OS_UNIX)
+ 
++#if defined(Q_OS_HURD)
++#include <sys/time.h>
++#endif
+ #include <time.h>
+ #include <unistd.h>
+ 

Modified: trunk/packages/qt4-x11/debian/patches/91_s390_-gstabs.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/91_s390_-gstabs.diff	2009-07-05 18:13:48 UTC (rev 15130)
+++ trunk/packages/qt4-x11/debian/patches/91_s390_-gstabs.diff	2009-07-05 19:29:57 UTC (rev 15131)
@@ -1,3 +1,11 @@
+author: Sune Vuorela <sune at debian.org>
+
+Build s390 debugging symbols with -gstabs instead of with -g
+to reduce linker memory usage.
+Thanks to Oswald Buddenhagen for the hint.
+
+Debian bug 528485
+
 --- a/src/3rdparty/webkit/WebKit.pri
 +++ b/src/3rdparty/webkit/WebKit.pri
 @@ -24,6 +24,14 @@ CONFIG(release) {

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2009-07-05 18:13:48 UTC (rev 15130)
+++ trunk/packages/qt4-x11/debian/patches/series	2009-07-05 19:29:57 UTC (rev 15131)
@@ -32,5 +32,6 @@
 70_hppa_ldcw_fix.diff
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
+81_hurd_clock_gettime.diff
 89_powerpc_opts.diff
 91_s390_-gstabs.diff