[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-1-9-g15c37c4
Fathi Boudra
fabo at alioth.debian.org
Sun Jun 12 11:08:32 UTC 2011
The following commit has been merged in the master branch:
commit 15c37c42c847647386d54bfaccfbadf7f4ba5967
Author: Fathi Boudra <fabo at debian.org>
Date: Sun Jun 12 14:07:19 2011 +0300
Include diff stat
---
debian/patches/0195-compositing-properties.diff | 2 +-
debian/patches/01_debian_append_qt4_suffix.diff | 28 ++++++++++++++++++++
...225-invalidate-tabbar-geometry-on-refresh.patch | 2 +-
...cqt_sane_timestamp_for_nonexisting_headers.diff | 4 +++
.../patches/07_trust_dpkg-arch_over_uname-m.diff | 4 +++
debian/patches/08_configure_quilt_compat.diff | 4 +++
debian/patches/10_config_tests_fixes.diff | 7 +++++
debian/patches/11_build_translations.diff | 6 ++++
.../patches/12_add_nostrip_for_debug_packages.diff | 4 +++
.../patches/15_fix_qmake_makefile_generation.diff | 4 +++
.../patches/16_hide_std_symbols_on_qtwebkit.diff | 5 +++
.../18_enable_qt3support_qtwebkit_debug_info.diff | 5 +++
debian/patches/20_install_qvfb.diff | 4 +++
debian/patches/21_qt_ia32_library_path.diff | 4 +++
.../23_permit_plugins_built_with_future_qt.diff | 4 +++
debian/patches/30_webkit_unaligned_access.diff | 7 +++++
debian/patches/40_alpha_ice.diff | 5 +++
debian/patches/41_disable_opengl_visibility.diff | 4 +++
debian/patches/50_kfreebsd_Q_OS.diff | 4 +++
debian/patches/51_kfreebsd_strnstr_build_fix.diff | 5 +++
debian/patches/70_hppa_ldcw_fix.diff | 4 +++
.../71_hppa_unaligned_access_fix_458133.diff | 4 +++
debian/patches/80_hurd_max_path.diff | 4 +++
debian/patches/92_armel_gcc43_valist_compat.diff | 5 +++
debian/patches/94_armv6_uname_entry.diff | 4 +++
debian/patches/96_webkit_no_gc_sections.diff | 4 +++
.../99_hppa_bug561203_decrease_failure_rate.diff | 4 +++
..._support_for_QT_USE_DRAG_DISTANCE_env_var.patch | 4 +++
.../Fix_GL_problems_on_stock_1.4_SGX_drivers.patch | 4 +++
...pilers_without_--with-fpu_neon_as_default.patch | 4 +++
.../Fix_transformIsSimple_in_QGraphicsScene.patch | 4 +++
...backend_when_creating_translucent_windows.patch | 4 +++
...en_using_static_text_items_in_GL_2_engine.patch | 6 ++++
...formance-of-partial-updates-in-raster-win.patch | 4 +-
.../patches/Make_use_of_the_fast_image_paths.patch | 5 +++
.../patches/Micro-optimization_for_QSpanData.patch | 4 +++
...nt_recursion_when_creating_window_surface.patch | 4 +++
.../Some_Optimizations_for_the_gray_raster.patch | 5 +++
.../Update_createwindow_in_qgl_x11egl.patch | 2 +-
.../buildable_appchooser_states_demos.patch | 5 +++
debian/patches/kfreebsd_monotonic_clock.diff | 4 +++
debian/patches/powerpc_designer_gstabs.diff | 4 +++
debian/patches/powerpcspe.diff | 4 +++
debian/patches/qtdebug_syslog.patch | 5 +++
debian/patches/sh.diff | 4 +++
45 files changed, 212 insertions(+), 5 deletions(-)
diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index 26e5322..2bee97e 100644
--- a/debian/patches/0195-compositing-properties.diff
+++ b/debian/patches/0195-compositing-properties.diff
@@ -9,7 +9,7 @@ qt-bugs@ issue : none
bugs.kde.org number : none
---
src/gui/kernel/qwidget_x11.cpp | 21 +++++++++++++++------
- 1 files changed, 15 insertions(+), 6 deletions(-)
+ 1 file changed, 15 insertions(+), 6 deletions(-)
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index dcb39e5..5c97c52 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -7,6 +7,34 @@ Description: Append a -qt4 suffix to some tools.
Last-Update: 2011-03-03
Forwarded: not-needed
+---
+ config.tests/unix/compile.test | 2 +-
+ config.tests/unix/doubleformat.test | 2 +-
+ config.tests/unix/endian.test | 2 +-
+ config.tests/unix/ptrsize.test | 2 +-
+ config.tests/x11/notype.test | 2 +-
+ configure | 12 ++++++------
+ demos/qtdemo/menumanager.cpp | 2 +-
+ mkspecs/common/linux.conf | 4 ++--
+ mkspecs/features/moc.prf | 2 +-
+ mkspecs/features/uic.prf | 2 +-
+ projects.pro | 2 +-
+ qmake/Makefile.unix | 8 ++++----
+ src/tools/moc/moc.pro | 2 +-
+ src/tools/uic/uic.pro | 2 +-
+ tools/assistant/tools/assistant/assistant.pro | 2 +-
+ tools/designer/src/designer/assistantclient.cpp | 2 +-
+ tools/designer/src/designer/designer.pro | 2 +-
+ tools/designer/src/lib/shared/qdesigner_utils.cpp | 2 +-
+ tools/linguist/linguist/linguist.pro | 2 +-
+ tools/linguist/lrelease/lrelease.pro | 2 +-
+ tools/linguist/lupdate/lupdate.pro | 2 +-
+ tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp | 2 +-
+ tools/qtconfig/qtconfig.pro | 2 +-
+ translations/translations.pri | 2 +-
+ translations/translations.pro | 4 ++--
+ 25 files changed, 35 insertions(+), 35 deletions(-)
+
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -68,7 +68,7 @@ test -r Makefile && $MAKE distclean >/de
diff --git a/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch b/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
index 31e298f..de10b34 100644
--- a/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
+++ b/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
@@ -26,7 +26,7 @@ Trolltech task ID : 208349
bugs.kde.org number : 159014
---
src/gui/widgets/qtabbar.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
diff --git a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
index 8ee8474..16b3ddd 100644
--- a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
+++ b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
@@ -9,6 +9,10 @@ qconfig.h does not exist when syncqt is run by ./configure. So instead of
assigning a modification timestamp equal to the epoch (00:00 January 1, 1970
GMT.) for the symlink, just use current time().
+---
+ bin/syncqt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -830,7 +830,7 @@ foreach my $lib (@modules_to_sync) {
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index 01eb78f..d3f071c 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -2,6 +2,10 @@ author: Sune Vuorela
qt-bugs@ issue : N180631
Trolltech task ID : 181882
+---
+ configure | 45 ++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 44 insertions(+), 1 deletion(-)
+
--- a/configure
+++ b/configure
@@ -168,7 +168,50 @@ linkerSupportsFlag()
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 8a5a7e5..d250f49 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -1,6 +1,10 @@
Avoid '.pc' directories created by quilt.
It breaks qmake projects search.
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/configure
+++ b/configure
@@ -8492,7 +8492,7 @@ fi
diff --git a/debian/patches/10_config_tests_fixes.diff b/debian/patches/10_config_tests_fixes.diff
index 6a08a5a..2b3f93d 100644
--- a/debian/patches/10_config_tests_fixes.diff
+++ b/debian/patches/10_config_tests_fixes.diff
@@ -4,6 +4,13 @@ Description: Various config.test fixes.
Author: Fathi Boudra <fabo at debian.org>
Last-Update: 2010-05-24
+---
+ config.tests/unix/gstreamer/gstreamer.pro | 1 +
+ config.tests/unix/ibase/ibase.pro | 2 +-
+ config.tests/unix/sqlite/sqlite.pro | 1 +
+ src/sql/drivers/ibase/qsql_ibase.pri | 2 +-
+ 4 files changed, 4 insertions(+), 2 deletions(-)
+
--- a/config.tests/unix/ibase/ibase.pro
+++ b/config.tests/unix/ibase/ibase.pro
@@ -1,4 +1,4 @@
diff --git a/debian/patches/11_build_translations.diff b/debian/patches/11_build_translations.diff
index 66ceb54..ff0a712 100644
--- a/debian/patches/11_build_translations.diff
+++ b/debian/patches/11_build_translations.diff
@@ -3,6 +3,12 @@ author: Fathi Boudra <fabo at debian.org>
translations fails to build under autobuilders.
Use case: Qt sources comes from git and we need to build them.
+---
+ tools/assistant/translations/qt_help.pro | 53 +++++++++
+ tools/assistant/translations/translations.pro | 54 +++++++++
+ tools/designer/translations/translations.pro | 141 ++++++++++++++++++++++++++
+ 3 files changed, 248 insertions(+)
+
--- /dev/null
+++ b/tools/assistant/translations/qt_help.pro
@@ -0,0 +1,53 @@
diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff
index f721db5..200f313 100644
--- a/debian/patches/12_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/12_add_nostrip_for_debug_packages.diff
@@ -4,6 +4,10 @@ Qt is built in release mode and strip files by default.
Set CONFIG+=nostrip to avoid the stripping and
let dh_strip do it to generate debug packages.
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
--- a/configure
+++ b/configure
@@ -650,6 +650,8 @@ mkdir -p "$outpath/config.tests"
diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff
index f30c04a..df4f9cb 100644
--- a/debian/patches/15_fix_qmake_makefile_generation.diff
+++ b/debian/patches/15_fix_qmake_makefile_generation.diff
@@ -1,6 +1,10 @@
Description: Fix qmake makefile generation - should not add double slashes to makefiles.
Author: Sune Vuorela <debian at pusling.com>
+---
+ qmake/generators/makefile.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2433,7 +2433,7 @@ MakefileGenerator::writeSubTargets(QText
diff --git a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
index b1e5e23..42d38e9 100644
--- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
+++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
@@ -2,6 +2,11 @@ Description: Don't make the std:: symbols in webkit public.
Solution based on the work of Mike Hommey in the gtk webkit package.
Author: Sune Vuorela <debian at pusling.com>
+---
+ src/3rdparty/webkit/WebKit.pri | 1 +
+ src/3rdparty/webkit/symbols.filter | 5 +++++
+ 2 files changed, 6 insertions(+)
+
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
@@ -54,6 +54,7 @@ symbian {
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index e31c54e..fc643d1 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -3,6 +3,11 @@ author: Fathi Boudra <fabo at debian.org>
On Qt >= 4.5, debug info are disabled for Qt3Support and QtWebkit.
This patch enable them.
+---
+ src/3rdparty/webkit/WebCore/WebCore.pro | 2 --
+ src/qt3support/qt3support.pro | 3 ---
+ 2 files changed, 5 deletions(-)
+
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -2954,8 +2954,6 @@ HEADERS += $$WEBKIT_API_HEADERS
diff --git a/debian/patches/20_install_qvfb.diff b/debian/patches/20_install_qvfb.diff
index 06ff1f8..aee48c3 100644
--- a/debian/patches/20_install_qvfb.diff
+++ b/debian/patches/20_install_qvfb.diff
@@ -1,6 +1,10 @@
Description: build qvfb tool
Author: Fathi Boudra <fabo at debian.org>
+---
+ tools/tools.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -41,6 +41,8 @@ embedded: SUBDIRS += makeqpf
diff --git a/debian/patches/21_qt_ia32_library_path.diff b/debian/patches/21_qt_ia32_library_path.diff
index a2aebeb..0f0fb2e 100644
--- a/debian/patches/21_qt_ia32_library_path.diff
+++ b/debian/patches/21_qt_ia32_library_path.diff
@@ -4,6 +4,10 @@ Origin: kubuntu, http://bazaar.launchpad.net/~kubuntu-members/qt/ubuntu/annotate
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ia32-libs/+bug/353704
Author: Bo Thorsen <bo at sonofthor.dk>
+---
+ src/corelib/global/qlibraryinfo.cpp | 32 ++++++++++++++++++++++++++------
+ 1 file changed, 26 insertions(+), 6 deletions(-)
+
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -68,6 +68,10 @@ QT_END_NAMESPACE
diff --git a/debian/patches/23_permit_plugins_built_with_future_qt.diff b/debian/patches/23_permit_plugins_built_with_future_qt.diff
index 4debfd6..4bc82d7 100644
--- a/debian/patches/23_permit_plugins_built_with_future_qt.diff
+++ b/debian/patches/23_permit_plugins_built_with_future_qt.diff
@@ -21,6 +21,10 @@ from rare user faults or weird system misconfigurations for more flexibility,
installability and expand of forward binary compatibility beyond the same Qt
4.x whenever possible.
+---
+ src/corelib/plugin/qlibrary.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -737,7 +737,7 @@ bool QLibraryPrivate::isPlugin(QSettings
diff --git a/debian/patches/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff
index 6d74868..fce3988 100644
--- a/debian/patches/30_webkit_unaligned_access.diff
+++ b/debian/patches/30_webkit_unaligned_access.diff
@@ -12,6 +12,13 @@ Some compiler warnings about alignment remain, but I don't know if they are
a real problem yet.
---
+---
+ src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp | 4 ++--
+ src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h | 9 +++------
+ src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp | 2 +-
+ src/3rdparty/webkit/WebCore/platform/text/StringHash.h | 6 +++---
+ 4 files changed, 9 insertions(+), 12 deletions(-)
+
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
@@ -2336,13 +2336,13 @@ static TCMalloc_Central_FreeListPadded c
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index 7f3cb1a..3eef118 100644
--- a/debian/patches/40_alpha_ice.diff
+++ b/debian/patches/40_alpha_ice.diff
@@ -4,6 +4,11 @@ Description: Workaround for -fvisibility-inlines-hidden on alpha:
Bug-Debian: http://bugs.debian.org/368883
Author: Steve Langasek <vorlon at debian.org>
+---
+ src/corelib/global/qlibraryinfo.cpp | 14 ++++++++------
+ src/corelib/tools/qhash.h | 2 +-
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -89,12 +89,7 @@ class QLibraryInfoPrivate
diff --git a/debian/patches/41_disable_opengl_visibility.diff b/debian/patches/41_disable_opengl_visibility.diff
index fd3b629..327ab9e 100644
--- a/debian/patches/41_disable_opengl_visibility.diff
+++ b/debian/patches/41_disable_opengl_visibility.diff
@@ -1,5 +1,9 @@
temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
+---
+ src/opengl/opengl.pro | 1 +
+ 1 file changed, 1 insertion(+)
+
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -37,6 +37,7 @@ SOURCES += qgl.cpp \
diff --git a/debian/patches/50_kfreebsd_Q_OS.diff b/debian/patches/50_kfreebsd_Q_OS.diff
index 61f7f2d..4a8db71 100644
--- a/debian/patches/50_kfreebsd_Q_OS.diff
+++ b/debian/patches/50_kfreebsd_Q_OS.diff
@@ -2,6 +2,10 @@ Author: Pino Toscano <pino at kde.org>
Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL.
Last-Update: 2010-10-06
+---
+ src/corelib/global/qglobal.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -221,6 +221,8 @@ namespace QT_NAMESPACE {}
diff --git a/debian/patches/51_kfreebsd_strnstr_build_fix.diff b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
index 8440fbf..ea31b5c 100644
--- a/debian/patches/51_kfreebsd_strnstr_build_fix.diff
+++ b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
@@ -2,6 +2,11 @@ Description: Fix FTBFS on GNU/kFreeBSD caused by missing strnstr() on glibc syst
Author: Fathi Boudra <fabo at debian.org>
Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 2 +-
+ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -370,7 +370,7 @@
diff --git a/debian/patches/70_hppa_ldcw_fix.diff b/debian/patches/70_hppa_ldcw_fix.diff
index 71a959a..dcfbd34 100644
--- a/debian/patches/70_hppa_ldcw_fix.diff
+++ b/debian/patches/70_hppa_ldcw_fix.diff
@@ -2,6 +2,10 @@ author: LaMont Jones <lamont at bld-4.mmjgroup.com>
patch from Ubuntu to properly support hppa.
+---
+ src/corelib/arch/parisc/q_ldcw.s | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
--- a/src/corelib/arch/parisc/q_ldcw.s
+++ b/src/corelib/arch/parisc/q_ldcw.s
@@ -38,20 +38,10 @@
diff --git a/debian/patches/71_hppa_unaligned_access_fix_458133.diff b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
index 9a931e3..280092f 100644
--- a/debian/patches/71_hppa_unaligned_access_fix_458133.diff
+++ b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
@@ -2,6 +2,10 @@ author: Bernhard R. Link <brlink at debian.org>
Fix unaligned access on hppa
+---
+ src/3rdparty/sha1/sha1.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
--- a/src/3rdparty/sha1/sha1.cpp
+++ b/src/3rdparty/sha1/sha1.cpp
@@ -149,10 +149,10 @@ static inline void sha1ProcessChunk(Sha1
diff --git a/debian/patches/80_hurd_max_path.diff b/debian/patches/80_hurd_max_path.diff
index 0503e3c..808e7b5 100644
--- a/debian/patches/80_hurd_max_path.diff
+++ b/debian/patches/80_hurd_max_path.diff
@@ -6,6 +6,10 @@ Description: PATH_MAX fix
Fix a POSIX incompatibility (as programs should not rely on having PATH_MAX
defined on all systems) and causes FTBFS on Hurd.
+---
+ src/3rdparty/clucene/src/CLucene/config/compiler.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
--- a/src/3rdparty/clucene/src/CLucene/config/compiler.h
+++ b/src/3rdparty/clucene/src/CLucene/config/compiler.h
@@ -136,6 +136,10 @@
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index b260c10..f2f3b1a 100644
--- a/debian/patches/92_armel_gcc43_valist_compat.diff
+++ b/debian/patches/92_armel_gcc43_valist_compat.diff
@@ -13,6 +13,11 @@ Subject: Restore QtCore ABI compatibility with binaries built with g++ 4.3 on ar
original symbols.
Forward: not-needed
+---
+ src/corelib/tools/qstring.cpp | 5 +++++
+ src/corelib/tools/qvsnprintf.cpp | 6 ++++++
+ 2 files changed, 11 insertions(+)
+
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -5466,6 +5466,11 @@ QString &QString::vsprintf(const char* c
diff --git a/debian/patches/94_armv6_uname_entry.diff b/debian/patches/94_armv6_uname_entry.diff
index 4e53ac7..c9c7140 100644
--- a/debian/patches/94_armv6_uname_entry.diff
+++ b/debian/patches/94_armv6_uname_entry.diff
@@ -1,6 +1,10 @@
Description: Add armv6 uname entry for armhf
---
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
--- a/configure
+++ b/configure
@@ -182,6 +182,9 @@ case $DPKG_ARCH in
diff --git a/debian/patches/96_webkit_no_gc_sections.diff b/debian/patches/96_webkit_no_gc_sections.diff
index 94e05b1..0e1c83b 100644
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@ -7,6 +7,10 @@ Origin: vendor
Forwarded: no
Last-Update: 2010-05-31 (mipsel added)
+---
+ src/3rdparty/webkit/WebCore/WebCore.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -90,7 +90,7 @@ unix {
diff --git a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
index 8156f56..05371c9 100644
--- a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
+++ b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
@@ -10,6 +10,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561203
Origin: vendor
Last-Update: 2010-06-06
+---
+ src/corelib/io/qprocess_unix.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -505,6 +505,9 @@ static char **_q_dupEnvironment(const QH
diff --git a/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch b/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
index 03ef0ee..1369d03 100644
--- a/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
+++ b/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
@@ -2,6 +2,10 @@ Description: support reading of default value for startDragDistance property
from QT_USE_DRAG_DISTANCE environment variable.
See also http://bugreports.qt.nokia.com/browse/QTBUG-12594
Author: Joonas Tanskanen <joonas.tanskanen at sasken.com>
+---
+ src/gui/kernel/qapplication.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -1013,6 +1013,11 @@ void QApplicationPrivate::initialize()
diff --git a/debian/patches/Fix_GL_problems_on_stock_1.4_SGX_drivers.patch b/debian/patches/Fix_GL_problems_on_stock_1.4_SGX_drivers.patch
index 749848e..18d0fae 100644
--- a/debian/patches/Fix_GL_problems_on_stock_1.4_SGX_drivers.patch
+++ b/debian/patches/Fix_GL_problems_on_stock_1.4_SGX_drivers.patch
@@ -14,6 +14,10 @@ Date: Thu Mar 17 18:32:58 2011 +0100
Merge-request: 1144
Reviewed-by: Samuel Rødal <samuel.rodal at nokia.com>
+---
+ src/opengl/qgl_egl.cpp | 27 +++++++++++++++++++++++++--
+ 1 file changed, 25 insertions(+), 2 deletions(-)
+
--- a/src/opengl/qgl_egl.cpp
+++ b/src/opengl/qgl_egl.cpp
@@ -39,6 +39,7 @@
diff --git a/debian/patches/Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch b/debian/patches/Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
index 3f5682f..db0e7cb 100644
--- a/debian/patches/Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
+++ b/debian/patches/Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
@@ -16,6 +16,10 @@ Date: Fri Feb 4 12:39:51 2011 +0100
Merge-request: 1042
Reviewed-by: Samuel Rødal <samuel.rodal at nokia.com>
+---
+ src/gui/gui.pro | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -65,15 +65,14 @@ symbian {
diff --git a/debian/patches/Fix_transformIsSimple_in_QGraphicsScene.patch b/debian/patches/Fix_transformIsSimple_in_QGraphicsScene.patch
index b7ec9ed..4797d82 100644
--- a/debian/patches/Fix_transformIsSimple_in_QGraphicsScene.patch
+++ b/debian/patches/Fix_transformIsSimple_in_QGraphicsScene.patch
@@ -8,6 +8,10 @@ Date: Tue Nov 16 12:45:15 2010 +0100
Reviewed-by: bnilsen
+---
+ src/gui/graphicsview/qgraphicsscene.cpp | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -4367,25 +4367,8 @@ static void _q_paintIntoCache(QPixmap *p
diff --git a/debian/patches/Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch b/debian/patches/Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
index f02a81b..95d214f 100644
--- a/debian/patches/Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
+++ b/debian/patches/Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
@@ -9,6 +9,10 @@ Date: Tue May 3 12:36:08 2011 +0200
be created for the same QGLWidget, which leads to undefined behaviour on
some platforms.
+---
+ src/gui/kernel/qwidget_x11.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -937,8 +937,13 @@ static void qt_x11_recreateWidget(QWidge
diff --git a/debian/patches/Fixed_missing_text_when_using_static_text_items_in_GL_2_engine.patch b/debian/patches/Fixed_missing_text_when_using_static_text_items_in_GL_2_engine.patch
index 209964b..fef940e 100644
--- a/debian/patches/Fixed_missing_text_when_using_static_text_items_in_GL_2_engine.patch
+++ b/debian/patches/Fixed_missing_text_when_using_static_text_items_in_GL_2_engine.patch
@@ -17,6 +17,12 @@ Date: Tue Feb 1 17:57:10 2011 +0100
Reviewed-by: Eskil Abrahamsen Blomfeldt
+---
+ src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 13 ++++++++-----
+ src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | 3 +++
+ src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | 3 +++
+ 3 files changed, 14 insertions(+), 5 deletions(-)
+
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1489,7 +1489,7 @@ namespace {
diff --git a/debian/patches/Improve-performance-of-partial-updates-in-raster-win.patch b/debian/patches/Improve-performance-of-partial-updates-in-raster-win.patch
index 4d28954..82625af 100644
--- a/debian/patches/Improve-performance-of-partial-updates-in-raster-win.patch
+++ b/debian/patches/Improve-performance-of-partial-updates-in-raster-win.patch
@@ -19,8 +19,8 @@ the performance of partial updates.
Idea-from: Olivier Goffart
Reviewed-by: Bjørn Erik Nilsen
---
- src/gui/painting/qwindowsurface_raster.cpp | 29 ++++++++++++++++++++++++++-
- src/gui/painting/qwindowsurface_raster_p.h | 3 ++
+ src/gui/painting/qwindowsurface_raster.cpp | 29 +++++++++++++++++++++++++++--
+ src/gui/painting/qwindowsurface_raster_p.h | 3 +++
2 files changed, 30 insertions(+), 2 deletions(-)
--- a/src/gui/painting/qwindowsurface_raster.cpp
diff --git a/debian/patches/Make_use_of_the_fast_image_paths.patch b/debian/patches/Make_use_of_the_fast_image_paths.patch
index c96ca69..156b3f6 100644
--- a/debian/patches/Make_use_of_the_fast_image_paths.patch
+++ b/debian/patches/Make_use_of_the_fast_image_paths.patch
@@ -10,6 +10,11 @@ Date: Mon Nov 1 12:49:41 2010 +0100
Task-number: QTBUG-14901
Reviewed-by: Kim
+---
+ src/gui/painting/qpaintengine_raster.cpp | 17 ++++++++++++-----
+ src/gui/painting/qpaintengine_raster_p.h | 1 +
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -2506,7 +2506,7 @@ void QRasterPaintEngine::drawImage(const
diff --git a/debian/patches/Micro-optimization_for_QSpanData.patch b/debian/patches/Micro-optimization_for_QSpanData.patch
index 56254a3..6d1fe3a 100644
--- a/debian/patches/Micro-optimization_for_QSpanData.patch
+++ b/debian/patches/Micro-optimization_for_QSpanData.patch
@@ -8,6 +8,10 @@ Date: Mon Dec 20 13:04:23 2010 +0100
Reviewed-by: Samuel Rødal
+---
+ src/gui/painting/qpaintengine_raster.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -5139,7 +5139,8 @@ void QSpanData::setup(const QBrush &brus
diff --git a/debian/patches/Prevent_recursion_when_creating_window_surface.patch b/debian/patches/Prevent_recursion_when_creating_window_surface.patch
index f6799bf..95633a9 100644
--- a/debian/patches/Prevent_recursion_when_creating_window_surface.patch
+++ b/debian/patches/Prevent_recursion_when_creating_window_surface.patch
@@ -11,6 +11,10 @@ Date: Tue Feb 1 17:59:54 2011 +0100
Reviewed-by: Michael Dominic K
+---
+ src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -42,6 +42,7 @@
diff --git a/debian/patches/Some_Optimizations_for_the_gray_raster.patch b/debian/patches/Some_Optimizations_for_the_gray_raster.patch
index 305bbee..b756885 100644
--- a/debian/patches/Some_Optimizations_for_the_gray_raster.patch
+++ b/debian/patches/Some_Optimizations_for_the_gray_raster.patch
@@ -17,6 +17,11 @@ Date: Thu Nov 18 12:06:41 2010 +0100
Reviewed-by: Andreas Kling
+---
+ src/gui/painting/qgrayraster.c | 35 ++++++++++++-----------------------
+ src/gui/painting/qgrayraster_p.h | 2 +-
+ 2 files changed, 13 insertions(+), 24 deletions(-)
+
--- a/src/gui/painting/qgrayraster.c
+++ b/src/gui/painting/qgrayraster.c
@@ -408,25 +408,31 @@
diff --git a/debian/patches/Update_createwindow_in_qgl_x11egl.patch b/debian/patches/Update_createwindow_in_qgl_x11egl.patch
index 481db8d..6090e82 100644
--- a/debian/patches/Update_createwindow_in_qgl_x11egl.patch
+++ b/debian/patches/Update_createwindow_in_qgl_x11egl.patch
@@ -12,7 +12,7 @@ Merge-request: 1183
Reviewed-by: Samuel Rødal <samuel.rodal at nokia.com>
---
src/opengl/qgl_x11egl.cpp | 10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
+ 1 file changed, 9 insertions(+), 1 deletion(-)
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
diff --git a/debian/patches/buildable_appchooser_states_demos.patch b/debian/patches/buildable_appchooser_states_demos.patch
index dcaa602..04a1d85 100644
--- a/debian/patches/buildable_appchooser_states_demos.patch
+++ b/debian/patches/buildable_appchooser_states_demos.patch
@@ -2,6 +2,11 @@ Description: make states and appchooser demos buildable
Bug-Debian: http://bugs.debian.org/616500
Author: Fathi Boudra <fabo at debian.org>
Last-Update: 2011-03-05
+---
+ examples/animation/appchooser/appchooser.pro | 3 ++-
+ examples/animation/states/states.pro | 4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
--- a/examples/animation/appchooser/appchooser.pro
+++ b/examples/animation/appchooser/appchooser.pro
@@ -3,7 +3,8 @@ RESOURCES = appchooser.qrc
diff --git a/debian/patches/kfreebsd_monotonic_clock.diff b/debian/patches/kfreebsd_monotonic_clock.diff
index 94a6b54..86f0b17 100644
--- a/debian/patches/kfreebsd_monotonic_clock.diff
+++ b/debian/patches/kfreebsd_monotonic_clock.diff
@@ -15,6 +15,10 @@ operate without monotonic clock because qt_safe_select() will indicate timeout
earlier than it is supposed when underlying select() call is interrupted
(errno=EINTR).
+---
+ config.tests/unix/clock-gettime/clock-gettime.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/config.tests/unix/clock-gettime/clock-gettime.pri
+++ b/config.tests/unix/clock-gettime/clock-gettime.pri
@@ -1,2 +1,2 @@
diff --git a/debian/patches/powerpc_designer_gstabs.diff b/debian/patches/powerpc_designer_gstabs.diff
index 710e1a4..5349b44 100644
--- a/debian/patches/powerpc_designer_gstabs.diff
+++ b/debian/patches/powerpc_designer_gstabs.diff
@@ -14,6 +14,10 @@ with preprocessed source if appropriate.
[2] https://buildd.debian.org/status/fetch.php?pkg=qt4-x11&arch=powerpc&ver=4%3A4.7.2-4&stamp=1304320067
+---
+ tools/designer/src/components/signalsloteditor/signalsloteditor.pri | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
--- a/tools/designer/src/components/signalsloteditor/signalsloteditor.pri
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditor.pri
@@ -19,3 +19,10 @@ SOURCES += $$PWD/signalslot_utils.cpp \
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index 214efa3..3fc55c9 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -5,6 +5,10 @@ Forwarded: no
Origin: vendor
Last-Update: 2011-04-27
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/configure
+++ b/configure
@@ -3013,7 +3013,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
diff --git a/debian/patches/qtdebug_syslog.patch b/debian/patches/qtdebug_syslog.patch
index 320ad8c..a35a2d2 100644
--- a/debian/patches/qtdebug_syslog.patch
+++ b/debian/patches/qtdebug_syslog.patch
@@ -1,6 +1,11 @@
Description: send Q_ASSERT, qDebug, qWarning and qFatal messages to syslog
Forwarded: not-needed
Author: Thiago Macieira <thiago at kde.org>
+---
+ src/corelib/global/qglobal.cpp | 24 ++++++++++++++++++++++++
+ src/corelib/kernel/qcoreapplication_p.h | 2 ++
+ 2 files changed, 26 insertions(+)
+
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -50,6 +50,7 @@
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 484faad..5032cee 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -5,6 +5,10 @@ Forwarded: no
Origin: vendor
Last-Update: 2011-04-27
+---
+ configure | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
--- a/configure
+++ b/configure
@@ -3053,6 +3053,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list