Mailinglist Archive: opensuse-commit (2130 mails)

< Previous Next >
commit libqt4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 09 Apr 2008 00:19:04 +0200
  • Message-id: <20080408221905.111F0678185@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libqt4
checked in at Wed Apr 9 00:19:04 CEST 2008.

--------
--- libqt4/libqt4.changes 2008-04-05 00:50:17.000000000 +0200
+++ libqt4/libqt4.changes 2008-04-07 12:59:33.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 7 12:58:56 CEST 2008 - dmueller@xxxxxxx
+
+- add patch from last .changes (bnc#368456)
+- re-establish workaround for postgresql-devel (bnc#361431)
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
libQtWebKit-devel.changes: same change

New:
----
0220-no-x-recursion-in-xerrhandler.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.IO3908/_old 2008-04-09 00:18:05.000000000 +0200
+++ /var/tmp/diff_new_pack.IO3908/_new 2008-04-09 00:18:05.000000000 +0200
@@ -29,7 +29,7 @@
# COMMON-BEGIN
%define snapshot 20080325
Version: 4.3.95+4.4.0rc1
-Release: 1
+Release: 3
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0-rc1
@@ -62,6 +62,7 @@
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
+Patch63: 0220-no-x-recursion-in-xerrhandler.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound
-no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis
-system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir
%_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff
-no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
@@ -106,6 +107,7 @@
%patch61
%endif
%patch62
+%patch63
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -165,6 +167,9 @@
/usr/share/doc/packages/%base_name/src

%changelog
+* Mon Apr 07 2008 dmueller@xxxxxxx
+- add patch from last .changes (bnc#368456)
+- re-establish workaround for postgresql-devel (bnc#361431)
* Fri Apr 04 2008 dmueller@xxxxxxx
- fix x error recursion (bnc#368456)
- fix build on sles10 or older

++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.IO3908/_old 2008-04-09 00:18:05.000000000 +0200
+++ /var/tmp/diff_new_pack.IO3908/_new 2008-04-09 00:18:05.000000000 +0200
@@ -35,7 +35,7 @@
# COMMON-BEGIN
%define snapshot 20080325
Version: 4.3.95+4.4.0rc1
-Release: 1
+Release: 3
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0-rc1
@@ -68,6 +68,7 @@
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
+Patch63: 0220-no-x-recursion-in-xerrhandler.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound
-no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis
-system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir
%_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff
-no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
@@ -113,6 +114,7 @@
%patch61
%endif
%patch62
+%patch63
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -400,6 +402,9 @@
%plugindir/sqldrivers/libqsqlite*.so

%changelog
+* Mon Apr 07 2008 dmueller@xxxxxxx
+- add patch from last .changes (bnc#368456)
+- re-establish workaround for postgresql-devel (bnc#361431)
* Fri Apr 04 2008 dmueller@xxxxxxx
- fix x error recursion (bnc#368456)
- fix build on sles10 or older

++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.IO3908/_old 2008-04-09 00:18:05.000000000 +0200
+++ /var/tmp/diff_new_pack.IO3908/_new 2008-04-09 00:18:05.000000000 +0200
@@ -15,7 +15,8 @@
Name: libqt4-sql-plugins
BuildRequires: cups-devel freeglut-devel libjpeg-devel libmysqlclient-devel
libpng-devel
BuildRequires: pkgconfig postgresql-devel unixODBC-devel
-%if %suse_version < 1100
+# bug 361431 - still not fixed :(
+%if 1
BuildRequires: openssl-devel pam-devel readline-devel
%if %suse_version > 910
BuildRequires: krb5-devel
@@ -34,7 +35,7 @@
# COMMON-BEGIN
%define snapshot 20080325
Version: 4.3.95+4.4.0rc1
-Release: 1
+Release: 2
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0-rc1
@@ -67,6 +68,7 @@
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
+Patch63: 0220-no-x-recursion-in-xerrhandler.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound
-no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis
-system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir
%_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff
-no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
@@ -110,6 +112,7 @@
%patch61
%endif
%patch62
+%patch63
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -229,6 +232,9 @@
%plugindir/sqldrivers/libqsqlmysql*.so

%changelog
+* Mon Apr 07 2008 dmueller@xxxxxxx
+- add patch from last .changes (bnc#368456)
+- re-establish workaround for postgresql-devel (bnc#361431)
* Fri Apr 04 2008 dmueller@xxxxxxx
- fix x error recursion (bnc#368456)
- fix build on sles10 or older

++++++ libQtWebKit-devel.spec ++++++
--- /var/tmp/diff_new_pack.IO3908/_old 2008-04-09 00:18:05.000000000 +0200
+++ /var/tmp/diff_new_pack.IO3908/_new 2008-04-09 00:18:05.000000000 +0200
@@ -32,7 +32,7 @@
# COMMON-BEGIN
%define snapshot 20080325
Version: 4.3.95+4.4.0rc1
-Release: 1
+Release: 3
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0-rc1
@@ -65,6 +65,7 @@
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
+Patch63: 0220-no-x-recursion-in-xerrhandler.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%define common_options -fast -no-separate-debug-info -shared -xkb -tablet
-xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound
-no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis
-system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir
%_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir
%_libdir/qt4/demos -plugindir %plugindir -translationdir
/usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir
/usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff
-no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
@@ -110,6 +111,7 @@
%patch61
%endif
%patch62
+%patch63
#%patch56
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
@@ -276,6 +278,9 @@
/usr/bin/svgviewer

%changelog
+* Mon Apr 07 2008 dmueller@xxxxxxx
+- add patch from last .changes (bnc#368456)
+- re-establish workaround for postgresql-devel (bnc#361431)
* Fri Apr 04 2008 dmueller@xxxxxxx
- fix x error recursion (bnc#368456)
- fix build on sles10 or older

++++++ 0220-no-x-recursion-in-xerrhandler.diff ++++++
qt-bugs@ issue : 205699
Trolltech task ID : none yet
bugs.kde.org number : none
applied: no
author: Lubos Lunak <l.lunak@xxxxxxx>
os: unix

X error handler is not allowed to do X protocol requests. Therefore e.g.
creating
QDragManager instance should not be allowed in it, as it results in things like
creating X pixmaps. See https://bugzilla.novell.com/show_bug.cgi?id=368456.

--- src/gui/kernel/qdnd_x11.cpp.sav 2008-03-01 02:33:57.000000000 +0100
+++ src/gui/kernel/qdnd_x11.cpp 2008-04-03 14:33:02.000000000 +0200
@@ -1698,21 +1698,23 @@ void QDragManager::drop()

bool QX11Data::xdndHandleBadwindow()
{
- QDragManager *manager = QDragManager::self();
- if (manager->object && qt_xdnd_current_target) {
- qt_xdnd_current_target = 0;
- qt_xdnd_current_proxy_target = 0;
- manager->object->deleteLater();
- manager->object = 0;
- delete xdnd_data.deco;
- xdnd_data.deco = 0;
- return true;
+ if (qt_xdnd_current_target) { // avoid possibly on-demand creating the
manager in X error handler
+ QDragManager *manager = QDragManager::self();
+ if (manager->object) {
+ qt_xdnd_current_target = 0;
+ qt_xdnd_current_proxy_target = 0;
+ manager->object->deleteLater();
+ manager->object = 0;
+ xdnd_data.deco->deleteLater();
+ xdnd_data.deco = 0;
+ return true;
+ }
}
if (qt_xdnd_dragsource_xid) {
qt_xdnd_dragsource_xid = 0;
if (qt_xdnd_current_widget) {
QDragLeaveEvent e;
- QApplication::sendEvent(qt_xdnd_current_widget, &e);
+ QApplication::postEvent(qt_xdnd_current_widget, &e);
qt_xdnd_current_widget = 0;
}
return true;





++++++ libqt4-sql-plugins.spec.in ++++++
--- libqt4/libqt4-sql-plugins.spec.in 2008-04-02 15:08:43.000000000 +0200
+++ libqt4/libqt4-sql-plugins.spec.in 2008-04-07 12:49:41.000000000 +0200
@@ -14,7 +14,8 @@
Name: libqt4-sql-plugins
BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel
libmysqlclient-devel
BuildRequires: pkgconfig postgresql-devel unixODBC-devel
-%if %suse_version < 1100
+# bug 361431 - still not fixed :(
+%if 1
BuildRequires: pam-devel openssl-devel readline-devel
%if %suse_version > 910
BuildRequires: krb5-devel







++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >