rev 12203 - in trunk/packages/qt4-x11/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Thu Sep 18 21:30:05 UTC 2008


Author: fabo
Date: 2008-09-18 21:30:04 +0000 (Thu, 18 Sep 2008)
New Revision: 12203

Added:
   trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
   trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff
   trunk/packages/qt4-x11/debian/patches/30_webkit_unaligned_access.diff
Removed:
   trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.diff
   trunk/packages/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff
   trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff
   trunk/packages/qt4-x11/debian/patches/0232-fix-qdesktopwidget-screen-merge.diff
   trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff
   trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff
   trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff
   trunk/packages/qt4-x11/debian/patches/0241-fix-null-stylesheet-warning.diff
   trunk/packages/qt4-x11/debian/patches/30_webkit-unaligned-access.patch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
   trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
   trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
   trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
   trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff
   trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
   trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
   trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff
   trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
   trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff
   trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
   trunk/packages/qt4-x11/debian/patches/series
Log:
  * Refresh Qt4 patches.
  * Remove upstream patches:
    - 0002_https_lowercase.diff
  * Remove Debian patches:
    - 72_generic_arch_atomic_header_fix.diff
  * Sync qt-copy patches:
    * Add:
      - 0245-fix-randr-changes-detecting.diff
      - 0248-fix-qwidget-scroll-slowness.diff
    * Remove:
      - 0214-fix-qgraphicsproxywidget-tab-crash.diff
      - 0230-qtextcontrol-selectnextword.diff
      - 0232-fix-qdesktopwidget-screen-merge.diff
      - 0233-fix-q3textbrowser-image.diff
      - 0235-qdbus-dispatch-async-timeout.diff
      - 0236-qtoolbararealayout-restore.diff
      - 0241-fix-null-stylesheet-warning.diff


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/changelog	2008-09-18 21:30:04 UTC (rev 12203)
@@ -2,6 +2,25 @@
 
   * New upstream release.
 
+  +++ Changes by Fathi Boudra:
+
+  * Remove upstream patches:
+    - 0002_https_lowercase.diff
+  * Remove Debian patches:
+    - 72_generic_arch_atomic_header_fix.diff
+  * Sync qt-copy patches:
+    * Add:
+      - 0245-fix-randr-changes-detecting.diff
+      - 0248-fix-qwidget-scroll-slowness.diff
+    * Remove:
+      - 0214-fix-qgraphicsproxywidget-tab-crash.diff
+      - 0230-qtextcontrol-selectnextword.diff
+      - 0232-fix-qdesktopwidget-screen-merge.diff
+      - 0233-fix-q3textbrowser-image.diff
+      - 0235-qdbus-dispatch-async-timeout.diff
+      - 0236-qtoolbararealayout-restore.diff
+      - 0241-fix-null-stylesheet-warning.diff
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 18 Sep 2008 18:22:04 +0200
 
 qt4-x11 (4.4.1-1) experimental; urgency=low

Deleted: trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.diff

Modified: trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -9,7 +9,7 @@
 
 --- a/src/corelib/io/qfsfileengine_unix.cpp
 +++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -835,9 +835,13 @@
+@@ -857,9 +857,13 @@
          size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
          if (size_max == -1)
              size_max = 1024;

Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -14,7 +14,7 @@
 
 --- a/src/corelib/kernel/qobject.cpp
 +++ b/src/corelib/kernel/qobject.cpp
-@@ -1016,9 +1016,18 @@
+@@ -1037,9 +1037,18 @@
  {
      Q_D(QObject);
      d->objectName = name;
@@ -47,7 +47,7 @@
      struct Connection
 --- a/src/gui/kernel/qwidget_p.h
 +++ b/src/gui/kernel/qwidget_p.h
-@@ -331,6 +331,7 @@
+@@ -333,6 +333,7 @@
  
  #if defined(Q_WS_X11)
      void setWindowRole();
@@ -81,7 +81,7 @@
          }
  
          // set client leader property
