Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory
checked in at Mon Nov 16 11:03:38 CET 2009.
--------
--- libqt4/libqt4.changes 2009-10-19 15:21:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2009-11-13 13:52:29.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Nov 13 13:51:36 CET 2009 - dmueller@suse.de
+
+- strip timestamp from rcc as well (bnc#554462)
+
+-------------------------------------------------------------------
+Fri Nov 13 11:53:01 CET 2009 - dmueller@suse.de
+
+- refresh patches
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
libQtWebKit-devel.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -35,7 +35,7 @@
# COMMON-BEGIN
# COMMON-BEGIN
Version: 4.5.3
-Release: 3
+Release: 4
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.5.3
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -50,7 +50,7 @@
Obsoletes: libqt4-dbus-1 < 4.4.0
# COMMON-BEGIN
Version: 4.5.3
-Release: 3
+Release: 4
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.5.3
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -34,7 +34,7 @@
# COMMON-BEGIN
# COMMON-BEGIN
Version: 4.5.3
-Release: 3
+Release: 4
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.5.3
libQtWebKit-devel.spec: same change
++++++ 0019-Make-QMenu-respect-the-minimum-width-set.patch ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -13,11 +13,11 @@
src/gui/widgets/qmenu.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
-index 9fbbb04..5d62ea6 100644
---- a/src/gui/widgets/qmenu.cpp
-+++ b/src/gui/widgets/qmenu.cpp
-@@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap &actionRects, QList dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
---
-1.6.3.3
-
++++++ 0180-window-role.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -12,9 +12,11 @@
this makes the window role set in many cases (which KWin uses for window identifying).
---- src/corelib/kernel/qobject.cpp.sav 2008-02-22 09:03:40.000000000 +0100
-+++ src/corelib/kernel/qobject.cpp 2008-02-23 16:15:51.000000000 +0100
-@@ -1016,9 +1016,18 @@ void QObject::setObjectName(const QStrin
+Index: src/corelib/kernel/qobject.cpp
+===================================================================
+--- src/corelib/kernel/qobject.cpp.orig
++++ src/corelib/kernel/qobject.cpp
+@@ -986,9 +986,18 @@ void QObject::setObjectName(const QStrin
{
Q_D(QObject);
d->objectName = name;
@@ -33,9 +35,11 @@
#ifdef QT3_SUPPORT
/*! \internal
QObject::child is compat but needs to call itself recursively,
---- src/corelib/kernel/qobject_p.h.sav 2008-02-22 09:23:44.000000000 +0100
-+++ src/corelib/kernel/qobject_p.h 2008-02-23 16:16:46.000000000 +0100
-@@ -148,6 +148,9 @@ public:
+Index: src/corelib/kernel/qobject_p.h
+===================================================================
+--- src/corelib/kernel/qobject_p.h.orig
++++ src/corelib/kernel/qobject_p.h
+@@ -144,6 +144,9 @@ public:
mutable quint32 connectedSignals;
QString objectName;
@@ -45,19 +49,23 @@
// Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
struct Connection
---- src/gui/kernel/qwidget_p.h.sav 2008-02-22 09:04:04.000000000 +0100
-+++ src/gui/kernel/qwidget_p.h 2008-02-23 16:17:07.000000000 +0100
-@@ -324,6 +324,7 @@ public:
+Index: src/gui/kernel/qwidget_p.h
+===================================================================
+--- src/gui/kernel/qwidget_p.h.orig
++++ src/gui/kernel/qwidget_p.h
+@@ -360,6 +360,7 @@ public:
#if defined(Q_WS_X11)
void setWindowRole();
+ virtual void checkWindowRole();
void sendStartupMessage(const char *message) const;
void setNetWmWindowTypes();
- #endif
---- src/gui/kernel/qwidget_x11.cpp.sav 2008-02-23 15:28:47.000000000 +0100
-+++ src/gui/kernel/qwidget_x11.cpp 2008-02-23 16:31:47.000000000 +0100
-@@ -710,13 +710,17 @@ void QWidgetPrivate::create_sys(WId wind
+ void x11UpdateIsOpaque();
+Index: src/gui/kernel/qwidget_x11.cpp
+===================================================================
+--- src/gui/kernel/qwidget_x11.cpp.orig
++++ src/gui/kernel/qwidget_x11.cpp
+@@ -791,13 +791,17 @@ void QWidgetPrivate::create_sys(WId wind
// declare the widget's window role
@@ -81,10 +89,12 @@
}
// set client leader property
-@@ -2852,6 +2856,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2772,6 +2776,17 @@ void QWidgetPrivate::setWindowRole()
+ XChangeProperty(X11->display, q->internalWinId(),
+ ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
(unsigned char *)windowRole.constData(), windowRole.length());
- }
-
++}
++
+void QWidgetPrivate::checkWindowRole()
+{
+ Q_Q(QWidget);
@@ -94,8 +104,6 @@
+ XChangeProperty(X11->display, q->internalWinId(),
+ ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+ (unsigned char *)windowRole.constData(), windowRole.length());
-+}
-+
+ }
+
Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
- QPaintEngine *QWidget::paintEngine() const
- {
++++++ 0188-fix-moc-parser-same-name-header.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -15,9 +15,9 @@
Index: src/tools/moc/preprocessor.cpp
===================================================================
---- src/tools/moc/preprocessor.cpp (revision 698702)
-+++ src/tools/moc/preprocessor.cpp (working copy)
-@@ -753,7 +753,7 @@
+--- src/tools/moc/preprocessor.cpp.orig
++++ src/tools/moc/preprocessor.cpp
+@@ -799,7 +799,7 @@ void Preprocessor::preprocess(const QByt
QFileInfo fi;
if (local)
fi.setFile(QFileInfo(QString::fromLocal8Bit(filename)).dir(), QString::fromLocal8Bit(include));
@@ -26,12 +26,12 @@
const IncludePath &p = Preprocessor::includes.at(j);
if (p.isFrameworkPath) {
const int slashPos = include.indexOf('/');
-@@ -767,7 +767,7 @@
+@@ -819,7 +819,7 @@ void Preprocessor::preprocess(const QByt
}
}
- if (!fi.exists() || fi.isDir())
+ if ( !fi.exists() )
continue;
- include = fi.filePath().toLocal8Bit();
+ include = fi.canonicalFilePath().toLocal8Bit();
++++++ 0191-listview-alternate-row-colors.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -9,9 +9,11 @@
widget is drawn correctly). Please let me know if QListView is not
the only culprit. (QTreeView was fixed by TT already.)
---- src/gui/itemviews/qlistview.cpp
+Index: src/gui/itemviews/qlistview.cpp
+===================================================================
+--- src/gui/itemviews/qlistview.cpp.orig
+++ src/gui/itemviews/qlistview.cpp
-@@ -1071,7 +1071,7 @@
+@@ -1137,7 +1137,7 @@ void QListView::paintEvent(QPaintEvent *
option.state &= ~QStyle::State_Enabled;
cg = QPalette::Disabled;
} else {
++++++ 0195-compositing-properties.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -7,9 +7,11 @@
tooltip, combobox, etc.) also have more window properties like WM_CLASS,
so they can be used when compositing.
---- src/gui/kernel/qwidget_x11.cpp
+Index: src/gui/kernel/qwidget_x11.cpp
+===================================================================
+--- src/gui/kernel/qwidget_x11.cpp.orig
+++ src/gui/kernel/qwidget_x11.cpp
-@@ -637,6 +637,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId wind
Q_ASSERT(id);
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -21,7 +23,7 @@
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -685,13 +690,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId wind
// set EWMH window types
setNetWmWindowTypes();
@@ -45,7 +47,7 @@
// declare the widget's window role
if (QTLWExtra *topData = maybeTopData()) {
-@@ -707,10 +720,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+@@ -791,10 +804,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);
++++++ 0225-invalidate-tabbar-geometry-on-refresh.patch ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -21,9 +21,9 @@
Index: src/gui/widgets/qtabbar.cpp
===================================================================
---- src/gui/widgets/qtabbar.cpp (revision 796858)
-+++ src/gui/widgets/qtabbar.cpp (working copy)
-@@ -533,8 +533,8 @@
+--- src/gui/widgets/qtabbar.cpp.orig
++++ src/gui/widgets/qtabbar.cpp
+@@ -675,8 +675,8 @@ void QTabBarPrivate::refresh()
layoutTabs();
makeVisible(currentIndex);
q->update();
++++++ 0253-qmake_correct_path_separators.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -7,9 +7,11 @@
paths (wrong path separator)
---- qmake/property.cpp.orig 2008-05-08 21:16:15.902625000 +0200
-+++ qmake/property.cpp 2008-05-08 21:16:10.481500000 +0200
-@@ -83,29 +83,32 @@
+Index: qmake/property.cpp
+===================================================================
+--- qmake/property.cpp.orig
++++ qmake/property.cpp
+@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) con
QString
QMakeProperty::value(QString v, bool just_check)
{
@@ -54,7 +56,7 @@
return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
else if(v == "QMAKE_VERSION")
return qmake_version();
-@@ -118,7 +121,7 @@
+@@ -116,7 +119,7 @@ QMakeProperty::value(QString v, bool jus
int slash = v.lastIndexOf('/');
QVariant var = settings->value(keyBase(slash == -1) + v);
bool ok = var.isValid();
++++++ 0280-deserialization-custom-dbus-properties.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -18,9 +18,9 @@
Index: src/dbus/qdbusinternalfilters.cpp
===================================================================
---- src/dbus/qdbusinternalfilters.cpp (revision 960506)
-+++ src/dbus/qdbusinternalfilters.cpp (working copy)
-@@ -274,9 +274,23 @@
+--- src/dbus/qdbusinternalfilters.cpp.orig
++++ 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);
++++++ 0283-do-not-deduce-scrollbar-extent-twice.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -10,9 +10,11 @@
This patch has been merged in master but won't be in 4.5.
http://qt.gitorious.org/qt/qt/merge_requests/432
---- src/gui/itemviews/qlistview.cpp
+Index: src/gui/itemviews/qlistview.cpp
+===================================================================
+--- src/gui/itemviews/qlistview.cpp.orig
+++ src/gui/itemviews/qlistview.cpp
-@@ -1969,10 +1969,16 @@ void QListViewPrivate::prepareItemsLayout()
+@@ -1971,10 +1971,16 @@ void QListViewPrivate::prepareItemsLayou
int frameAroundContents = 0;
if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents))
frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2;
++++++ avoid-dbus-deadlock.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,6 +1,8 @@
---- a/configure
-+++ b/configure
-@@ -617,7 +617,7 @@ fi
+Index: qt-x11-opensource-src-4.5.3/configure
+===================================================================
+--- qt-x11-opensource-src-4.5.3.orig/configure
++++ qt-x11-opensource-src-4.5.3/configure
+@@ -584,7 +584,7 @@ fi
unset QTDIR
# the minimum version of libdbus-1 that we require:
@@ -9,27 +11,10 @@
# initalize internal variables
CFG_CONFIGURE_EXIT_ON_ERROR=yes
-
-From bb13e2d43c664359aa61fc39c31f75a5c3fb4f5e Mon Sep 17 00:00:00 2001
-From: Thiago Macieira
-Date: Wed, 7 Oct 2009 12:04:44 +0200
-Subject: [PATCH 2/2] Use dbus_threads_init_default instead of QMutex wrappers
-
-The minimum version for the recursive mutexes is D-Bus 0.93. That's
-also the same version that introduced the default thread functions. So
-we don't need to provide ours anymore, just use the default.
----
- src/dbus/dbus.pro | 1 -
- src/dbus/qdbus_symbols_p.h | 3 +
- src/dbus/qdbusintegrator.cpp | 2 +-
- src/dbus/qdbusthread.cpp | 149 ------------------------------------------
- 4 files changed, 4 insertions(+), 151 deletions(-)
- delete mode 100644 src/dbus/qdbusthread.cpp
-
-diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
-index dcd8418..57c6a58 100644
---- a/src/dbus/dbus.pro
-+++ b/src/dbus/dbus.pro
+Index: qt-x11-opensource-src-4.5.3/src/dbus/dbus.pro
+===================================================================
+--- qt-x11-opensource-src-4.5.3.orig/src/dbus/dbus.pro
++++ qt-x11-opensource-src-4.5.3/src/dbus/dbus.pro
@@ -61,7 +61,6 @@ SOURCES += qdbusconnection.cpp \
qdbusutil.cpp \
qdbusintrospection.cpp \
@@ -38,11 +23,11 @@
qdbusinternalfilters.cpp \
qdbusmetaobject.cpp \
qdbusxmlgenerator.cpp \
-diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
-index bc90328..69c6ee4 100644
---- a/src/dbus/qdbus_symbols_p.h
-+++ b/src/dbus/qdbus_symbols_p.h
-@@ -357,6 +357,9 @@ DEFINEFUNC(dbus_bool_t , dbus_type_is_basic, (int typecode),
+Index: qt-x11-opensource-src-4.5.3/src/dbus/qdbus_symbols_p.h
+===================================================================
+--- qt-x11-opensource-src-4.5.3.orig/src/dbus/qdbus_symbols_p.h
++++ qt-x11-opensource-src-4.5.3/src/dbus/qdbus_symbols_p.h
+@@ -357,6 +357,9 @@ DEFINEFUNC(dbus_bool_t , dbus_type_i
DEFINEFUNC(dbus_bool_t , dbus_type_is_fixed, (int typecode),
(typecode), return)
@@ -52,11 +37,11 @@
QT_END_NAMESPACE
#endif
-diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
-index 6ff50ac..8143cba 100644
---- a/src/dbus/qdbusintegrator.cpp
-+++ b/src/dbus/qdbusintegrator.cpp
-@@ -920,7 +920,7 @@ QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p)
+Index: qt-x11-opensource-src-4.5.3/src/dbus/qdbusintegrator.cpp
+===================================================================
+--- qt-x11-opensource-src-4.5.3.orig/src/dbus/qdbusintegrator.cpp
++++ qt-x11-opensource-src-4.5.3/src/dbus/qdbusintegrator.cpp
+@@ -920,7 +920,7 @@ QDBusConnectionPrivate::QDBusConnectionP
watchAndTimeoutLock(QMutex::Recursive),
rootNode(QString(QLatin1Char('/')))
{
++++++ build-install-qdoc3.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,4 +1,6 @@
---- tools/qdoc3/qdoc3.pro
+Index: tools/qdoc3/qdoc3.pro
+===================================================================
+--- tools/qdoc3/qdoc3.pro.orig
+++ tools/qdoc3/qdoc3.pro
@@ -99,3 +99,6 @@ SOURCES += apigenerator.cpp \
webxmlgenerator.cpp \
@@ -7,7 +9,9 @@
+target.path=$$[QT_INSTALL_BINS]
+INSTALLS += target
+
---- tools/tools.pro
+Index: tools/tools.pro
+===================================================================
+--- tools/tools.pro.orig
+++ tools/tools.pro
@@ -25,6 +25,7 @@ mac {
contains(QT_CONFIG, dbus):SUBDIRS += qdbus
++++++ disable-callgrind.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,6 +1,8 @@
---- src/testlib/qbenchmark_p.h
+Index: src/testlib/qbenchmark_p.h
+===================================================================
+--- src/testlib/qbenchmark_p.h.orig
+++ src/testlib/qbenchmark_p.h
-@@ -51,7 +51,7 @@
+@@ -56,7 +56,7 @@
#include
#if defined(Q_OS_LINUX) && !defined(QT_NO_PROCESS)
++++++ display-key-support.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -4,9 +4,11 @@
Patch-upstream: no (maybe todo)
Relates: kdelibs4/display-key-support.diff, kdebase4/randr12.diff
---- src/gui/kernel/qkeysequence.cpp.sav 2008-08-01 11:56:38.000000000 +0200
-+++ src/gui/kernel/qkeysequence.cpp 2008-09-12 14:28:32.000000000 +0200
-@@ -376,6 +376,7 @@ static const struct {
+Index: src/gui/kernel/qkeysequence.cpp
+===================================================================
+--- src/gui/kernel/qkeysequence.cpp.orig
++++ src/gui/kernel/qkeysequence.cpp
+@@ -437,6 +437,7 @@ static const struct {
{ Qt::Key_LaunchD, QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
{ Qt::Key_LaunchE, QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
{ Qt::Key_LaunchF, QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
@@ -14,9 +16,11 @@
// --------------------------------------------------------------
// More consistent namings
---- src/gui/kernel/qkeymapper_x11.cpp.sav 2008-08-01 11:56:38.000000000 +0200
-+++ src/gui/kernel/qkeymapper_x11.cpp 2008-09-12 14:30:02.000000000 +0200
-@@ -745,6 +745,7 @@ extern bool qt_sm_blockUserInput;
+Index: src/gui/kernel/qkeymapper_x11.cpp
+===================================================================
+--- src/gui/kernel/qkeymapper_x11.cpp.orig
++++ src/gui/kernel/qkeymapper_x11.cpp
+@@ -755,6 +755,7 @@ extern bool qt_sm_blockUserInput;
#define XF86XK_LaunchD 0x1008FF4D
#define XF86XK_LaunchE 0x1008FF4E
#define XF86XK_LaunchF 0x1008FF4F
@@ -24,7 +28,7 @@
// end of XF86keysyms.h
// Special keys used by Qtopia, mapped into the X11 private keypad range.
-@@ -976,6 +977,8 @@ static const unsigned int KeyTbl[] = {
+@@ -986,6 +987,8 @@ static const unsigned int KeyTbl[] = {
XF86XK_LaunchB, Qt::Key_LaunchD,
XF86XK_LaunchC, Qt::Key_LaunchE,
XF86XK_LaunchD, Qt::Key_LaunchF,
@@ -33,9 +37,11 @@
// Qtopia keys
QTOPIAXK_Select, Qt::Key_Select,
---- src/corelib/global/qnamespace.h.sav 2008-08-01 11:56:34.000000000 +0200
-+++ src/corelib/global/qnamespace.h 2001-01-01 01:01:00.000000000 +0100
-@@ -915,6 +915,8 @@ public:
+Index: src/corelib/global/qnamespace.h
+===================================================================
+--- src/corelib/global/qnamespace.h.orig
++++ src/corelib/global/qnamespace.h
+@@ -943,6 +943,8 @@ public:
Key_LaunchD = 0x010000af,
Key_LaunchE = 0x010000b0,
Key_LaunchF = 0x010000b1,
++++++ filter-leak-fix.patch ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -4,7 +4,9 @@
Memory of fixedKernel is never returned, found by cppcheck.
---- src/gui/image/qpixmapfilter.cpp
+Index: src/gui/image/qpixmapfilter.cpp
+===================================================================
+--- src/gui/image/qpixmapfilter.cpp.orig
+++ src/gui/image/qpixmapfilter.cpp
@@ -401,6 +401,7 @@ static void convolute(
}
++++++ fix-xsync-flag.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,6 +1,8 @@
---- configure
+Index: configure
+===================================================================
+--- configure.orig
+++ configure
-@@ -863,7 +863,7 @@
+@@ -862,7 +862,7 @@ while [ "$#" -gt 0 ]; do
VAL=no
;;
#Qt style yes options
++++++ glib-eventloop-regression.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -22,10 +22,10 @@
Reviewed-by: thiago
Reviewed-by: denis
-diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
-index 6e457f4..665b73e 100644
---- a/src/corelib/kernel/qeventdispatcher_glib.cpp
-+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
+Index: qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp
+===================================================================
+--- qt-x11-opensource-src-4.5.3.orig/src/corelib/kernel/qeventdispatcher_glib.cpp
++++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp
@@ -127,16 +127,11 @@ struct GTimerSource
GSource source;
QTimerInfoList timerList;
@@ -45,7 +45,7 @@
timeval tv = { 0l, 0l };
if (!(src->processEventsFlags & QEventLoop::X11ExcludeTimers) && src->timerList.timerWait(tv))
*timeout = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
-@@ -146,10 +141,8 @@ static gboolean timerSourcePrepare(GSource *source, gint *timeout)
+@@ -146,10 +141,8 @@ static gboolean timerSourcePrepare(GSour
return (*timeout == 0);
}
@@ -57,7 +57,7 @@
if (src->timerList.isEmpty()
|| (src->processEventsFlags & QEventLoop::X11ExcludeTimers))
return false;
-@@ -160,9 +153,35 @@ static gboolean timerSourceCheck(GSource *source)
+@@ -160,9 +153,35 @@ static gboolean timerSourceCheck(GSource
return true;
}
@@ -148,7 +148,7 @@
struct GPostEventSource
{
GSource source;
-@@ -235,14 +301,15 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
+@@ -235,14 +301,15 @@ QEventDispatcherGlibPrivate::QEventDispa
g_main_context_ref(mainContext);
} else {
QCoreApplication *app = QCoreApplication::instance();
@@ -170,7 +170,7 @@
postEventSource = reinterpret_cast(g_source_new(&postEventSourceFuncs,
sizeof(GPostEventSource)));
postEventSource->serialNumber = 1;
-@@ -257,14 +324,21 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
+@@ -257,14 +324,21 @@ QEventDispatcherGlibPrivate::QEventDispa
g_source_set_can_recurse(&socketNotifierSource->source, true);
g_source_attach(&socketNotifierSource->source, mainContext);
@@ -194,7 +194,7 @@
}
QEventDispatcherGlib::QEventDispatcherGlib(QObject *parent)
-@@ -272,12 +346,9 @@ QEventDispatcherGlib::QEventDispatcherGlib(QObject *parent)
+@@ -272,12 +346,9 @@ QEventDispatcherGlib::QEventDispatcherGl
{
}
@@ -210,7 +210,7 @@
QEventDispatcherGlib::~QEventDispatcherGlib()
{
-@@ -289,6 +360,9 @@ QEventDispatcherGlib::~QEventDispatcherGlib()
+@@ -289,6 +360,9 @@ QEventDispatcherGlib::~QEventDispatcherG
g_source_destroy(&d->timerSource->source);
g_source_unref(&d->timerSource->source);
d->timerSource = 0;
@@ -220,7 +220,7 @@
// destroy socket notifier source
for (int i = 0; i < d->socketNotifierSource->pollfds.count(); ++i) {
-@@ -324,11 +398,16 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
+@@ -324,11 +398,16 @@ bool QEventDispatcherGlib::processEvents
// tell postEventSourcePrepare() and timerSource about any new flags
QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
d->timerSource->processEventsFlags = flags;
@@ -239,10 +239,10 @@
d->timerSource->processEventsFlags = savedFlags;
if (canWait)
-diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
-index 8dbc44d..6a4e726 100644
---- a/src/corelib/kernel/qeventdispatcher_glib_p.h
-+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
+Index: qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib_p.h
+===================================================================
+--- qt-x11-opensource-src-4.5.3.orig/src/corelib/kernel/qeventdispatcher_glib_p.h
++++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib_p.h
@@ -98,6 +98,7 @@ protected:
struct GPostEventSource;
struct GSocketNotifierSource;
@@ -259,11 +259,11 @@
};
QT_END_NAMESPACE
-diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
-index a912971..5a0afb8 100644
---- a/src/corelib/kernel/qeventdispatcher_unix.cpp
-+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
-@@ -446,10 +446,10 @@ bool QTimerInfoList::timerWait(timeval &tm)
+Index: qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_unix.cpp
+===================================================================
+--- qt-x11-opensource-src-4.5.3.orig/src/corelib/kernel/qeventdispatcher_unix.cpp
++++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_unix.cpp
+@@ -423,10 +423,10 @@ bool QTimerInfoList::timerWait(timeval &
// Find first waiting timer not already active
QTimerInfo *t = 0;
for (QTimerInfoList::const_iterator it = constBegin(); it != constEnd(); ++it) {
++++++ ignore-global-advance-width-in-fots.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,6 +1,8 @@
---- src/gui/text/qfontengine_ft.cpp
+Index: src/gui/text/qfontengine_ft.cpp
+===================================================================
+--- src/gui/text/qfontengine_ft.cpp.orig
+++ src/gui/text/qfontengine_ft.cpp
-@@ -601,7 +601,7 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd)
+@@ -608,7 +608,7 @@ QFontEngineFT::QFontEngineFT(const QFont
kerning_pairs_loaded = false;
transform = false;
antialias = true;
++++++ no-moc-date.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,6 +1,6 @@
---- src/tools/moc/moc.cpp
+--- src/tools/moc/moc.cpp.orig
+++ src/tools/moc/moc.cpp
-@@ -713,8 +713,8 @@ void Moc::generate(FILE *out)
+@@ -745,8 +745,8 @@ void Moc::generate(FILE *out)
fn = filename.mid(i);
fprintf(out, "/****************************************************************************\n"
"** Meta object code from reading C++ file '%s'\n**\n" , (const char*)fn);
@@ -11,9 +11,9 @@
fprintf(out, "** WARNING! All changes made in this file will be lost!\n"
"*****************************************************************************/\n\n");
---- src/tools/uic/uic.cpp 2009-02-04 17:05:30.000000000 +0100
-+++ src/tools/uic/uic.cpp 2009-02-06 18:12:25.506462000 +0100
-@@ -134,7 +134,7 @@
+--- src/tools/uic/uic.cpp.orig
++++ src/tools/uic/uic.cpp
+@@ -139,7 +139,7 @@ void Uic::writeCopyrightHeader(DomUI *ui
out << "/********************************************************************************\n";
out << "** Form generated from reading ui file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
out << "**\n";
@@ -22,9 +22,9 @@
out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
out << "**\n";
out << "** WARNING! All changes made in this file will be lost when recompiling ui file!\n";
---- tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp 2009-02-04 17:05:31.000000000 +0100
-+++ tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp 2009-02-11 17:00:24.000000000 +0100
-@@ -518,9 +518,11 @@
+--- tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp.orig
++++ tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
+@@ -525,9 +525,11 @@ static void writeProxy(const QString &fi
} else {
includeGuard = QLatin1String("QDBUSXML2CPP_PROXY");
}
@@ -36,7 +36,7 @@
hs << "#ifndef " << includeGuard << endl
<< "#define " << includeGuard << endl
<< endl;
-@@ -827,9 +829,11 @@
+@@ -834,9 +836,11 @@ static void writeAdaptor(const QString &
} else {
includeGuard = QLatin1String("QDBUSXML2CPP_ADAPTOR");
}
@@ -48,3 +48,17 @@
hs << "#ifndef " << includeGuard << endl
<< "#define " << includeGuard << endl
<< endl;
+--- src/tools/rcc/rcc.cpp
++++ src/tools/rcc/rcc.cpp
+@@ -710,10 +710,7 @@
+ if (m_format == C_Code) {
+ writeString("/****************************************************************************\n");
+ writeString("** Resource object code\n");
+- writeString("**\n");
+- writeString("** Created: ");
+- writeByteArray(QDateTime::currentDateTime().toString().toLatin1());
+- writeString("\n** by: The Resource Compiler for Qt version ");
++ writeString("** Created by: The Resource Compiler for Qt version ");
+ writeByteArray(QT_VERSION_STR);
+ writeString("\n**\n");
+ writeString("** WARNING! All changes made in this file will be lost!\n");
++++++ plastik-default.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,6 +1,8 @@
---- src/gui/kernel/qapplication_x11.cpp
+Index: src/gui/kernel/qapplication_x11.cpp
+===================================================================
+--- src/gui/kernel/qapplication_x11.cpp.orig
+++ src/gui/kernel/qapplication_x11.cpp
-@@ -2027,6 +2027,7 @@ void QApplicationPrivate::x11_initialize_style()
+@@ -2591,6 +2591,7 @@ void QApplicationPrivate::x11_initialize
return;
switch(X11->desktopEnvironment) {
@@ -8,7 +10,7 @@
case DE_KDE:
if (X11->use_xrender)
QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("plastique"));
-@@ -2042,9 +2043,6 @@ void QApplicationPrivate::x11_initialize_style()
+@@ -2606,9 +2607,6 @@ void QApplicationPrivate::x11_initialize
case DE_CDE:
QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cde"));
break;
++++++ qfatal-noreturn.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,6 +1,8 @@
---- src/corelib/global/qglobal.h
+Index: src/corelib/global/qglobal.h
+===================================================================
+--- src/corelib/global/qglobal.h.orig
+++ src/corelib/global/qglobal.h
-@@ -1384,6 +1384,7 @@ Q_CORE_EXPORT void qCritical(const char
+@@ -1453,6 +1453,7 @@ Q_CORE_EXPORT void qCritical(const char
Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */
#if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
++++++ qt-debug-timer.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,6 +1,8 @@
---- src/corelib/kernel/qeventdispatcher_unix.cpp
+Index: src/corelib/kernel/qeventdispatcher_unix.cpp
+===================================================================
+--- src/corelib/kernel/qeventdispatcher_unix.cpp.orig
+++ src/corelib/kernel/qeventdispatcher_unix.cpp
-@@ -534,6 +534,20 @@ int QTimerInfoList::activateTimers()
+@@ -551,6 +551,20 @@ int QTimerInfoList::activateTimers()
if (!firstTimerInfo) {
firstTimerInfo = currentTimerInfo;
++++++ qt-never-strip.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:54:59.000000000 +0100
@@ -1,14 +1,16 @@
---- configure
+Index: configure
+===================================================================
+--- configure.orig
+++ configure
-@@ -25,7 +25,6 @@
+@@ -65,7 +65,6 @@ OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,
# initialize global variables
QMAKE_SWITCHES=
-QMAKE_VARS=
QMAKE_CONFIG=
+ QTCONFIG_CONFIG=
QT_CONFIG=
-
-@@ -927,7 +926,7 @@
+@@ -1263,7 +1262,7 @@ while [ "$#" -gt 0 ]; do
QMakeVar add QMAKE_CFLAGS -pg
QMakeVar add QMAKE_CXXFLAGS -pg
QMakeVar add QMAKE_LFLAGS -pg
@@ -17,8 +19,8 @@
else
UNKNOWN_OPT=yes
fi
-@@ -2045,6 +2044,8 @@
- echo "System architecture: '$ARCH'"
+@@ -2699,6 +2698,8 @@ if [ "$OPT_VERBOSE" = "yes" ]; then
+ fi
fi
+QMakeVar add CONFIG nostrip
++++++ use-freetype-default.diff ++++++
--- /var/tmp/diff_new_pack.lToefz/_old 2009-11-16 10:55:03.000000000 +0100
+++ /var/tmp/diff_new_pack.lToefz/_new 2009-11-16 10:55:03.000000000 +0100
@@ -1,7 +1,9 @@
---- src/gui/text/qfontengine_x11.cpp
+Index: src/gui/text/qfontengine_x11.cpp
+===================================================================
+--- src/gui/text/qfontengine_x11.cpp.orig
+++ src/gui/text/qfontengine_x11.cpp
-@@ -992,6 +992,26 @@ static bool subpixel_rendering_available()
- return (implemented = true);
+@@ -976,6 +976,26 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte
+ *antialias = b;
}
+#include
@@ -27,7 +29,7 @@
QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int screen)
: QFontEngineFT(fd)
-@@ -1009,7 +1029,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int s
+@@ -993,7 +1013,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat
canUploadGlyphsToServer = qApp->thread() == QThread::currentThread();
subpixelType = Subpixel_None;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org