[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-5-10-g8c0114b
Fathi Boudra
fabo at alioth.debian.org
Tue Jun 8 08:14:30 UTC 2010
The following commit has been merged in the master branch:
commit 8c0114be91815b2a626164910f49b56bc5589ba6
Author: Fathi Boudra <fabo at debian.org>
Date: Tue Jun 8 11:12:12 2010 +0300
Remove patches stolen or merged upstream
---
debian/changelog | 19 ++++++-
...1_qpixmap_load_no_modify_referenced_copies.diff | 44 --------------
.../patches/0002_qmake_qfileinfo_absolutepath.diff | 22 -------
.../0003_s390_fix_atomic_ops_related_crashes.diff | 61 -------------------
.../0005_always_redraw_the_complete_control.diff | 56 -----------------
...06_expand_indicator_would_not_be_displayed.diff | 40 ------------
.../97_alpha_ftbfs_qatomic_alpha_h_types.diff | 63 --------------------
.../98_alpha_ftbfs_wtf_platform_support.diff | 31 ----------
debian/patches/series | 10 +---
9 files changed, 20 insertions(+), 326 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1311178..751706b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
qt4-x11 (4:4.6.3-1) unstable; urgency=low
* New upstream release.
+
+ [ Modestas Vainius ]
* Expand 96_webkit_no_gc_sections.diff to cover mips(el) as well. Hopefully,
this will make linker less memory demanding and solve out-of-memory
condition on buildds.
@@ -10,7 +12,22 @@ qt4-x11 (4:4.6.3-1) unstable; urgency=low
ugly but very needed workaround for a common manifestation of the bug in
QProcess (patch 99_hppa_bug561203_decrease_failure_rate.diff).
- -- Modestas Vainius <modax at debian.org> Tue, 08 Jun 2010 09:39:56 +0300
+ [ Fathi Boudra ]
+ * Remove upstream patches:
+ - 0001_qpixmap_load_no_modify_referenced_copies.diff - stolen upstream
+ - 0002_qmake_qfileinfo_absolutepath.diff - stolen upstream
+ - 0003_s390_fix_atomic_ops_related_crashes.diff - stolen upstream
+ - 0005_always_redraw_the_complete_control.diff - stolen upstream
+ - 0006_expand_indicator_would_not_be_displayed.diff - stolen upstream
+ * Remove Debian patches:
+ - 11_build_translations.diff - disabled
+ - 97_alpha_ftbfs_qatomic_alpha_h_types.diff - merged upstream
+ - 98_alpha_ftbfs_wtf_platform_support.diff - merged upstream
+ * Refresh Debian patches:
+ - 05_append_qt4_target.diff
+ - 30_webkit_unaligned_access.diff
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 08 Jun 2010 09:39:56 +0300
qt4-x11 (4:4.6.2-5) unstable; urgency=low
diff --git a/debian/patches/0001_qpixmap_load_no_modify_referenced_copies.diff b/debian/patches/0001_qpixmap_load_no_modify_referenced_copies.diff
deleted file mode 100644
index 6d651eb..0000000
--- a/debian/patches/0001_qpixmap_load_no_modify_referenced_copies.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1ab5feb6260589f254ed209816cb67dbe9d3e4a5 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Trond=20Kjern=C3=A5sen?= <trond at trolltech.com>
-Date: Mon, 1 Mar 2010 13:44:22 +0100
-Subject: [PATCH] Fixed QPixmap::load() to not modify referenced copies (again!)
-
-Change 8721d060a67a01ac891cab9d3d17aacf7373bcf0 broke the previous
-fix.
-
-Task-number: QTBUG-8606
-Reviewed-by: Gunnar
----
- src/gui/image/qpixmap.cpp | 19 ++++++-------------
- 1 files changed, 6 insertions(+), 13 deletions(-)
-
---- a/src/gui/image/qpixmap.cpp
-+++ b/src/gui/image/qpixmap.cpp
-@@ -831,21 +831,14 @@ bool QPixmap::load(const QString &fileNa
- if (QPixmapCache::find(key, *this))
- return true;
-
-- bool ok;
--
-- if (data) {
-- ok = data->fromFile(fileName, format, flags);
-- } else {
-- QScopedPointer<QPixmapData> tmp(QPixmapData::create(0, 0, QPixmapData::PixmapType));
-- ok = tmp->fromFile(fileName, format, flags);
-- if (ok)
-- data = tmp.take();
-- }
--
-- if (ok)
-+ QScopedPointer<QPixmapData> tmp(QPixmapData::create(0, 0, data ? data->type : QPixmapData::PixmapType));
-+ if (tmp->fromFile(fileName, format, flags)) {
-+ data = tmp.take();
- QPixmapCache::insert(key, *this);
-+ return true;
-+ }
-
-- return ok;
-+ return false;
- }
-
- /*!
diff --git a/debian/patches/0002_qmake_qfileinfo_absolutepath.diff b/debian/patches/0002_qmake_qfileinfo_absolutepath.diff
deleted file mode 100644
index 6819b17..0000000
--- a/debian/patches/0002_qmake_qfileinfo_absolutepath.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From 05a1573eddc6dc404631c9d16474c81aa4cea569 Mon Sep 17 00:00:00 2001
-From: Andreas Kling <andreas.kling at nokia.com>
-Date: Wed, 3 Feb 2010 14:56:15 +0100
-Subject: [PATCH] Fixed QFileInfo::absolutePath() warning when running "qmake -project"
-
-Task-number: QTBUG-7176
-Reviewed-by: Benjamin Poulain <benjamin.poulain at nokia.com>
----
- qmake/project.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/qmake/project.cpp
-+++ b/qmake/project.cpp
-@@ -3067,7 +3067,7 @@ QStringList &QMakeProject::values(const
- place[var] = QStringList(pfile);
- } else if(var == QLatin1String("_PRO_FILE_PWD_")) {
- var = ".BUILTIN." + var;
-- place[var] = QStringList(QFileInfo(pfile).absolutePath());
-+ place[var] = QStringList(pfile.isEmpty() ? qmake_getpwd() : QFileInfo(pfile).absolutePath());
- } else if(var == QLatin1String("_QMAKE_CACHE_")) {
- var = ".BUILTIN." + var;
- if(Option::mkfile::do_cache)
diff --git a/debian/patches/0003_s390_fix_atomic_ops_related_crashes.diff b/debian/patches/0003_s390_fix_atomic_ops_related_crashes.diff
deleted file mode 100644
index ac0c01c..0000000
--- a/debian/patches/0003_s390_fix_atomic_ops_related_crashes.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-From cdf4701f442149546043b155cddcc53116875f1c Mon Sep 17 00:00:00 2001
-From: Dirk Mueller <dmueller at suse.de>
-Date: Wed, 17 Feb 2010 23:17:36 +0100
-Subject: [PATCH] Fix s390(x) atomic ops related crashes
-
-The s390 implementation of the pointer related atomic ops
-never worked before, and the memory barrier was mixed up
-between the Acquire and the Relaxed variant. This fixes
-both.
-
-Merge-request: 2312
-Reviewed-by: Thiago Macieira <thiago.macieira at nokia.com>
-
-Origin: upstream, http://qt.gitorious.org/qt/qt/commit/cdf4701f442149546043b155cddcc53116875f1c
-
----
- src/corelib/arch/qatomic_s390.h | 16 ++++++----------
- 1 files changed, 6 insertions(+), 10 deletions(-)
-
---- a/src/corelib/arch/qatomic_s390.h
-+++ b/src/corelib/arch/qatomic_s390.h
-@@ -366,11 +366,9 @@ template <typename T>
- Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
- {
- #ifndef __s390x__
-- return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr",
-- "", "bcr 15,0\n");
-+ return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "", "");
- #else
-- return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr",
-- "", "bcr 15,0\n");
-+ return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "", "");
- #endif
- }
-
-@@ -378,9 +376,9 @@ template <typename T>
- Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
- {
- #ifndef __s390x__
-- return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr", "", "");
-+ return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "", "bcr 15,0 \n");
- #else
-- return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr", "", "");
-+ return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "", "bcr 15,0 \n");
- #endif
- }
-
-@@ -388,11 +386,9 @@ template <typename T>
- Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
- {
- #ifndef __s390x__
-- return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr",
-- "bcr 15,0 \n", "");
-+ return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "bcr 15,0 \n", "");
- #else
-- return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr",
-- "bcr 15,0\n", "");
-+ return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "bcr 15,0\n", "");
- #endif
- }
-
diff --git a/debian/patches/0005_always_redraw_the_complete_control.diff b/debian/patches/0005_always_redraw_the_complete_control.diff
deleted file mode 100644
index 53380cc..0000000
--- a/debian/patches/0005_always_redraw_the_complete_control.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9b4ca998930c7b81b72e5068b3ebae33907ac4b2 Mon Sep 17 00:00:00 2001
-From: Robert Griebl <rgriebl at trolltech.com>
-Date: Wed, 27 Jan 2010 15:54:25 +0100
-Subject: [PATCH] Always redraw the complete control when an input event comes in.
-
-The problem here is that a pre-edit string won't be detected by
-updateDisplayText(), so the control thinks nothing has changed when
-a new pre-edit string is set.
-
-Reviewed-By: Simon Hausmann
-(cherry picked from commit 16f30906f6eea3e00351478555f153697a6e186d)
----
- src/gui/widgets/qlinecontrol.cpp | 6 +++---
- src/gui/widgets/qlinecontrol_p.h | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/src/gui/widgets/qlinecontrol.cpp
-+++ b/src/gui/widgets/qlinecontrol.cpp
-@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
- Updates the display text based of the current edit text
- If the text has changed will emit displayTextChanged()
- */
--void QLineControl::updateDisplayText()
-+void QLineControl::updateDisplayText(bool forceUpdate)
- {
- QString orig = m_textLayout.text();
- QString str;
-@@ -102,7 +102,7 @@ void QLineControl::updateDisplayText()
- m_textLayout.endLayout();
- m_ascent = qRound(l.ascent());
-
-- if (str != orig)
-+ if (str != orig || forceUpdate)
- emit displayTextChanged(str);
- }
-
-@@ -476,7 +476,7 @@ void QLineControl::processInputMethodEve
- }
- }
- m_textLayout.setAdditionalFormats(formats);
-- updateDisplayText();
-+ updateDisplayText(/*force*/ true);
- if (cursorPositionChanged)
- emitCursorPositionChanged();
- if (isGettingInput)
---- a/src/gui/widgets/qlinecontrol_p.h
-+++ b/src/gui/widgets/qlinecontrol_p.h
-@@ -239,7 +239,7 @@ private:
- void init(const QString &txt);
- void removeSelectedText();
- void internalSetText(const QString &txt, int pos = -1, bool edited = true);
-- void updateDisplayText();
-+ void updateDisplayText(bool forceUpdate = false);
-
- void internalInsert(const QString &s);
- void internalDelete(bool wasBackspace = false);
diff --git a/debian/patches/0006_expand_indicator_would_not_be_displayed.diff b/debian/patches/0006_expand_indicator_would_not_be_displayed.diff
deleted file mode 100644
index db530c5..0000000
--- a/debian/patches/0006_expand_indicator_would_not_be_displayed.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From 120905fbc48ac7658fac392113bf45e00880c456 Mon Sep 17 00:00:00 2001
-From: Gabriel de Dietrich <gabriel.dietrich-de at nokia.com>
-Date: Wed, 24 Feb 2010 16:55:15 +0100
-Subject: [PATCH] Expand indicator would not be displayed after removal of a collapsed item's child
-
-While setting the hasChildren property of QTreeViewItem, "collapsed" and
-"not visible" were being mistaken.
-
-Auto-test included.
-
-Reviewed-by: Olivier
-Task-number: QTBUG-7443
-(cherry picked from commit 77670c3c0fdc3021356e212e94042a0b5a4f4f8c)
----
- src/gui/itemviews/qtreeview.cpp | 13 +++++++++----
- tests/auto/qtreeview/tst_qtreeview.cpp | 14 ++++++++++++++
- 2 files changed, 23 insertions(+), 4 deletions(-)
-
---- a/src/gui/itemviews/qtreeview.cpp
-+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3769,10 +3769,15 @@ void QTreeViewPrivate::rowsRemoved(const
- if (previousSibiling != -1 && after && model->rowCount(parent) == start)
- viewItems[previousSibiling].hasMoreSiblings = false;
-
--
-- updateChildCount(parentItem, -removedCount);
-- if (parentItem != -1 && viewItems.at(parentItem).total == 0)
-- viewItems[parentItem].hasChildren = false; //every children have been removed;
-+ if (parentItem != -1) {
-+ if (viewItems.at(parentItem).expanded) {
-+ updateChildCount(parentItem, -removedCount);
-+ if (viewItems.at(parentItem).total == 0)
-+ viewItems[parentItem].hasChildren = false; //every children have been removed;
-+ } else if (viewItems[parentItem].hasChildren && !hasVisibleChildren(parent)) {
-+ viewItems[parentItem].hasChildren = false;
-+ }
-+ }
- if (after) {
- q->updateGeometries();
- viewport->update();
diff --git a/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff b/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff
deleted file mode 100644
index 8706dd5..0000000
--- a/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-Author: Modestas Vainius <modax at debian.org>
-Description: fix FTBFS on alpha due to invalid type conversions
- ../../include/QtCore/../../src/corelib/arch/qatomic_alpha.h: In member function 'T* QBasicAtomicPointer<T>::fetchAndStoreAcquire(T*) [with T = QMutexPool]':
- kernel/qobject.cpp:123: instantiated from here
- ../../include/QtCore/../../src/corelib/arch/qatomic_alpha.h:401: error: invalid conversion from 'void*' to 'QMutexPool*'
-Forwarded: http://bugreports.qt.nokia.com/browse/QTBUG-5955
-
---- a/src/corelib/arch/qatomic_alpha.h
-+++ b/src/corelib/arch/qatomic_alpha.h
-@@ -367,7 +367,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
- {
-- register void *old, *tmp;
-+ register T *old, *tmp;
- asm volatile("1:\n"
- "ldq_l %0,%2\n" /* old=*ptr; */
- "mov %3,%1\n" /* tmp=newval; */
-@@ -385,7 +385,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
- {
-- register void *old, *tmp;
-+ register T *old, *tmp;
- asm volatile("1:\n"
- "ldq_l %0,%2\n" /* old=*ptr; */
- "mov %3,%1\n" /* tmp=newval; */
-@@ -404,7 +404,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
- {
-- register void *old, *tmp;
-+ register T *old, *tmp;
- asm volatile("mb\n"
- "1:\n"
- "ldq_l %0,%2\n" /* old=*ptr; */
-@@ -423,7 +423,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
- {
-- register void *old, *tmp;
-+ register T *old, *tmp;
- asm volatile("1:\n"
- "ldq_l %0,%2\n" /* old=*ptr; */
- "addq %0,%3,%1\n"/* tmp=old+value; */
-@@ -441,7 +441,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
- {
-- register void *old, *tmp;
-+ register T *old, *tmp;
- asm volatile("1:\n"
- "ldq_l %0,%2\n" /* old=*ptr; */
- "addq %0,%3,%1\n"/* tmp=old+value; */
-@@ -460,7 +460,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
- {
-- register void *old, *tmp;
-+ register T *old, *tmp;
- asm volatile("mb\n"
- "1:\n"
- "ldq_l %0,%2\n" /* old=*ptr; */
diff --git a/debian/patches/98_alpha_ftbfs_wtf_platform_support.diff b/debian/patches/98_alpha_ftbfs_wtf_platform_support.diff
deleted file mode 100644
index ac9a9c8..0000000
--- a/debian/patches/98_alpha_ftbfs_wtf_platform_support.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Modestas Vainius <modax at debian.org>
-Description: add support for alpha architecture to wtf/Platform.h
- This should fix FTBFS of QtScript library on alpha. ALPHA is already supported
- in the webkit copy of this header file.
-Forwarded: no
-Origin: vendor
-Last-Update: 2010-04-19
-
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -367,6 +367,11 @@
- #endif
- #endif
-
-+/* PLATFORM(ALPHA) */
-+#if defined(__alpha__)
-+#define WTF_PLATFORM_ALPHA 1
-+#endif
-+
- /* PLATFORM(WINCE) && PLATFORM(QT)
- We can not determine the endianess at compile time. For
- Qt for Windows CE the endianess is specified in the
-@@ -720,7 +725,7 @@
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
- #if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX))
- #define WTF_USE_JSVALUE64 1
--#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64)
-+#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA)
- #define WTF_USE_JSVALUE64 1
- #elif PLATFORM(AIX64)
- #define WTF_USE_JSVALUE64 1
diff --git a/debian/patches/series b/debian/patches/series
index 6599108..b67900b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,5 @@
# upstream patches
-0001_qpixmap_load_no_modify_referenced_copies.diff
-0002_qmake_qfileinfo_absolutepath.diff
-0003_s390_fix_atomic_ops_related_crashes.diff
0004_problem_displaying_half_width_character.diff
-0005_always_redraw_the_complete_control.diff
-0006_expand_indicator_would_not_be_displayed.diff
# qt-copy patches
0180-window-role.diff
@@ -23,7 +18,7 @@
08_configure_quilt_compat.diff
09_qmake_lflags_as-needed.diff
10_config_tests_fixes.diff
-11_build_translations.diff
+#11_build_translations.diff
12_add_nostrip_for_debug_packages.diff
15_fix_qmake_makefile_generation.diff
16_hide_std_symbols_on_qtwebkit.diff
@@ -46,5 +41,4 @@
92_armel_gcc43_valist_compat.diff
95_sparc_platform_definition.diff
96_webkit_no_gc_sections.diff
-97_alpha_ftbfs_qatomic_alpha_h_types.diff
-98_alpha_ftbfs_wtf_platform_support.diff
+99_hppa_bug561203_decrease_failure_rate.diff
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list