[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-31-gbe474c3

Fathi Boudra fabo at alioth.debian.org
Tue Dec 27 16:43:27 UTC 2011 

The following commit has been merged in the experimental branch:
commit 3c528286c0349eceeb33558e7c5734f89895c764
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Dec 27 18:08:43 2011 +0200

    Refresh patches for Qt 4.8.0
---
 debian/patches/0195-compositing-properties.diff    |    6 +-
 debian/patches/01_debian_append_qt4_suffix.diff    |   55 +++++++---------
 ...cqt_sane_timestamp_for_nonexisting_headers.diff |    2 +-
 debian/patches/08_configure_quilt_compat.diff      |    2 +-
 .../patches/12_add_nostrip_for_debug_packages.diff |    2 +-
 .../patches/15_fix_qmake_makefile_generation.diff  |    2 +-
 .../patches/16_hide_std_symbols_on_qtwebkit.diff   |   27 ++++----
 .../18_enable_qt3support_qtwebkit_debug_info.diff  |   26 +++++--
 debian/patches/20_install_qvfb.diff                |    2 +-
 .../23_permit_plugins_built_with_future_qt.diff    |    2 +-
 debian/patches/30_webkit_unaligned_access.diff     |   71 +++-----------------
 debian/patches/40_alpha_ice.diff                   |    2 +-
 debian/patches/41_disable_opengl_visibility.diff   |    2 +-
 debian/patches/50_kfreebsd_Q_OS.diff               |    2 +-
 debian/patches/51_kfreebsd_strnstr_build_fix.diff  |    8 +-
 debian/patches/92_armel_gcc43_valist_compat.diff   |    2 +-
 debian/patches/96_webkit_no_gc_sections.diff       |   14 ++--
 ..._support_for_QT_USE_DRAG_DISTANCE_env_var.patch |    2 +-
 debian/patches/powerpcspe.diff                     |    2 +-
 debian/patches/qtdebug_syslog.patch                |    4 +-
 debian/patches/sh.diff                             |    2 +-
 21 files changed, 95 insertions(+), 142 deletions(-)

diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index 4de741b..c823bbd 100644
--- a/debian/patches/0195-compositing-properties.diff
+++ b/debian/patches/0195-compositing-properties.diff
@@ -13,7 +13,7 @@ bugs.kde.org number : none
 
 --- a/src/gui/kernel/qwidget_x11.cpp
 +++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -764,6 +764,11 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -768,6 +768,11 @@ void QWidgetPrivate::create_sys(WId wind
          Q_ASSERT(id);
          XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                  &wsa);
@@ -25,7 +25,7 @@ bugs.kde.org number : none
      } else if (topLevel && !desktop) {        // top-level widget
          if (!X11->wm_client_leader)
              create_wm_client_leader();
-@@ -817,13 +822,21 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -821,13 +826,21 @@ void QWidgetPrivate::create_sys(WId wind
          // set EWMH window types
          setNetWmWindowTypes();
  
@@ -49,7 +49,7 @@ bugs.kde.org number : none
  
          // declare the widget's window role
          if (QTLWExtra *topData = maybeTopData()) {
-@@ -839,10 +852,6 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -843,10 +856,6 @@ void QWidgetPrivate::create_sys(WId wind
          XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                          XA_WINDOW, 32, PropModeReplace,
                          (unsigned char *)&X11->wm_client_leader, 1);
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index 6548737..5693c71 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -4,7 +4,7 @@ Description: Append a -qt4 suffix to some tools.
  To allow co-installation of the development tools of Qt4 with the Qt3 ones,
  we append a -qt4 suffix to the executable names of some development tools:
  assistant, designer, linguist, lrelease, lupdate, moc, qmake, qtconfig, uic.
-Last-Update: 2011-03-03
+Last-Update: 2011-12-25
 Forwarded: not-needed
 
 ---
@@ -31,9 +31,8 @@ Forwarded: not-needed
  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(-)
+ translations/translations.pro                     |    6 +++---
+ 25 files changed, 37 insertions(+), 37 deletions(-)
 
 --- a/config.tests/unix/compile.test
 +++ b/config.tests/unix/compile.test
@@ -92,7 +91,7 @@ Forwarded: not-needed
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -4568,7 +4568,7 @@ END {
+@@ -4816,7 +4816,7 @@ END {
  }
  
  # build qmake
@@ -101,7 +100,7 @@ Forwarded: not-needed
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -7996,8 +7996,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -8515,8 +8515,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -112,7 +111,7 @@ Forwarded: not-needed
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -8400,11 +8400,11 @@ EXEC=""
+@@ -8919,11 +8919,11 @@ EXEC=""
  
  echo "Finding project files. Please wait..."
  if [ "$CFG_NOPROCESS" != "yes" ]; then
@@ -126,7 +125,7 @@ Forwarded: not-needed
      fi
  fi
  
-@@ -8591,7 +8591,7 @@ for file in .projects .projects.3; do
+@@ -9114,7 +9114,7 @@ for file in .projects .projects.3; do
          QMAKE_SPEC_ARGS="-spec $SPEC"
          echo $ECHO_N "  for $a$ECHO_C"
  
@@ -137,7 +136,7 @@ Forwarded: not-needed
              echo " (fast)"
 --- a/projects.pro
 +++ b/projects.pro
-@@ -148,7 +148,7 @@ qmake.path=$$[QT_INSTALL_BINS]
+@@ -144,7 +144,7 @@ qmake.path=$$[QT_INSTALL_BINS]
  win32 {
     qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
  } else {
@@ -148,7 +147,7 @@ Forwarded: not-needed
  
 --- a/qmake/Makefile.unix
 +++ b/qmake/Makefile.unix
-@@ -75,17 +75,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators
+@@ -86,17 +86,17 @@ CPPFLAGS = -g -I. -Igenerators -Igenerat
  
  CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
  
@@ -241,35 +240,29 @@ Forwarded: not-needed
      static:CONFIG -= global_init_link_order
 --- a/tools/qtconfig/qtconfig.pro
 +++ b/tools/qtconfig/qtconfig.pro
-@@ -22,7 +22,7 @@ FORMS        = mainwindowbase.ui palette
+@@ -19,7 +19,7 @@ FORMS        = mainwindow.ui paletteedit
  RESOURCES    = qtconfig.qrc
  
  PROJECTNAME        = Qt Configuration
--TARGET                = qtconfig
-+TARGET                = qtconfig-qt4
- DESTDIR                = ../../bin
+-TARGET             = qtconfig
++TARGET             = qtconfig-qt4
+ DESTDIR            = ../../bin
  
  target.path=$$[QT_INSTALL_BINS]
---- a/translations/translations.pri
-+++ b/translations/translations.pri
-@@ -1,5 +1,5 @@
- qtPrepareTool(LCONVERT, lconvert)
--qtPrepareTool(LUPDATE, lupdate)
-+qtPrepareTool(LUPDATE, lupdate-qt4)
- LUPDATE += -locations relative -no-ui-lines
- 
- TS_TARGETS =
 --- a/translations/translations.pro
 +++ b/translations/translations.pro
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,8 @@
  TRANSLATIONS = $$files(*.ts)
  
 -qtPrepareTool(LRELEASE, lrelease)
 +qtPrepareTool(LRELEASE, lrelease-qt4)
+ qtPrepareTool(LCONVERT, lconvert)
+-qtPrepareTool(LUPDATE, lupdate)
++qtPrepareTool(LUPDATE, lupdate-qt4)
+ LUPDATE += -locations relative -no-ui-lines
  
- contains(TEMPLATE_PREFIX, vc):vcproj = 1
- 
-@@ -15,7 +15,7 @@ updateqm.input = TRANSLATIONS
+ TS_TARGETS =
+@@ -96,7 +96,7 @@ updateqm.input = TRANSLATIONS
  updateqm.output = ${QMAKE_FILE_BASE}.qm
  isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS
  updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
@@ -300,9 +293,9 @@ Forwarded: not-needed
  isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR
 --- a/mkspecs/common/linux.conf
 +++ b/mkspecs/common/linux.conf
-@@ -35,8 +35,8 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
- QMAKE_LIBS_OPENVG     = -lOpenVG
- QMAKE_LIBS_THREAD     = -lpthread
+@@ -41,8 +41,8 @@ QMAKE_LIBS_WAYLAND =
+ QMAKE_LIBDIR_WAYLAND =
+ QMAKE_DEFINES_WAYLAND =
  
 -QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
 -QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
@@ -335,7 +328,7 @@ Forwarded: not-needed
  #endif
 --- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
 +++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -668,7 +668,7 @@ namespace qdesigner_internal
+@@ -782,7 +782,7 @@ namespace qdesigner_internal
          binary += QDir::separator();
          switch (mode) {
          case UIC_GenerateCode:
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 3c4c5dd..359dc52 100644
--- a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
+++ b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
@@ -15,7 +15,7 @@ GMT.) for the symlink, just use current time().
 
 --- a/bin/syncqt
 +++ b/bin/syncqt
-@@ -831,7 +831,7 @@ foreach my $lib (@modules_to_sync) {
+@@ -848,7 +848,7 @@ foreach my $lib (@modules_to_sync) {
                              print "SYMBOL: $_
";
                          }
                      } else {
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 047ec17..a7370a3 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -7,7 +7,7 @@ It breaks qmake projects search.
 
 --- a/configure
 +++ b/configure
-@@ -8457,7 +8457,7 @@ fi
+@@ -8976,7 +8976,7 @@ fi
  # .projects.3    -> the rest
  rm -f .projects .projects.1 .projects.2 .projects.3
  
diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff
index 23f2d52..6ffecc8 100644
--- a/debian/patches/12_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/12_add_nostrip_for_debug_packages.diff
@@ -10,7 +10,7 @@ let dh_strip do it to generate debug packages.
 
 --- a/configure
 +++ b/configure
-@@ -627,6 +627,8 @@ mkdir -p "$outpath/config.tests"
+@@ -674,6 +674,8 @@ mkdir -p "$outpath/config.tests"
  rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  
diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff
index 9860128..ed3997f 100644
--- a/debian/patches/15_fix_qmake_makefile_generation.diff
+++ b/debian/patches/15_fix_qmake_makefile_generation.diff
@@ -7,7 +7,7 @@ Author: Sune Vuorela <debian at pusling.com>
 
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -2434,7 +2434,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2447,7 +2447,7 @@ MakefileGenerator::writeSubTargets(QText
  
          QString mkfile = subtarget->makefile;
          if(!in_directory.isEmpty())
diff --git a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
index 42d38e9..d13947b 100644
--- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
+++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
@@ -3,22 +3,23 @@ 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(+)
+ src/3rdparty/webkit/Source/WebKit.pri     |    2 ++
+ src/3rdparty/webkit/Source/symbols.filter |    5 +++++
+ 2 files changed, 7 insertions(+)
 
---- a/src/3rdparty/webkit/WebKit.pri
-+++ b/src/3rdparty/webkit/WebKit.pri
-@@ -54,6 +54,7 @@ symbian {
- } else {
-     INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
- }
-+QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
- 
+--- a/src/3rdparty/webkit/Source/WebKit.pri
++++ b/src/3rdparty/webkit/Source/WebKit.pri
+@@ -100,6 +100,8 @@ win32-g++* {
  CONFIG -= warn_on
- *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
+ *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
+ 
++*-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter
++
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+     isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
 --- /dev/null
-+++ b/src/3rdparty/webkit/symbols.filter
++++ b/src/3rdparty/webkit/Source/symbols.filter
 @@ -0,0 +1,5 @@
 +{
 +local:
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index 75983d2..e02cb7c 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -4,13 +4,25 @@ 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(-)
+ src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro |    2 --
+ src/3rdparty/webkit/Source/WebCore/WebCore.pri               |    2 --
+ src/qt3support/qt3support.pro                                |    3 ---
+ 3 files changed, 7 deletions(-)
 
---- a/src/3rdparty/webkit/WebCore/WebCore.pro
-+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -2953,8 +2953,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro
+@@ -24,8 +24,6 @@ unix:contains(QT_CONFIG, reduce_relocati
+ 
+ CONFIG(QTDIR_build) {
+     # Remove the following 2 lines if you want debug information in JavaScriptCore
+-    CONFIG -= separate_debug_info
+-    CONFIG += no_debug_info
+ }
+ 
+ *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri
++++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
+@@ -273,8 +273,6 @@ contains(DEFINES, ENABLE_WEBGL=1)|contai
  
  !CONFIG(webkit-debug):CONFIG(QTDIR_build) {
      # Remove the following 2 lines if you want debug information in WebCore
@@ -18,7 +30,7 @@ This patch enable them.
 -    CONFIG += no_debug_info
  }
  
- win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
+ contains (CONFIG, text_breaking_with_icu) {
 --- a/src/qt3support/qt3support.pro
 +++ b/src/qt3support/qt3support.pro
 @@ -34,6 +34,3 @@ MOCDIR = .moc
diff --git a/debian/patches/20_install_qvfb.diff b/debian/patches/20_install_qvfb.diff
index aee48c3..1b0f0e8 100644
--- a/debian/patches/20_install_qvfb.diff
+++ b/debian/patches/20_install_qvfb.diff
@@ -7,7 +7,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/tools/tools.pro
 +++ b/tools/tools.pro
-@@ -41,6 +41,8 @@ embedded: SUBDIRS += makeqpf
+@@ -44,6 +44,8 @@ embedded: SUBDIRS += makeqpf
  
  !wince*:!cross_compile:SUBDIRS += qdoc3
  
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 4bc82d7..98cff93 100644
--- a/debian/patches/23_permit_plugins_built_with_future_qt.diff
+++ b/debian/patches/23_permit_plugins_built_with_future_qt.diff
@@ -27,7 +27,7 @@ installability and expand of forward binary compatibility beyond the same Qt
 
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -737,7 +737,7 @@ bool QLibraryPrivate::isPlugin(QSettings
+@@ -831,7 +831,7 @@ bool QLibraryPrivate::isPlugin(QSettings
  
      pluginState = IsNotAPlugin; // be pessimistic
  
diff --git a/debian/patches/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff
index fce3988..0efd834 100644
--- a/debian/patches/30_webkit_unaligned_access.diff
+++ b/debian/patches/30_webkit_unaligned_access.diff
@@ -11,35 +11,12 @@ Fixed some alignment problems on sparc
 Some compiler warnings about alignment remain, but I don't know if they are
 a real problem yet.
 ---
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/ListHashSet.h |    9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
 
----
- 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
- 
- // Page-level allocator
- static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
--static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
-+static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
- static bool phinited = false;
- 
- // Avoid extra level of indirection by making "pageheap" be just an alias
- // of pageheap_memory.
- typedef union {
--    void* m_memory;
-+    uint64_t* m_memory;
-     TCMalloc_PageHeap* m_pageHeap;
- } PageHeapUnion;
- 
---- a/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
-+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@ namespace WTF {
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ListHashSet.h
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ListHashSet.h
+@@ -145,7 +145,7 @@ namespace WTF {
              : m_freeList(pool())
              , m_isDoneWithInitialFreeList(false)
          { 
@@ -48,16 +25,16 @@ a real problem yet.
          }
  
          Node* allocate()
-@@ -171,7 +171,7 @@ namespace WTF {
+@@ -189,7 +189,7 @@ namespace WTF {
          }
  
      private:
--        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
+-        Node* pool() { return reinterpret_cast_ptr<Node*>(m_pool.pool); }
++        Node* pool() { return reinterpret_cast_ptr<Node*>(m_pool); }
          Node* pastPool() { return pool() + m_poolSize; }
  
          bool inPool(Node* node)
-@@ -182,10 +182,7 @@ namespace WTF {
+@@ -200,10 +200,7 @@ namespace WTF {
          Node* m_freeList;
          bool m_isDoneWithInitialFreeList;
          static const size_t m_poolSize = inlineCapacity;
@@ -69,33 +46,3 @@ a real problem yet.
      };
  
      template<typename ValueArg, size_t inlineCapacity> struct ListHashSetNode {
---- a/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
-+++ b/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
-@@ -105,7 +105,7 @@ static inline bool equal(StringImpl* str
- 
-     // FIXME: perhaps we should have a more abstract macro that indicates when
-     // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
---- a/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
-+++ b/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
-@@ -54,13 +54,13 @@ namespace WebCore {
- 
-             // FIXME: perhaps we should have a more abstract macro that indicates when
-             // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
-             const UChar* aChars = a->characters();
-             const UChar* bChars = b->characters();
--            for (unsigned i = 0; i != aLength; ++i) {
-+            for (unsigned i = 0; i != aLength; ++i)
-                 if (*aChars++ != *bChars++)
-                     return false;
--            }
-+
-             return true;
- #else
-             /* Do it 4-bytes-at-a-time on architectures where it's safe */
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index c29a1af..7301061 100644
--- a/debian/patches/40_alpha_ice.diff
+++ b/debian/patches/40_alpha_ice.diff
@@ -41,7 +41,7 @@ Author: Steve Langasek <vorlon at debian.org>
  {
 --- a/src/corelib/tools/qhash.h
 +++ b/src/corelib/tools/qhash.h
-@@ -521,7 +521,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
+@@ -523,7 +523,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
  }
  
  template <class Key, class T>
diff --git a/debian/patches/41_disable_opengl_visibility.diff b/debian/patches/41_disable_opengl_visibility.diff
index 327ab9e..5fddd38 100644
--- a/debian/patches/41_disable_opengl_visibility.diff
+++ b/debian/patches/41_disable_opengl_visibility.diff
@@ -6,7 +6,7 @@ temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
 
 --- a/src/opengl/opengl.pro
 +++ b/src/opengl/opengl.pro
-@@ -37,6 +37,7 @@ SOURCES	+= qgl.cpp \
+@@ -39,6 +39,7 @@ SOURCES += qgl.cpp \
             qglpaintdevice.cpp \
             qglbuffer.cpp \
  
diff --git a/debian/patches/50_kfreebsd_Q_OS.diff b/debian/patches/50_kfreebsd_Q_OS.diff
index 4a8db71..9baa414 100644
--- a/debian/patches/50_kfreebsd_Q_OS.diff
+++ b/debian/patches/50_kfreebsd_Q_OS.diff
@@ -8,7 +8,7 @@ Last-Update: 2010-10-06
 
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
-@@ -221,6 +221,8 @@ namespace QT_NAMESPACE {}
+@@ -226,6 +226,8 @@ namespace QT_NAMESPACE {}
  #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #  define Q_OS_FREEBSD
  #  define Q_OS_BSD4
diff --git a/debian/patches/51_kfreebsd_strnstr_build_fix.diff b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
index ea31b5c..506ec40 100644
--- a/debian/patches/51_kfreebsd_strnstr_build_fix.diff
+++ b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
@@ -4,12 +4,12 @@ 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 +-
+ src/3rdparty/webkit/Source/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 @@
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+@@ -423,7 +423,7 @@
  #endif
  
  /* OS(LINUX) - Linux */
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index f2f3b1a..ba62c17 100644
--- a/debian/patches/92_armel_gcc43_valist_compat.diff
+++ b/debian/patches/92_armel_gcc43_valist_compat.diff
@@ -20,7 +20,7 @@ Forward: not-needed
 
 --- a/src/corelib/tools/qstring.cpp
 +++ b/src/corelib/tools/qstring.cpp
-@@ -5466,6 +5466,11 @@ QString &QString::vsprintf(const char* c
+@@ -5554,6 +5554,11 @@ QString &QString::vsprintf(const char* c
      return *this;
  }
  
diff --git a/debian/patches/96_webkit_no_gc_sections.diff b/debian/patches/96_webkit_no_gc_sections.diff
index 29a73c5..f738da7 100644
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@ -8,17 +8,17 @@ Forwarded: no
 Last-Update: 2010-05-31 (mipsel added)
 
 ---
- src/3rdparty/webkit/WebCore/WebCore.pro |    2 +-
+ src/3rdparty/webkit/Source/WebCore/WebCore.pri |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/src/3rdparty/webkit/WebCore/WebCore.pro
-+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -89,7 +89,7 @@ unix {
+--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri
++++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
+@@ -324,7 +324,7 @@ mac {
  }
  
- unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
+ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
 -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):QMAKE_LFLAGS += -Wl,--gc-sections
++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--gc-sections
  linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  
- CONFIG(release):!CONFIG(standalone_package) {
+ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
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 33c8510..97df13c 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
@@ -8,7 +8,7 @@ Author: Joonas Tanskanen <joonas.tanskanen at sasken.com>
 
 --- a/src/gui/kernel/qapplication.cpp
 +++ b/src/gui/kernel/qapplication.cpp
-@@ -1021,6 +1021,11 @@ void QApplicationPrivate::initialize()
+@@ -1027,6 +1027,11 @@ void QApplicationPrivate::initialize()
      q->setAttribute(Qt::AA_S60DisablePartialScreenInputMode);
  #endif
  
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index 0c312d8..2d6e555 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -2985,7 +2985,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3148,7 +3148,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              CFG_HOST_ARCH=x86_64
          fi
          ;;
diff --git a/debian/patches/qtdebug_syslog.patch b/debian/patches/qtdebug_syslog.patch
index 761535d..8c349b6 100644
--- a/debian/patches/qtdebug_syslog.patch
+++ b/debian/patches/qtdebug_syslog.patch
@@ -25,7 +25,7 @@ Author: Thiago Macieira <thiago at kde.org>
  #endif
  
  QT_BEGIN_NAMESPACE
-@@ -2256,6 +2259,27 @@ void qt_message_output(QtMsgType msgType
+@@ -2217,6 +2220,27 @@ void qt_message_output(QtMsgType msgType
  #else
          fprintf(stderr, "%s
", buf);
          fflush(stderr);
@@ -55,7 +55,7 @@ Author: Thiago Macieira <thiago at kde.org>
  
 --- a/src/corelib/kernel/qcoreapplication_p.h
 +++ b/src/corelib/kernel/qcoreapplication_p.h
-@@ -85,6 +85,8 @@ public:
+@@ -86,6 +86,8 @@ public:
      bool sendThroughObjectEventFilters(QObject *, QEvent *);
      bool notify_helper(QObject *, QEvent *);
  
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 900f93e..520dae7 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3025,6 +3025,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3188,6 +3188,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              ;;
          esac
          ;;

-- 
Qt 4 packaging

More information about the pkg-kde-commits mailing list