rev 15033 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Mon Jun 29 13:53:01 UTC 2009
Author: fabo
Date: 2009-06-29 13:52:59 +0000 (Mon, 29 Jun 2009)
New Revision: 15033
Added:
trunk/packages/qt4-x11/debian/patches/0280-deserialization-custom-dbus-properties.diff
trunk/packages/qt4-x11/debian/patches/0286-fix-error-string.diff
Removed:
trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
trunk/packages/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff
trunk/packages/qt4-x11/debian/patches/0279-svg-rendering-regression.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
trunk/packages/qt4-x11/debian/patches/0274-shm-native-image-fix.diff
trunk/packages/qt4-x11/debian/patches/series
Log:
Sync qt-copy patches from kde-qt git repository:
- Remove: 0234, 0273 and 0279.
- Add:
- 0280-deserialization-custom-dbus-properties.diff
Fix deserialization of values with custom types when setting properties
on dbus adaptors.
- 0286-fix-error-string.diff
Fix #error line not to have a ' as it's not correct.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2009-06-27 22:43:47 UTC (rev 15032)
+++ trunk/packages/qt4-x11/debian/changelog 2009-06-29 13:52:59 UTC (rev 15033)
@@ -10,6 +10,14 @@
+++ Changes by Fathi Boudra:
+ * Sync qt-copy patches from kde-qt git repository:
+ - Remove: 0234, 0273 and 0279.
+ - Add:
+ - 0280-deserialization-custom-dbus-properties.diff
+ Fix deserialization of values with custom types when setting properties
+ on dbus adaptors.
+ - 0286-fix-error-string.diff
+ Fix #error line not to have a ' as it's not correct.
* Bump Standards-Version to 3.8.2 (no changes needed).
+++ Changes by Didier Raboud:
Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2009-06-27 22:43:47 UTC (rev 15032)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2009-06-29 13:52:59 UTC (rev 15033)
@@ -1,20 +1,27 @@
-qt-bugs@ issue : 167704
-Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
-bugs.kde.org number : none
-applied: no
-author: Lubos Lunak <l.lunak at kde.org>
+From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
+From: Lubos Lunak <l.lunak at kde.org>
+Date: Sat, 23 Feb 2008 16:44:52 +0100
+Subject: [PATCH 01/16] This patch uses object name as a fallback for window role if no window
+ role is set explicitly using setWindowRole(). Since Qt3 always used
+ the object name as the window role and most Qt3/KDE3 code is ported to
+ call setObjectName(),
+this makes the window role set in many cases (which KWin uses for window identifying).
+
NOTE: It is suggested to apply patch #0209 as well when this patch is used.
-This patch uses object name as a fallback for window role if no window role
-is set explicitly using setWindowRole(). Since Qt3 always used the object
-name as the window role and most Qt3/KDE3 code is ported to call setObjectName(),
-this makes the window role set in many cases (which KWin uses for window identifying).
+qt-bugs@ issue : 167704
+Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
+---
+ src/corelib/kernel/qobject.cpp | 8 ++++++++
+ src/corelib/kernel/qobject_p.h | 3 +++
+ src/gui/kernel/qwidget_p.h | 1 +
+ src/gui/kernel/qwidget_x11.cpp | 27 +++++++++++++++++++++------
+ 4 files changed, 33 insertions(+), 6 deletions(-)
-
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -993,9 +993,18 @@ void QObject::setObjectName(const QStrin
+@@ -986,8 +986,16 @@ void QObject::setObjectName(const QStrin
{
Q_D(QObject);
d->objectName = name;
@@ -23,16 +30,14 @@
+#endif
}
-
+#if defined(Q_WS_X11)
+void QObjectPrivate::checkWindowRole()
+{
+}
+#endif
-+
+
#ifdef QT3_SUPPORT
/*! \internal
- QObject::child is compat but needs to call itself recursively,
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -144,6 +144,9 @@ public:
@@ -47,7 +52,7 @@
struct Connection
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -358,6 +358,7 @@ public:
+@@ -360,6 +360,7 @@ public:
#if defined(Q_WS_X11)
void setWindowRole();
@@ -81,7 +86,7 @@
}
// set client leader property
-@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2763,6 +2767,17 @@ void QWidgetPrivate::setWindowRole()
(unsigned char *)windowRole.constData(), windowRole.length());
}
Modified: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2009-06-27 22:43:47 UTC (rev 15032)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2009-06-29 13:52:59 UTC (rev 15033)
@@ -1,12 +1,16 @@
+From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001
+From: Lubos Lunak <l.lunak at kde.org>
+Date: Tue, 2 Oct 2007 16:08:32 +0200
+Subject: [PATCH 02/16] This patch makes override-redirect windows (popup menu, dropdown menu,
+ tooltip, combobox, etc.) also have more window properties like WM_CLASS,
+ so they can be used when compositing.
+
qt-bugs@ issue : none
bugs.kde.org number : none
-applied: no
-author: Lubos Lunak <l.lunak at kde.org>
+---
+ src/gui/kernel/qwidget_x11.cpp | 21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
-This patch makes override-redirect windows (popup menu, dropdown menu,
-tooltip, combobox, etc.) also have more window properties like WM_CLASS,
-so they can be used when compositing.
-
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId wind
Modified: trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2009-06-27 22:43:47 UTC (rev 15032)
+++ trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2009-06-29 13:52:59 UTC (rev 15033)
@@ -1,18 +1,22 @@
+From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
+From: Lubos Lunak <l.lunak at kde.org>
+Date: Wed, 30 Jan 2008 14:24:01 +0100
+Subject: [PATCH 03/16] This patch changes QObjectPrivateVersion, thus preventing mixing
+ parts of upstream Qt and qt-copy. In general it is a bad idea to mix
+ e.g. libQtCore from one build and libQtGui from another one, and other
+ qt-copy patches could make changes in Qt internal structures that could
+ cause problems when mixed with upstream Qt.
+
+This patch does not make qt-copy binary incompatible with upstream Qt.
+It only further enforces using the same sources for the whole Qt build.
+
qt-bugs@ issue : none
Trolltech task ID : none
bugs.kde.org number : none
-applied: yes
-author: Lubos Lunak <l.lunak at kde.org>
+---
+ src/corelib/kernel/qobject_p.h | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
-This patch changes QObjectPrivateVersion, thus preventing mixing
-parts of upstream Qt and qt-copy. In general it is a bad idea to mix
-e.g. libQtCore from one build and libQtGui from another one, and other
-qt-copy patches could make changes in Qt internal structures that could
-cause problems when mixed with upstream Qt.
-
-This patch does not make qt-copy binary incompatible with upstream Qt.
-It only further enforces using the same sources for the whole Qt build.
-
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPO
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 2009-06-27 22:43:47 UTC (rev 15032)
+++ trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2009-06-29 13:52:59 UTC (rev 15033)
@@ -1,8 +1,8 @@
-qt-bugs@ issue : 199610
-Trolltech task ID :
-bugs.kde.org number :
-applied: no
-author: Benjamin Reed <rangerrick at befunk.com>
+From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
+From: Benjamin Reed <rangerrick at befunk.com>
+Date: Tue, 19 Feb 2008 17:37:37 +0100
+Subject: [PATCH 04/16] This patch adds support for using -isystem to allow putting an include
+ directory at the end of the compiler's header search path.
I don't have the exact output anymore (I've since patched Qt's configure) but
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
@@ -18,13 +18,16 @@
adding -I /usr/include would exhibit this bug, just as a custom-installed
pcre/clucene in another root would.
-This patch adds support for using -isystem to allow putting an include
-directory at the end of the compiler's header search path.
+qt-bugs@ issue : 199610
+Trolltech task ID :
+bugs.kde.org number :
+---
+ configure | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
-
--- a/configure
+++ b/configure
-@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
+@@ -928,6 +928,11 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
@@ -36,7 +39,7 @@
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
-@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1891,6 +1896,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
Modified: trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch 2009-06-27 22:43:47 UTC (rev 15032)
+++ trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch 2009-06-29 13:52:59 UTC (rev 15033)
@@ -1,27 +1,36 @@
-qt-bugs@ issue : 208185
-Trolltech task ID : 208349
-bugs.kde.org number : 159014
-applied: no
-author: Robert Knight <robertknight at gmail.com>
+From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001
+From: Robert Knight <robertknight at gmail.com>
+Date: Sun, 20 Apr 2008 16:28:31 +0200
+Subject: [PATCH 05/16] When tabs are inserted or removed in a QTabBar,
+ QTabBarPrivate::refresh() is called to update the layout. If the
+ tabbar widget is hidden, this just sets a boolean variable
+ (layoutDirty) and returns, so the parent widget's layout is not
+ notified about the possible geometry change.
-When tabs are inserted or removed in a QTabBar, QTabBarPrivate::refresh()
-is called to update the layout. If the tabbar widget is hidden, this
-just sets a boolean variable (layoutDirty) and returns, so the parent widget's layout
-is not notified about the possible geometry change.
+Prior to Qt 4.4 this was not a problem because the geometry was
+recalculated in QTabBar::sizeHint() if the layoutDirty variable was
+set. In Qt 4.4 however the layout caches size hint information in
+QWidgetItemV2. Since the cache information is not invalidated, the
+layout may end up using out-of-date size hint information to compute
+the widget size.
-Prior to Qt 4.4 this was not a problem because the geometry was recalculated
-in QTabBar::sizeHint() if the layoutDirty variable was set. In Qt 4.4 however the layout
-caches size hint information in QWidgetItemV2. Since the cache information is not invalidated,
-the layout may end up using out-of-date size hint information to compute the widget size.
+If the QTabBar is empty when QTabBar::sizeHint() is called, it will
+return a size with a height of 0, which will be kept in the cache and
+so the tab bar will never be shown.
-If the QTabBar is empty when QTabBar::sizeHint() is called, it will return a size with a height
-of 0, which will be kept in the cache and so the tab bar will never be shown.
+This patch fixes the problem by calling updateGeometry() whenever the
+tab bar's layout is refreshed.
-This patch fixes the problem by calling updateGeometry() whenever the tab bar's layout is refreshed.
+qt-bugs@ issue : 208185
+Trolltech task ID : 208349
+bugs.kde.org number : 159014
+---
+ src/gui/widgets/qtabbar.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
-@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
+@@ -675,8 +675,8 @@ void QTabBarPrivate::refresh()
layoutTabs();
makeVisible(currentIndex);
q->update();
Modified: trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff 2009-06-27 22:43:47 UTC (rev 15032)
+++ trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff 2009-06-29 13:52:59 UTC (rev 15033)
@@ -1,10 +1,8 @@
-qt-bugs@ issue : N232819
-Trolltech task ID : 232831
-applied: no
-author: Rafael Fernández López <ereslibre at kde.org>
+From 1ec9dd029abaa0f00798535fdb1722154b1c63f6 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= <ereslibre at kde.org>
+Date: Sun, 26 Oct 2008 10:40:51 +0100
+Subject: [PATCH 08/16] In a treeview with columns like this:
-In a treeview with columns like this:
-
Column 1 | Column 2 | ... | Column k | ... | Column n
When selecting with rubberband (by clicking on the blank part of the viewport) while Column k is
@@ -29,9 +27,16 @@
the last one. The reason is that columnRanges returns two ranges when there is supposed to return 1
range (even when there are hidden columns).
+qt-bugs@ issue : N232819
+Trolltech task ID : 232831
+bugs.kde.org number : 171436
+---
+ src/gui/itemviews/qtreeview.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3575,7 +3575,7 @@ QList<QPair<int, int> > QTreeViewPrivate
+@@ -3577,7 +3577,7 @@ QList<QPair<int, int> > QTreeViewPrivate
current.first = -2; // -1 is not enough because -1+1 = 0
current.second = -2;
foreach (int logicalColumn, logicalIndexes) {
Modified: trunk/packages/qt4-x11/debian/patches/0274-shm-native-image-fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0274-shm-native-image-fix.diff 2009-06-27 22:43:47 UTC (rev 15032)
+++ trunk/packages/qt4-x11/debian/patches/0274-shm-native-image-fix.diff 2009-06-29 13:52:59 UTC (rev 15033)
@@ -1,26 +1,22 @@
-qt-bugs@ issue : none
-Qt Software task ID : none
-bugs.kde.org number : none
-applied: no
-author: Fredrik Höglund <fredrik at kde.org>
+From 8731ab999b849dac4716e3d29f5f55ed8e56438e Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira at nokia.com>
+Date: Thu, 25 Jun 2009 13:50:29 +0200
+Subject: [PATCH 12/16] This patch makes the raster graphics system use shared images instead
+ of shared pixmaps.
-This patch makes the raster graphics system use shared images instead
-of shared pixmaps.
-
Shared memory pixmaps are deprecated since they are slower than shared
images with modern graphics hardware. They are also not supported by EXA
drivers and can be disabled in the latest version of the NVidia driver.
---- a/src/gui/image/qnativeimage_p.h
-+++ b/src/gui/image/qnativeimage_p.h
-@@ -90,7 +90,6 @@ public:
-
- #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
- XImage *xshmimg;
-- Pixmap xshmpm;
- XShmSegmentInfo xshminfo;
-
- #elif defined(Q_WS_MAC)
+qt-bugs@ issue : none
+Qt Software task ID : none
+bugs.kde.org number : none
+---
+ src/gui/image/qnativeimage.cpp | 10 ----------
+ src/gui/image/qnativeimage_p.h | 1 -
+ src/gui/painting/qwindowsurface_raster.cpp | 13 ++++++++++---
+ 3 files changed, 10 insertions(+), 14 deletions(-)
+
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -147,7 +147,6 @@ QNativeImage::QNativeImage(int width, in
@@ -54,9 +50,19 @@
XShmDetach(X11->display, &xshminfo);
xshmimg->data = 0;
XDestroyImage(xshmimg);
+--- a/src/gui/image/qnativeimage_p.h
++++ b/src/gui/image/qnativeimage_p.h
+@@ -90,7 +90,6 @@ public:
+
+ #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
+ XImage *xshmimg;
+- Pixmap xshmpm;
+ XShmSegmentInfo xshminfo;
+
+ #elif defined(Q_WS_MAC)
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
-@@ -221,9 +221,16 @@ void QRasterWindowSurface::flush(QWidget
+@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget
QRect br = rgn.boundingRect().translated(offset);
#ifndef QT_NO_MITSHM
@@ -76,14 +82,3 @@
XSync(X11->display, False);
} else
#endif
---- a/src/gui/kernel/qapplication_x11.cpp
-+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -1952,7 +1952,7 @@ void qt_init(QApplicationPrivate *priv,
- // to determine whether the display is local or not (not 100 % accurate)
- bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
- if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0))
-- X11->use_mitshm = mitshm_pixmaps;
-+ X11->use_mitshm = true;
- }
- #endif // QT_NO_MITSHM
-
Added: trunk/packages/qt4-x11/debian/patches/0280-deserialization-custom-dbus-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0280-deserialization-custom-dbus-properties.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0280-deserialization-custom-dbus-properties.diff 2009-06-29 13:52:59 UTC (rev 15033)
@@ -0,0 +1,49 @@
+From b274bbaf4768dcfdfcf95ceda08b6402ffedb80d Mon Sep 17 00:00:00 2001
+From: George Goldberg <grundleborg at googlemail.com>
+Date: Tue, 28 Apr 2009 17:08:07 +0200
+Subject: [PATCH 09/16] This patch fixes deserialization of values with custom types when setting
+ properties on dbus adaptors. It is needed, in particular by telepathy/Qt
+ programs and libraries. The bug was reported to Nokia on 2009-01-07 along
+ with the patch supplied here. The summary of the issue from the Qt
+ Software task tracker follows:
+
+When calling the setter for a DBus property, if that property has a custom type
+(e.g. a struct with dbus type (uss)), QtDBus fails to demarshall the
+QDBusArgument before attempting to set the property on the adaptor. The result
+is that it attempts to call adaptor->setProperty() with a QDBusArgument of type
+"uss" instead of with the type of the custom struct.
+
+qt-bugs@ issue : N240326
+Qt Software task ID : 240608
+bugs.kde.org number : none
+---
+ src/dbus/qdbusinternalfilters.cpp | 16 +++++++++++++++-
+ 1 files changed, 15 insertions(+), 1 deletions(-)
+
+--- a/src/dbus/qdbusinternalfilters.cpp
++++ b/src/dbus/qdbusinternalfilters.cpp
+@@ -274,9 +274,23 @@ QDBusMessage qDBusPropertySet(const QDBu
+ QDBusAdaptorConnector::AdaptorMap::ConstIterator it;
+ it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(),
+ interface_name);
+- if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface))
++ if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) {
++ if (value.userType() == qMetaTypeId<QDBusArgument>()) {
++ QDBusArgument valueArg = qvariant_cast<QDBusArgument>(value);
++ if (valueArg.currentType() != -1) {
++ int mid = it->adaptor->metaObject()->property(it->adaptor->metaObject()->indexOfProperty(property_name)).userType();
++ void *null = 0;
++ QVariant valueStore(mid, null);
++ QDBusMetaType::demarshall(valueArg, mid, valueStore.data());
++
++ if (it->adaptor->setProperty(property_name, valueStore))
++ return msg.createReply();
++ }
++ }
++
+ if (it->adaptor->setProperty(property_name, value))
+ return msg.createReply();
++ }
+ }
+ }
+
Added: trunk/packages/qt4-x11/debian/patches/0286-fix-error-string.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0286-fix-error-string.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0286-fix-error-string.diff 2009-06-29 13:52:59 UTC (rev 15033)
@@ -0,0 +1,18 @@
+From 4b5ae1db24fa1b96f00ef62bd2e1063a8a313e5c Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid at kde.org>
+Date: Sat, 27 Jun 2009 14:19:23 +0200
+Subject: [PATCH 16/16] Fix #error line not to have a ' as it's not correct
+
+---
+ src/3rdparty/webkit/WebCore/DerivedSources.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/src/3rdparty/webkit/WebCore/DerivedSources.cpp
++++ b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
+@@ -334,5 +334,5 @@
+ // want StaticConstructors.h to "pollute" all the source files we #include here
+ // accidentally, so we'll throw an error whenever any file includes it.
+ #ifdef StaticConstructors_h
+-#error Don't include any file in DerivedSources.cpp that includes StaticConstructors.h
++#error Do not include any file in DerivedSources.cpp that includes StaticConstructors.h
+ #endif
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2009-06-27 22:43:47 UTC (rev 15032)
+++ trunk/packages/qt4-x11/debian/patches/series 2009-06-29 13:52:59 UTC (rev 15033)
@@ -4,11 +4,10 @@
0209-prevent-qt-mixing.diff
0216-allow-isystem-for-headers.diff
0225-invalidate-tabbar-geometry-on-refresh.patch
-0234-fix-mysql-threaded.diff
0255-qtreeview-selection-columns-hidden.diff
-0273-odbc-64bit-compile.diff
0274-shm-native-image-fix.diff
-0279-svg-rendering-regression.diff
+0280-deserialization-custom-dbus-properties.diff
+0286-fix-error-string.diff
# debian patches
01_qmake_for_debian.diff
More information about the pkg-kde-commits
mailing list