Hello community,
here is the log from the commit of package libqt4
checked in at Wed Feb 14 21:06:52 CET 2007.
--------
--- libqt4/libqt4.changes 2007-02-12 14:25:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2007-02-13 20:44:40.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Feb 13 20:44:29 CET 2007 - dmueller@suse.de
+
+- fix reading of x ressources (#244935)
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
New:
----
fix-x11-names-in-qcolor.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -25,7 +25,7 @@
# COMMON-BEGIN
# COMMON-BEGIN
Version: 4.2.2
-Release: 17
+Release: 19
%define x11_free -x11-opensource-src-
%define rversion 4.2.2
Source: qt%x11_free%rversion.tar.bz2
@@ -37,6 +37,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch7: fix-x11-names-in-qcolor.diff
Patch10: 0145-qabstractitemview-dropindicator.diff
Patch11: 0146-rasterpaint-qbrush-image.diff
Patch14: 0149-qdbusconnection-nowarning.diff
@@ -66,6 +67,7 @@
%patch3
%patch5
%patch6
+%patch7
%patch10
%patch11
%patch14
@@ -110,6 +112,8 @@
/usr/share/doc/packages/libqt4/examples
%changelog -n libqt4-devel-doc-data
+* Tue Feb 13 2007 - dmueller@suse.de
+- fix reading of x ressources (#244935)
* Mon Feb 12 2007 - dmueller@suse.de
- update configure parameters
* Wed Jan 24 2007 - dmueller@suse.de
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -27,7 +27,7 @@
Provides: qt
# COMMON-BEGIN
Version: 4.2.2
-Release: 17
+Release: 19
%define x11_free -x11-opensource-src-
%define rversion 4.2.2
Source: qt%x11_free%rversion.tar.bz2
@@ -39,6 +39,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch7: fix-x11-names-in-qcolor.diff
Patch10: 0145-qabstractitemview-dropindicator.diff
Patch11: 0146-rasterpaint-qbrush-image.diff
Patch14: 0149-qdbusconnection-nowarning.diff
@@ -69,6 +70,7 @@
%patch3
%patch5
%patch6
+%patch7
%patch10
%patch11
%patch14
@@ -371,6 +373,8 @@
%_libdir/libQtSql*.so.*
%changelog -n libqt4
+* Tue Feb 13 2007 - dmueller@suse.de
+- fix reading of x ressources (#244935)
* Mon Feb 12 2007 - dmueller@suse.de
- update configure parameters
* Wed Jan 24 2007 - dmueller@suse.de
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -24,7 +24,7 @@
# COMMON-BEGIN
# COMMON-BEGIN
Version: 4.2.2
-Release: 3
+Release: 4
%define x11_free -x11-opensource-src-
%define rversion 4.2.2
Source: qt%x11_free%rversion.tar.bz2
@@ -36,6 +36,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch7: fix-x11-names-in-qcolor.diff
Patch10: 0145-qabstractitemview-dropindicator.diff
Patch11: 0146-rasterpaint-qbrush-image.diff
Patch14: 0149-qdbusconnection-nowarning.diff
@@ -64,6 +65,7 @@
%patch3
%patch5
%patch6
+%patch7
%patch10
%patch11
%patch14
@@ -209,6 +211,8 @@
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog -n libqt4-sql-plugins
+* Tue Feb 13 2007 - dmueller@suse.de
+- fix reading of x ressources (#244935)
* Mon Feb 12 2007 - dmueller@suse.de
- update configure parameters
* Wed Jan 24 2007 - dmueller@suse.de
++++++ 0145-qabstractitemview-dropindicator.diff ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -8,6 +8,7 @@
moved, and that pixel isn't getting erased, so one ends up with some kind of "freestyle drawing"
with a 1-pixel-wide black pen. Fix will be in Qt-4.2.1.
+================================================================================
--- src/gui/itemviews/qabstractitemview_p.h
+++ src/gui/itemviews/qabstractitemview_p.h
@@ -125,10 +125,13 @@
@@ -25,4 +26,3 @@
}
#endif
-
++++++ 0146-rasterpaint-qbrush-image.diff ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -6,9 +6,10 @@
When painting over a QImage using a QBrush with a texture that is an image,
this patch avoids a useless QImage -> QPixmap -> QImage conversion.
---- src/gui/painting/qpaintengine_raster.cpp 2006-10-05 01:29:24.000000000 +0200
-+++ src/gui/painting/qpaintengine_raster.cpp 2006-10-05 02:40:02.652387408 +0200
-@@ -3413,7 +3413,7 @@
+================================================================================
+--- src/gui/painting/qpaintengine_raster.cpp
++++ src/gui/painting/qpaintengine_raster.cpp
+@@ -3811,7 +3811,7 @@
type = Texture;
extern QImage qt_imageForBrush(int brushStyle, bool invert);
QImage texture = (brushStyle == Qt::TexturePattern)
++++++ 0149-qdbusconnection-nowarning.diff ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -11,9 +11,9 @@
Unlike patch 0148, this patch hasn't been accepted yet by Trolltech.
=== tools/qdbus/src/qdbusconnection.cpp
-==================================================================
---- tools/qdbus/src/qdbusconnection.cpp (revision 72)
-+++ tools/qdbus/src/qdbusconnection.cpp (local)
+================================================================================
+--- tools/qdbus/src/qdbusconnection.cpp
++++ tools/qdbus/src/qdbusconnection.cpp
@@ -82,14 +82,8 @@
QDBusConnectionPrivate *d = 0;
++++++ 0154-qdbuscpp2xml-moc_path.diff ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -12,9 +12,9 @@
$PATH if qdbuscpp2xml is also invoked using $PATH.
=== tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
-==================================================================
---- tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp (revision 167)
-+++ tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp (local)
+================================================================================
+--- tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
++++ tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -351,10 +351,20 @@
QCoreApplication app(argc, argv);
QStringList args = app.arguments();
++++++ 0155-indic-script-fix.diff ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -6,10 +6,10 @@
This patch fixes a rendering issue in bn_IN locale
---- src/gui/text/qscriptengine.cpp Mon Jan 8 14:08:29 CET 2007
-+++ src/gui/text/qscriptengine.cpp Mon Jan 8 14:08:29 CET 2007
-
-@@ -3055,7 +3057,7 @@
+================================================================================
+--- src/gui/text/qscriptengine.cpp
++++ src/gui/text/qscriptengine.cpp
+@@ -3065,7 +3065,7 @@
unsigned char pos = position[i];
for (int j = i+1; j > to+1; j--) {
uc[j] = uc[j-2];
@@ -18,5 +18,3 @@
}
uc[to] = ch;
uc[to+1] = ch2;
-
-
++++++ fix-rpath-4.diff ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -1,6 +1,6 @@
---- configure 2006/11/20 09:26:05 1.1
-+++ configure 2006/11/20 20:54:34
-@@ -3178,9 +3178,15 @@
+--- configure
++++ configure
+@@ -3180,9 +3180,15 @@
END {
if (length(var) > 0) {
printf "%s = ", var
++++++ fix-string-literal-comparison.diff ++++++
--- /var/tmp/diff_new_pack.RS8544/_old 2007-02-14 21:06:34.000000000 +0100
+++ /var/tmp/diff_new_pack.RS8544/_new 2007-02-14 21:06:34.000000000 +0100
@@ -1,5 +1,5 @@
---- ./tools/linguist/linguist/previewtool/qtwindowlistmenu.cpp 2007/01/23 10:05:46 1.1
-+++ ./tools/linguist/linguist/previewtool/qtwindowlistmenu.cpp 2007/01/23 10:07:29
+--- tools/linguist/linguist/previewtool/qtwindowlistmenu.cpp
++++ tools/linguist/linguist/previewtool/qtwindowlistmenu.cpp
@@ -325,7 +325,7 @@
QChildEvent *child_event = (QChildEvent *) e;
++++++ fix-x11-names-in-qcolor.diff ++++++
--- src/gui/kernel/qapplication_x11.cpp
+++ src/gui/kernel/qapplication_x11.cpp
@@ -908,6 +908,9 @@
}
if ((button || !resBG.isEmpty() || !resFG.isEmpty())) {// set app colors
+ bool allowX11ColorNames = QColor::allowX11ColorNames();
+ QColor::setAllowX11ColorNames(true);
+
(void) QApplication::style(); // trigger creation of application style and system palettes
QColor btn;
QColor bg;
@@ -973,6 +976,8 @@
}
QApplicationPrivate::setSystemPalette(pal);
+
+ QColor::setAllowX11ColorNames(allowX11ColorNames);
}
if (!resEF.isEmpty()) {
--- src/gui/painting/qcolor.cpp
+++ src/gui/painting/qcolor.cpp
@@ -29,6 +29,15 @@
#include "qvariant.h"
#include "qdebug.h"
+#ifdef Q_WS_X11
+# include "qapplication.h"
+# include "qx11info_x11.h"
+# include "private/qt_x11_p.h"
+
+static bool allowX11ColorNames = false;
+
+#endif
+
#include