[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-rc1-1-15-g059f3ec

Fathi Boudra fabo at alioth.debian.org
Tue Oct 12 10:48:36 UTC 2010 

The following commit has been merged in the experimental-snapshots branch:
commit 059f3ec66394998bc01e5c7534795892ec8c9cd9
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Oct 12 13:45:41 2010 +0300

    Refresh patches and fix to apply against Qt 4.7.1
---
 debian/patches/0180-window-role.diff            |    2 +-
 debian/patches/01_debian_append_qt4_suffix.diff |   22 ++++++++++------------
 debian/patches/30_webkit_unaligned_access.diff  |   12 ++++++------
 debian/patches/50_kfreebsd_Q_OS.diff            |    2 +-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index fb8ec1e..580dc27 100644
--- a/debian/patches/0180-window-role.diff
+++ b/debian/patches/0180-window-role.diff
@@ -86,7 +86,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
          }
  
          // set client leader property
-@@ -2939,6 +2943,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2941,6 +2945,17 @@ void QWidgetPrivate::setWindowRole()
      XChangeProperty(X11->display, q->internalWinId(),
                      ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
                      (unsigned char *)windowRole.constData(), windowRole.length());
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index 5d56a2d..8335680 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -64,7 +64,7 @@ Forwarded: not-needed
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -4474,7 +4474,7 @@ END {
+@@ -4582,7 +4582,7 @@ END {
  }
  
  # build qmake
@@ -73,7 +73,7 @@ Forwarded: not-needed
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -7759,8 +7759,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -8000,8 +8000,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
@@ -84,7 +84,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
-@@ -8150,11 +8150,11 @@ EXEC=""
+@@ -8397,11 +8397,11 @@ EXEC=""
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -98,7 +98,7 @@ Forwarded: not-needed
  fi
  
  # .projects      -> projects to process
-@@ -8331,7 +8331,7 @@ for file in .projects .projects.3; do
+@@ -8580,7 +8580,7 @@ for file in .projects .projects.3; do
          QMAKE_SPEC_ARGS="-spec $SPEC"
          echo $ECHO_N "  for $a$ECHO_C"
  
@@ -181,7 +181,7 @@ Forwarded: not-needed
 --- a/tools/assistant/tools/assistant/assistant.pro
 +++ b/tools/assistant/tools/assistant/assistant.pro
 @@ -1,7 +1,7 @@
- include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
+ include(../../../shared/fontpanel/fontpanel.pri)
  TEMPLATE = app
  LANGUAGE = C++
 -TARGET = assistant
@@ -198,8 +198,8 @@ Forwarded: not-needed
 -TARGET = designer
 +TARGET = designer-qt4
  
- include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
- include($$QT_SOURCE_TREE/tools/shared/qttoolbardialog/qttoolbardialog.pri)
+ include(../../../shared/fontpanel/fontpanel.pri)
+ include(../../../shared/qttoolbardialog/qttoolbardialog.pri)
 --- a/tools/linguist/linguist/linguist.pro
 +++ b/tools/linguist/linguist/linguist.pro
 @@ -69,7 +69,7 @@ HEADERS += \
@@ -224,15 +224,13 @@ Forwarded: not-needed
  target.path=$$[QT_INSTALL_BINS]
 --- a/translations/translations.pri
 +++ b/translations/translations.pri
-@@ -8,7 +8,7 @@ defineReplace(prependAll) {
-     return ($$result)
- }
- 
+@@ -1,5 +1,5 @@
+ qtPrepareTool(LCONVERT, lconvert)
 -qtPrepareTool(LUPDATE, lupdate)
 +qtPrepareTool(LUPDATE, lupdate-qt4)
  LUPDATE += -locations relative -no-ui-lines
  
- ###### Qt Libraries
+ TS_TARGETS =
 --- a/translations/translations.pro
 +++ b/translations/translations.pro
 @@ -1,6 +1,6 @@
diff --git a/debian/patches/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff
index 23eb4e3..6d74868 100644
--- a/debian/patches/30_webkit_unaligned_access.diff
+++ b/debian/patches/30_webkit_unaligned_access.diff
@@ -14,7 +14,7 @@ a real problem yet.
 
 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
 +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -2336,13 +2336,13 @@
+@@ -2336,13 +2336,13 @@ static TCMalloc_Central_FreeListPadded c
  
  // Page-level allocator
  static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
@@ -32,7 +32,7 @@ a real problem yet.
  
 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
 +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@
+@@ -127,7 +127,7 @@ namespace WTF {
              : m_freeList(pool())
              , m_isDoneWithInitialFreeList(false)
          { 
@@ -41,7 +41,7 @@ a real problem yet.
          }
  
          Node* allocate()
-@@ -171,7 +171,7 @@
+@@ -171,7 +171,7 @@ namespace WTF {
          }
  
      private:
@@ -50,7 +50,7 @@ a real problem yet.
          Node* pastPool() { return pool() + m_poolSize; }
  
          bool inPool(Node* node)
-@@ -182,10 +182,7 @@
+@@ -182,10 +182,7 @@ namespace WTF {
          Node* m_freeList;
          bool m_isDoneWithInitialFreeList;
          static const size_t m_poolSize = inlineCapacity;
@@ -64,7 +64,7 @@ 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 @@
+@@ -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
@@ -75,7 +75,7 @@ a real problem yet.
          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 @@
+@@ -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
diff --git a/debian/patches/50_kfreebsd_Q_OS.diff b/debian/patches/50_kfreebsd_Q_OS.diff
index 9fe7d7a..61f7f2d 100644
--- a/debian/patches/50_kfreebsd_Q_OS.diff
+++ b/debian/patches/50_kfreebsd_Q_OS.diff
@@ -4,7 +4,7 @@ Last-Update: 2010-10-06
 
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
-@@ -221,6 +221,8 @@
+@@ -221,6 +221,8 @@ namespace QT_NAMESPACE {}
  #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #  define Q_OS_FREEBSD
  #  define Q_OS_BSD4

-- 
Qt 4 packaging

More information about the pkg-kde-commits mailing list