-@@ -2686,6 +2690,17 @@
+@@ -2719,6 +2723,17 @@
                      (unsigned char *)windowRole.constData(), windowRole.length());
  }
  

Modified: trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -7,7 +7,7 @@
 
 --- a/src/gui/text/qtexthtmlparser.cpp
 +++ b/src/gui/text/qtexthtmlparser.cpp
-@@ -1053,7 +1053,7 @@
+@@ -1056,7 +1056,7 @@
                      && !attributes.at(i + 1).isEmpty()) {
                      hasHref = true;
                      charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);

Deleted: trunk/packages/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff

Modified: trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -24,7 +24,7 @@
 
 --- a/configure
 +++ b/configure
-@@ -832,6 +832,11 @@
+@@ -833,6 +833,11 @@
              VAL=`echo $1 | sed 's,-D,,'`
          fi
          ;;
@@ -36,7 +36,7 @@
      -I?*|-I)
          VAR="add_ipath"
          if [ "$1" = "-I" ]; then
-@@ -1739,6 +1744,9 @@
+@@ -1740,6 +1745,9 @@
      add_ipath)
          I_FLAGS="$I_FLAGS -I\"${VAL}\""
          ;;

Modified: trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -16,7 +16,7 @@
 
 --- a/src/gui/image/qpixmap_x11.cpp
 +++ b/src/gui/image/qpixmap_x11.cpp
-@@ -1107,7 +1107,26 @@
+@@ -1121,7 +1121,26 @@
  {
      if (fillColor.alpha() != 255) {
  #ifndef QT_NO_XRENDER

Modified: trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -28,7 +28,7 @@
  #endif // QT_NO_TREEVIEW
 --- a/src/gui/itemviews/qtreeview.cpp
 +++ b/src/gui/itemviews/qtreeview.cpp
-@@ -246,6 +246,19 @@
+@@ -248,6 +248,19 @@
  
      connect(d->model, SIGNAL(modelAboutToBeReset()), SLOT(_q_modelAboutToBeReset()));
  
@@ -48,7 +48,7 @@
      if (d->sortingEnabled)
          sortByColumn(header()->sortIndicatorSection());
  }
-@@ -2797,6 +2810,8 @@
+@@ -2815,6 +2828,8 @@
      }
      if (model->canFetchMore(index))
          model->fetchMore(index);
@@ -57,7 +57,7 @@
  }
  
  void QTreeViewPrivate::collapse(int item, bool emitSignal)
-@@ -2836,6 +2851,8 @@
+@@ -2854,6 +2869,8 @@
          else
              emit q->collapsed(modelIndex);
      }
@@ -66,7 +66,7 @@
  }
  
  void QTreeViewPrivate::prepareAnimatedOperation(int item, AnimatedOperation::Type type)
-@@ -2947,6 +2964,25 @@
+@@ -2965,6 +2982,25 @@
      viewItems.clear();
  }
  

Deleted: trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff

Deleted: trunk/packages/qt4-x11/debian/patches/0232-fix-qdesktopwidget-screen-merge.diff

Deleted: trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff

Modified: trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -9,7 +9,7 @@
 
 --- a/src/sql/drivers/mysql/qsql_mysql.cpp
 +++ b/src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -1215,6 +1215,10 @@
+@@ -1248,6 +1248,10 @@
      d->preparedQuerysEnabled = false;
  #endif
  
@@ -20,7 +20,7 @@
      setOpen(true);
      setOpenError(false);
      return true;
