[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-1-7-g516aa27
Fathi Boudra
fabo at alioth.debian.org
Tue Jan 5 11:40:49 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit 516aa270e91779fead48edb091e0774466aa4194
Author: Fathi Boudra <fabo at kde.org>
Date: Tue Jan 5 12:38:45 2010 +0100
Sync patches reviewed or accepted upstream.
---
debian/patches/80_hurd_max_path.diff | 25 +++---
debian/patches/81_hurd_clock_gettime.diff | 19 +++--
debian/patches/93_jsvalue64_on_ia64.diff | 17 +++-
..._fix_crash_in_qdbuspendingreply_qdbusreply.diff | 86 +-------------------
4 files changed, 40 insertions(+), 107 deletions(-)
diff --git a/debian/patches/80_hurd_max_path.diff b/debian/patches/80_hurd_max_path.diff
index c520b29..2f1bf92 100644
--- a/debian/patches/80_hurd_max_path.diff
+++ b/debian/patches/80_hurd_max_path.diff
@@ -1,17 +1,20 @@
-author: Michael Banck <mbanck at debian.org>
+author: Marc Dequènes <duck at duckcorp.org>
+debian bug: 485931 530308
qt bug: QTBUG-6960
-define MAX_PATH if not defined. This is needed on hurd.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485931
+fix a POSIX incompatibility (as programs should not rely on having PATH_MAX
+defined on all systems) and causes FTBFS on Hurd.
--- a/src/3rdparty/clucene/src/CLucene/config/compiler.h
+++ b/src/3rdparty/clucene/src/CLucene/config/compiler.h
-@@ -147,7 +147,7 @@
- #elif defined(_MAX_PATH)
- #define CL_MAX_PATH _MAX_PATH
- #else
-- #error "CL_MAX_PATH could not be determined"
-+ #define CL_MAX_PATH 4096
- #endif
+@@ -136,6 +136,10 @@
+ #define LUCENE_INT32_MAX_SHOULDBE 0x7FFFFFFFL
+ #define LUCENE_UINT8_MAX_SHOULDBE 0xff
- //this is the max filename... for now its just the same,
++#if defined(__GNU__)
++ #define PATH_MAX 4096
++#endif
++
+ //maximum path length. only used for buffers that use fullpath.
+ //anything else should use a dynamic length.
+ #if defined(CL_MAX_PATH)
diff --git a/debian/patches/81_hurd_clock_gettime.diff b/debian/patches/81_hurd_clock_gettime.diff
index 057287d..4ad9912 100644
--- a/debian/patches/81_hurd_clock_gettime.diff
+++ b/debian/patches/81_hurd_clock_gettime.diff
@@ -1,11 +1,18 @@
-author: Samuel Thibault <sthibault at debian.org>
-qt bug: QTBUG-6961
-
-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.
+From 7a0fb8407b0737d6f10181846dd49791e094fd88 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <sthibault at debian.org>
+Date: Fri, 25 Dec 2009 17:09:52 +0100
+Subject: [PATCH] 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
+Task-number: QTBUG-6961
+Fix version: 4.6.1
+Reviewed-by: Thiago Macieira <thiago.macieira at nokia.com>
+---
+ .../concurrent/qtconcurrentiteratekernel.cpp | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
--- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
+++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
diff --git a/debian/patches/93_jsvalue64_on_ia64.diff b/debian/patches/93_jsvalue64_on_ia64.diff
index 5a296fc..f7768de 100644
--- a/debian/patches/93_jsvalue64_on_ia64.diff
+++ b/debian/patches/93_jsvalue64_on_ia64.diff
@@ -1,30 +1,37 @@
author: Scott Kitterman <scott at kitterman.com>
qt bug: QTBUG-6948
+fix version: 4.6.2
Fails to build on IA64 due to lack of WTF_USE_JSVALUE64
Added to fix IA64 FTBFS
+http://trac.webkit.org/changeset/51871/trunk/JavaScriptCore/wtf/Platform.h
+
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -347,6 +347,12 @@
+@@ -347,6 +347,16 @@
#define WTF_PLATFORM_X86_64 1
#endif
+/* PLATFORM(IA64) */
-+/* a.k.a. Itanium Processor Family, IPF */
-+#if defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
++#if defined(__ia64__)
+#define WTF_PLATFORM_IA64 1
+#endif
+
++/* PLATFORM(ALPHA) */
++#if defined(__alpha__)
++#define WTF_PLATFORM_ALPHA 1
++#endif
++
/* PLATFORM(SH4) */
#if defined(__SH4__)
#define WTF_PLATFORM_SH4 1
-@@ -726,7 +732,7 @@
+@@ -726,7 +736,7 @@
#endif
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS))
-+#if (PLATFORM(X86_64) || PLATFORM(IA64)) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS))
++#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA)
#define WTF_USE_JSVALUE64 1
#elif PLATFORM(ARM) || PLATFORM(PPC64)
#define WTF_USE_JSVALUE32 1
diff --git a/debian/patches/94_fix_crash_in_qdbuspendingreply_qdbusreply.diff b/debian/patches/94_fix_crash_in_qdbuspendingreply_qdbusreply.diff
index f3490b9..57a7cbe 100644
--- a/debian/patches/94_fix_crash_in_qdbuspendingreply_qdbusreply.diff
+++ b/debian/patches/94_fix_crash_in_qdbuspendingreply_qdbusreply.diff
@@ -15,11 +15,9 @@ Reviewed-by: Bradley T. Hughes
tests/auto/qdbusreply/tst_qdbusreply.cpp | 16 ++++++++++++
4 files changed, 43 insertions(+), 1 deletions(-)
-diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp
-index d10179e..d8eb53e 100644
--- a/src/dbus/qdbuspendingcall.cpp
+++ b/src/dbus/qdbuspendingcall.cpp
-@@ -310,7 +310,7 @@ QDBusPendingCall &QDBusPendingCall::operator=(const QDBusPendingCall &other)
+@@ -310,7 +310,7 @@ QDBusPendingCall &QDBusPendingCall::oper
bool QDBusPendingCall::isFinished() const
{
@@ -28,8 +26,6 @@ index d10179e..d8eb53e 100644
}
void QDBusPendingCall::waitForFinished()
-diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h
-index b7f54e4..4f90c98 100644
--- a/src/dbus/qdbuspendingreply.h
+++ b/src/dbus/qdbuspendingreply.h
@@ -188,6 +188,7 @@ public:
@@ -40,83 +36,3 @@ index b7f54e4..4f90c98 100644
int typeIds[Count > 0 ? Count : 1]; // use at least one since zero-sized arrays aren't valid
ForEach::fillMetaTypes(typeIds);
setMetaTypes(Count, typeIds);
-diff --git a/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
-index 6398d9c..82e6389 100644
---- a/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
-+++ b/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
-@@ -93,6 +93,7 @@ private slots:
- }
-
- void init();
-+ void unconnected();
- void simpleTypes();
- void complexTypes();
- void wrongTypes();
-@@ -252,6 +253,30 @@ void tst_QDBusPendingReply::init()
- QVERIFY(iface->isValid());
- }
-
-+void tst_QDBusPendingReply::unconnected()
-+{
-+ QDBusConnection con("invalid stored connection");
-+ QVERIFY(!con.isConnected());
-+ QDBusInterface iface("doesnt.matter", "/", "doesnt.matter", con);
-+ QVERIFY(!iface.isValid());
-+
-+ QDBusPendingReply<> rvoid = iface.asyncCall("ReloadConfig");
-+ QVERIFY(rvoid.isFinished());
-+ QVERIFY(!rvoid.isValid());
-+ QVERIFY(rvoid.isError());
-+ rvoid.waitForFinished();
-+ QVERIFY(!rvoid.isValid());
-+ QVERIFY(rvoid.isError());
-+
-+ QDBusPendingReply<QString> rstring = iface.asyncCall("GetId");
-+ QVERIFY(rstring.isFinished());
-+ QVERIFY(!rstring.isValid());
-+ QVERIFY(rstring.isError());
-+ rstring.waitForFinished();
-+ QVERIFY(!rstring.isValid());
-+ QVERIFY(rstring.isError());
-+}
-+
- void tst_QDBusPendingReply::simpleTypes()
- {
- QDBusPendingReply<> rvoid = iface->asyncCall("retrieveVoid");
-diff --git a/tests/auto/qdbusreply/tst_qdbusreply.cpp b/tests/auto/qdbusreply/tst_qdbusreply.cpp
-index 9866302..e36d288 100644
---- a/tests/auto/qdbusreply/tst_qdbusreply.cpp
-+++ b/tests/auto/qdbusreply/tst_qdbusreply.cpp
-@@ -93,6 +93,7 @@ private slots:
- }
-
- void init();
-+ void unconnected();
- void simpleTypes();
- void complexTypes();
- void wrongTypes();
-@@ -236,6 +237,21 @@ void tst_QDBusReply::init()
- QVERIFY(iface->isValid());
- }
-
-+void tst_QDBusReply::unconnected()
-+{
-+ QDBusConnection con("invalid stored connection");
-+ QVERIFY(!con.isConnected());
-+ QDBusInterface iface("doesnt.matter", "/", "doesnt.matter", con);
-+ QVERIFY(!iface.isValid());
-+
-+ QDBusReply<void> rvoid = iface.asyncCall("ReloadConfig");
-+ QVERIFY(!rvoid.isValid());
-+
-+ QDBusReply<QString> rstring = iface.asyncCall("GetId");
-+ QVERIFY(!rstring.isValid());
-+ QVERIFY(rstring.value().isEmpty());
-+}
-+
- void tst_QDBusReply::simpleTypes()
- {
- QDBusReply<bool> rbool = iface->call(QDBus::BlockWithGui, "retrieveBool");
---
-1.6.1
-
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list