[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-1-20-ge9ea0ec
Fathi Boudra
fabo at alioth.debian.org
Tue Jan 19 19:59:47 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit e9ea0ec7f093c642ee259d2a4dbada4ea083d70b
Author: Fathi Boudra <fabo at debian.org>
Date: Tue Jan 19 20:59:07 2010 +0100
Remove patches merged or fixed upstream.
---
debian/patches/19_install_qdoc3.diff | 20 ----------
debian/patches/81_hurd_clock_gettime.diff | 28 --------------
debian/patches/93_jsvalue64_on_ia64.diff | 37 -------------------
..._fix_crash_in_qdbuspendingreply_qdbusreply.diff | 38 -------------------
.../97_prevent_crash_on_inputcontext_creation.diff | 39 --------------------
debian/patches/series | 5 ---
6 files changed, 0 insertions(+), 167 deletions(-)
diff --git a/debian/patches/19_install_qdoc3.diff b/debian/patches/19_install_qdoc3.diff
deleted file mode 100644
index 3007e0a..0000000
--- a/debian/patches/19_install_qdoc3.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/tools/qdoc3/qdoc3.pro
-+++ b/tools/qdoc3/qdoc3.pro
-@@ -105,3 +105,7 @@ SOURCES += apigenerator.cpp \
- webxmlgenerator.cpp \
- yyindent.cpp
-
-+TARGET = qdoc3
-+target.path = $$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
---- a/tools/tools.pro
-+++ b/tools/tools.pro
-@@ -14,6 +14,7 @@ no-png {
- SUBDIRS += designer
- }
- SUBDIRS += linguist
-+ SUBDIRS += qdoc3
- symbian: SUBDIRS = designer
- wince*: SUBDIRS = qtestlib designer
- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
diff --git a/debian/patches/81_hurd_clock_gettime.diff b/debian/patches/81_hurd_clock_gettime.diff
deleted file mode 100644
index 4ad9912..0000000
--- a/debian/patches/81_hurd_clock_gettime.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-@@ -46,6 +46,9 @@
- #include <mach/mach_time.h>
- #include <unistd.h>
- #elif defined(Q_OS_UNIX)
-+#if defined(Q_OS_HURD)
-+#include <sys/time.h>
-+#endif
- #include <time.h>
- #include <unistd.h>
- #elif defined(Q_OS_WIN)
diff --git a/debian/patches/93_jsvalue64_on_ia64.diff b/debian/patches/93_jsvalue64_on_ia64.diff
deleted file mode 100644
index f7768de..0000000
--- a/debian/patches/93_jsvalue64_on_ia64.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-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,16 @@
- #define WTF_PLATFORM_X86_64 1
- #endif
-
-+/* PLATFORM(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 +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(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
deleted file mode 100644
index 57a7cbe..0000000
--- a/debian/patches/94_fix_crash_in_qdbuspendingreply_qdbusreply.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-From 970f19bdb55cd559e9ef97228d30fd52b20e39cb Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira at nokia.com>
-Date: Tue, 8 Dec 2009 20:28:45 +0100
-Subject: [PATCH] Fix crash in QDBusPendingReply/QDBusReply in case of unconnected calls.
-
-If we made calls on a QDBusConnection that isn't connected, the d
-pointer is 0. Ensure we don't crash.
-
-Task-number: QTBUG-6571
-Reviewed-by: Bradley T. Hughes
----
- src/dbus/qdbuspendingcall.cpp | 2 +-
- src/dbus/qdbuspendingreply.h | 1 +
- .../qdbuspendingreply/tst_qdbuspendingreply.cpp | 25 ++++++++++++++++++++
- tests/auto/qdbusreply/tst_qdbusreply.cpp | 16 ++++++++++++
- 4 files changed, 43 insertions(+), 1 deletions(-)
-
---- a/src/dbus/qdbuspendingcall.cpp
-+++ b/src/dbus/qdbuspendingcall.cpp
-@@ -310,7 +310,7 @@ QDBusPendingCall &QDBusPendingCall::oper
-
- bool QDBusPendingCall::isFinished() const
- {
-- return d && (d->replyMessage.type() != QDBusMessage::InvalidMessage);
-+ return !d || (d->replyMessage.type() != QDBusMessage::InvalidMessage);
- }
-
- void QDBusPendingCall::waitForFinished()
---- a/src/dbus/qdbuspendingreply.h
-+++ b/src/dbus/qdbuspendingreply.h
-@@ -188,6 +188,7 @@ public:
- private:
- inline void calculateMetaTypes()
- {
-+ if (!d) return;
- 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/debian/patches/97_prevent_crash_on_inputcontext_creation.diff b/debian/patches/97_prevent_crash_on_inputcontext_creation.diff
deleted file mode 100644
index 8c5fb99..0000000
--- a/debian/patches/97_prevent_crash_on_inputcontext_creation.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From f72165460d27860cabd51691f4d935fd74b50f80 Mon Sep 17 00:00:00 2001
-From: Denis Dzyubenko <denis.dzyubenko at nokia.com>
-Date: Tue, 5 Jan 2010 13:42:49 +0100
-Subject: [PATCH] Prevent a crash when creating an inputContext from the QApplication dtor.
-
-When accessing the global input context from the QWidget destructor access it
-directly instead of calling a helper function. Don't even bother to create an
-input context if QApplication is being destroyed (just in case if the user is
-calling the QApplication::inputContext manually from the destructor).
-
-Task-number: QTBUG-7105
-Reviewed-by: Simon Hausmann
----
- src/gui/kernel/qapplication.cpp | 2 ++
- src/gui/kernel/qwidget_x11.cpp | 2 +-
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
---- a/src/gui/kernel/qapplication.cpp
-+++ b/src/gui/kernel/qapplication.cpp
-@@ -5175,6 +5175,8 @@ QInputContext *QApplication::inputContex
- {
- Q_D(const QApplication);
- Q_UNUSED(d);// only static members being used.
-+ if (QApplicationPrivate::is_app_closing)
-+ return d->inputContext;
- #ifdef Q_WS_X11
- if (!X11)
- return 0;
---- a/src/gui/kernel/qwidget_x11.cpp
-+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -1097,7 +1097,7 @@ void QWidget::destroy(bool destroyWindow
- } else {
- // release previous focus information participating with
- // preedit preservation of qic
-- QInputContext *qic = inputContext();
-+ QInputContext *qic = QApplicationPrivate::inputContext;
- if (qic)
- qic->widgetDestroyed(this);
- }
diff --git a/debian/patches/series b/debian/patches/series
index cb40558..019f1f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,7 +22,6 @@
16_hide_std_symbols_on_qtwebkit.diff
17_add_postgresql_8.3_support.diff
18_enable_qt3support_qtwebkit_debug_info.diff
-19_install_qdoc3.diff
20_install_qvfb.diff
30_webkit_unaligned_access.diff
40_alpha_ice.diff
@@ -31,12 +30,8 @@
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
92_armel_gcc43_valist_compat.diff
-93_jsvalue64_on_ia64.diff
-94_fix_crash_in_qdbuspendingreply_qdbusreply.diff
95_sparc_platform_definition.diff
96_powerpc_no_gc_sections.diff
-97_prevent_crash_on_inputcontext_creation.diff
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list