-@@ -1223,6 +1227,9 @@
+@@ -1256,6 +1260,9 @@
  void QMYSQLDriver::close()
  {
      if (isOpen()) {

Deleted: trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff

Deleted: trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff

Modified: trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -1,5 +1,5 @@
 qt-bugs@ issue : N216195
-Trolltech task ID : 216537
+Trolltech task ID : 216537 (Applied in Qt 4.5)
 bugs.kde.org number : 162737
 applied: no
 author: Michael Leupold <lemma at confuego.org>

Deleted: trunk/packages/qt4-x11/debian/patches/0241-fix-null-stylesheet-warning.diff

Added: trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -0,0 +1,25 @@
+qt-bugs@ issue : none yet
+Trolltech task ID : none yet
+bugs.kde.org number : ?
+applied: no
+author: Lubos Lunak <l.lunak at kde.org>
+
+Fix QDesktopWidget not detecting some changes in multiscreen setups
+(e.g. two screens 1280x1024, one of them switching to smaller size).
+
+--- a/src/gui/kernel/qapplication_x11.cpp
++++ b/src/gui/kernel/qapplication_x11.cpp
+@@ -3000,11 +3000,11 @@
+         QSize oldSize(w->size());
+         w->data->crect.setWidth(DisplayWidth(X11->display, scr));
+         w->data->crect.setHeight(DisplayHeight(X11->display, scr));
+-        if (w->size() != oldSize) {
++//        if (w->size() != oldSize) {
+             QResizeEvent e(w->size(), oldSize);
+             QApplication::sendEvent(w, &e);
+             emit desktop()->resized(scr);
+-        }
++//        }
+     }
+ #endif // QT_NO_XRANDR
+ 

Added: trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -0,0 +1,39 @@
+qt-bugs@ issue : none yet
+Trolltech task ID : none yet
+bugs.kde.org number : 167739
+applied: no
+author: Germain Garand <germain at ebooksfrance.org>
+
+QWidgetPrivate::scrollRect doesn't account for it's rect argument
+but rather examine the whole widget surface when pondering if
+it can apply accelerated blitting, resulting in unnecessarily slow 
+and non-blitting QWidget::scroll calls.
+
+--- a/src/gui/painting/qbackingstore.cpp
++++ b/src/gui/painting/qbackingstore.cpp
+@@ -523,7 +523,8 @@
+     }
+ 
+     bool overlapped = false;
+-    bool accelerateScroll = accelEnv &&  isOpaque() && !(overlapped = isOverlapped(data.crect));
++    QRect cRect = clipRect();
++    bool accelerateScroll = accelEnv &&  isOpaque() && !(overlapped = isOverlapped(rect & cRect));
+ 
+ #if defined(Q_WS_QWS)
+     QWSWindowSurface *surface;
+@@ -558,13 +559,13 @@
+ #ifdef Q_WS_QWS
+         QWSWindowSurface *surface = static_cast<QWSWindowSurface*>(wbs->windowSurface);
+         const QRegion clip = surface->clipRegion().translated(-toplevelOffset)
+-                             & clipRect();
++                             & cRect;
+         const QRect scrollRect = rect & clip.boundingRect();
+         const QRect destRect = scrollRect.translated(dx, dy)
+                                & scrollRect
+                                &  clip.boundingRect();
+ #else
+-        QRect scrollRect = rect & clipRect();
++        QRect scrollRect = rect & cRect;
+ 
+         QRect destRect = scrollRect.isValid() ? scrollRect.translated(dx,dy).intersected(scrollRect) : QRect();
+ 

Modified: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -66,7 +66,7 @@
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -6058,8 +6058,8 @@
+@@ -6071,8 +6071,8 @@
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -6360,11 +6360,11 @@
+@@ -6373,11 +6373,11 @@
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
  fi
  
  # .projects      -> projects to process
-@@ -6537,7 +6537,7 @@
+@@ -6550,7 +6550,7 @@
              echo "  for $a\c"
          fi
  

Modified: trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -56,11 +56,3 @@
  
  win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) {
  	!win32-borland:LIBS *= -lgds32_ms
---- a/config.tests/unix/sqlite/sqlite.pro
-+++ b/config.tests/unix/sqlite/sqlite.pro
-@@ -1,4 +1,4 @@
- SOURCES = sqlite.cpp
- CONFIG -= qt dylib
- mac:CONFIG -= app_bundle
--LIBS += -lsqlite3
-+LIBS += -lsqlite3 -ldl

Deleted: trunk/packages/qt4-x11/debian/patches/30_webkit-unaligned-access.patch

Added: trunk/packages/qt4-x11/debian/patches/30_webkit_unaligned_access.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/30_webkit_unaligned_access.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/30_webkit_unaligned_access.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -0,0 +1,140 @@
+From: Mike Hommey <glandium at debian.org>
+Date: Sun, 6 Jul 2008 08:37:28 +0000 (+0200)
+Subject: Fixed some alignment problems on sparc
+X-Git-Tag: debian/1.0.1-1~7
+X-Git-Url: http://git.debian.org/?p=pkg-webkit%2Fwebkit.git;a=commitdiff_plain;h=11c220f6d31898a7a1dfafd5d96619fefe6ba597;hp=1db04c3a5c8c3e9c990b93836d5bb09d43a47921
+
+Fixed some alignment problems on sparc
+
+(and some that might occur on arm, too).
+
+Some compiler warnings about alignment remain, but I don't know if they are
+a real problem yet.
+---
+
+--- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
++++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
+@@ -1267,14 +1267,14 @@
+ 
+ // 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
+@@ -122,7 +122,7 @@
+             : m_freeList(pool())
+             , m_isDoneWithInitialFreeList(false)
+         { 
+-            memset(m_pool.pool, 0, sizeof(m_pool.pool));
++            memset(m_pool, 0, sizeof(m_pool));
+         }
+ 
+         Node* allocate()
+@@ -166,7 +166,7 @@
+         }
+ 
+     private:
+-        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
++        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
+         Node* pastPool() { return pool() + m_poolSize; }
+ 
+         bool inPool(Node* node)
+@@ -177,10 +177,7 @@
+         Node* m_freeList;
+         bool m_isDoneWithInitialFreeList;
+         static const size_t m_poolSize = 256;
+-        union {
+-            char pool[sizeof(Node) * m_poolSize];
+-            double forAlignment;
+-        } m_pool;
++        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
+     };
+ 
+     template<typename ValueArg> struct ListHashSetNode {
+--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+@@ -167,6 +167,23 @@
+ #define WTF_PLATFORM_X86_64 1
+ #endif
+ 
++/* PLATFORM(SPARC) */
++#if   defined(__sparc__) \
++   || defined(__sparc)
++#define WTF_PLATFORM_SPARC 1
++#define WTF_PLATFORM_BIG_ENDIAN 1
++#endif
++
++/* For undefined platforms */
++#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
++#include <sys/param.h>
++#if __BYTE_ORDER == __BIG_ENDIAN
++#define WTF_PLATFORM_BIG_ENDIAN 1
++#elif  __BYTE_ORDER == __PDP_ENDIAN
++#define WTF_PLATFORM_MIDDLE_ENDIAN 1
++#endif
++#endif
++
+ /* Compiler */
+ 
+ /* COMPILER(MSVC) */
+--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
++++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
+@@ -355,8 +355,7 @@
+         static const size_t m_inlineBufferSize = inlineCapacity * sizeof(T);
+         T* inlineBuffer() { return reinterpret_cast<T*>(&m_inlineBuffer); }
+ 
+-        // FIXME: Nothing guarantees this buffer is appropriately aligned to hold objects of type T.
+-        char m_inlineBuffer[m_inlineBufferSize];
++        uint64_t m_inlineBuffer[(m_inlineBufferSize + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
+     };
+ 
+     template<typename T, size_t inlineCapacity = 0>
+--- a/src/3rdparty/webkit/WebCore/platform/AtomicString.cpp
++++ b/src/3rdparty/webkit/WebCore/platform/AtomicString.cpp
+@@ -104,7 +104,7 @@
+         if (strLength != bufLength)
+             return false;
+ 
+-#if PLATFORM(ARM)
++#if PLATFORM(ARM) || PLATFORM(SPARC)
+         const UChar* strChars = str->characters();
+         const UChar* bufChars = buf.s;
+ 
+--- a/src/3rdparty/webkit/WebCore/platform/StringHash.h
++++ b/src/3rdparty/webkit/WebCore/platform/StringHash.h
+@@ -44,6 +44,15 @@
+             if (aLength != bLength)
+                 return false;
+ 
++#if PLATFORM(ARM) || PLATFORM(SPARC)
++            const UChar* aChars = a->characters();
++            const UChar* bChars = b->characters();
++            for (unsigned i = 0; i != aLength; ++i)
++                if (*aChars++ != *bChars++)
++                    return false;
++
++            return true;
++#else
+             const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters());
+             const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters());
+ 
+@@ -56,6 +65,7 @@
+                 return false;
+ 
+             return true;
++#endif
+         }
+     };
+     

Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff	2008-09-18 21:30:04 UTC (rev 12203)
@@ -28,9 +28,9 @@
  #elif defined(__QNXNTO__)
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -289,13 +289,13 @@
+@@ -292,13 +292,13 @@
  
- #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(QT_NO_PLUGIN_CHECK)
  
 -#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
 +#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
@@ -55,7 +55,7 @@
  #    include <fenv.h>
  #endif
  
-@@ -6258,7 +6258,7 @@
+@@ -6259,7 +6259,7 @@
      _control87(MCW_EM, MCW_EM);
  #endif
  
@@ -64,7 +64,7 @@
      fenv_t envp;
      feholdexcept(&envp);
  #endif
-@@ -6274,7 +6274,7 @@
+@@ -6275,7 +6275,7 @@
  #endif //_M_X64
  #endif //Q_OS_WIN
  

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-09-18 21:03:01 UTC (rev 12202)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-09-18 21:30:04 UTC (rev 12203)
@@ -1,25 +1,17 @@
-# patches from upstream
-0002_https_lowercase.diff
-
 # qt-copy patches
 0167-fix-group-reading.diff
 0180-window-role.diff
 0195-compositing-properties.diff
 0203-qtexthtmlparser-link-color.diff
 0209-prevent-qt-mixing.diff
-0214-fix-qgraphicsproxywidget-tab-crash.diff
 0216-allow-isystem-for-headers.diff
 0224-fast-qpixmap-fill.diff
 0225-invalidate-tabbar-geometry-on-refresh.patch
 0226-qtreeview-column_resize_when_needed.diff
-0230-qtextcontrol-selectnextword.diff
-0232-fix-qdesktopwidget-screen-merge.diff
-0233-fix-q3textbrowser-image.diff
 0234-fix-mysql-threaded.diff
-0235-qdbus-dispatch-async-timeout.diff
-0236-qtoolbararealayout-restore.diff
 0238-fix-qt-qttabbar-size.diff
-0241-fix-null-stylesheet-warning.diff
+0245-fix-randr-changes-detecting.diff
+0248-fix-qwidget-scroll-slowness.diff
 
 # debian patches
 01_qmake_for_debian.diff
@@ -35,13 +27,12 @@
 15_fix_qmake_makefile_generation.diff
 16_hide_std_symbols_on_qtwebkit.diff
 20_mips_atomic_ops.diff
-30_webkit-unaligned-access.patch
+30_webkit_unaligned_access.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff
 50_kfreebsd_build_fix.diff
 60_m68k_inotify_fix.diff
 70_hppa_ldcw_fix.diff
 71_hppa_unaligned_access_fix_458133.diff
-72_generic_arch_atomic_header_fix.diff
 80_hurd_max_path.diff
 81_hurd_more_max_path.diff




More information about the pkg-kde-commits mailing list