Hello community, here is the log from the commit of package libqt4 checked in at Wed Mar 19 01:55:19 CET 2008. -------- --- libqt4/libqt4.changes 2008-03-11 18:47:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-03-18 17:25:06.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 18 17:23:50 CET 2008 - dmueller@suse.de + +- update to 20080317 + * fixed compositing support + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change Old: ---- qt-x11-opensource-src-4.4.0-snapshot-20080310.tar.bz2 New: ---- 0180-window-role.diff prefer-linked-opengl.diff qt-x11-opensource-src-4.4.0-snapshot-20080317.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.c25830/_old 2008-03-19 01:54:28.000000000 +0100 +++ /var/tmp/diff_new_pack.c25830/_new 2008-03-19 01:54:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.3.93) +# spec file for package libqt4-devel-doc-data (Version 4.3.93.) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -26,11 +26,12 @@ BuildArch: noarch # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.93 -Release: 8 +%define snapshot 20080317 +Version: 4.3.93.%snapshot +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-20080310 +%define rversion 4.4.0-snapshot-%snapshot Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -56,6 +57,8 @@ Patch55: ignore-global-advance-width-in-fots.diff Patch56: compile-qsslsocket.diff Patch57: s390-pedantic-compile.diff +Patch58: prefer-linked-opengl.diff +Patch60: 0180-window-role.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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 %_docdir/%{base_name}/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 @@ -93,6 +96,8 @@ %patch54 %patch55 %patch57 +%patch58 +%patch60 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -154,6 +159,9 @@ /usr/share/doc/packages/%base_name/examples %changelog +* Tue Mar 18 2008 dmueller@suse.de +- update to 20080317 + * fixed compositing support * Tue Mar 11 2008 dmueller@suse.de - update to 20080310 * fixes s390(x) compile ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.c25830/_old 2008-03-19 01:54:28.000000000 +0100 +++ /var/tmp/diff_new_pack.c25830/_new 2008-03-19 01:54:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.3.93) +# spec file for package libqt4 (Version 4.3.93.) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -36,11 +36,12 @@ Provides: libqt4-dbus-1 <= 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Version: 4.3.93 -Release: 8 +%define snapshot 20080317 +Version: 4.3.93.%snapshot +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-20080310 +%define rversion 4.4.0-snapshot-%snapshot Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -66,6 +67,8 @@ Patch55: ignore-global-advance-width-in-fots.diff Patch56: compile-qsslsocket.diff Patch57: s390-pedantic-compile.diff +Patch58: prefer-linked-opengl.diff +Patch60: 0180-window-role.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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 %_docdir/%{base_name}/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 @@ -104,6 +107,8 @@ %patch54 %patch55 %patch57 +%patch58 +%patch60 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -319,9 +324,9 @@ %plugindir/imageformats %plugindir/inputmethods %plugindir/accessible -%if %suse_version > 1010 -%plugindir/script -%endif +#%if %suse_version > 1010 +#%plugindir/script +#%endif %files qt3support %defattr(-,root,root,755) @@ -391,6 +396,9 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Tue Mar 18 2008 dmueller@suse.de +- update to 20080317 + * fixed compositing support * Tue Mar 11 2008 dmueller@suse.de - update to 20080310 * fixes s390(x) compile ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.c25830/_old 2008-03-19 01:54:28.000000000 +0100 +++ /var/tmp/diff_new_pack.c25830/_new 2008-03-19 01:54:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.3.93) +# spec file for package libqt4-sql-plugins (Version 4.3.93.) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -32,11 +32,12 @@ Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.93 -Release: 4 +%define snapshot 20080317 +Version: 4.3.93.%snapshot +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-20080310 +%define rversion 4.4.0-snapshot-%snapshot Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -62,6 +63,8 @@ Patch55: ignore-global-advance-width-in-fots.diff Patch56: compile-qsslsocket.diff Patch57: s390-pedantic-compile.diff +Patch58: prefer-linked-opengl.diff +Patch60: 0180-window-role.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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 %_docdir/%{base_name}/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 @@ -98,6 +101,8 @@ %patch54 %patch55 %patch57 +%patch58 +%patch60 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -213,6 +218,9 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Tue Mar 18 2008 dmueller@suse.de +- update to 20080317 + * fixed compositing support * Tue Mar 11 2008 dmueller@suse.de - update to 20080310 * fixes s390(x) compile ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.c25830/_old 2008-03-19 01:54:28.000000000 +0100 +++ /var/tmp/diff_new_pack.c25830/_new 2008-03-19 01:54:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libQtWebKit-devel (Version 4.3.93) +# spec file for package libQtWebKit-devel (Version 4.3.93.) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -30,11 +30,12 @@ %requires_eq libqt4-devel # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.93 -Release: 8 +%define snapshot 20080317 +Version: 4.3.93.%snapshot +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-20080310 +%define rversion 4.4.0-snapshot-%snapshot Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -60,6 +61,8 @@ Patch55: ignore-global-advance-width-in-fots.diff Patch56: compile-qsslsocket.diff Patch57: s390-pedantic-compile.diff +Patch58: prefer-linked-opengl.diff +Patch60: 0180-window-role.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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 %_docdir/%{base_name}/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 @@ -98,6 +101,8 @@ %patch54 %patch55 %patch57 +%patch58 +%patch60 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -121,6 +126,20 @@ -------- Troll Tech AS, Norway +%package -n qt4-x11-tools +Group: Development/Libraries/C and C++ +Summary: Qt 4 GUI related libraries +Requires: libqt4-x11 >= %version + +%description -n qt4-x11-tools +Qt 4 libraries which are used for drawing widgets and OpenGL items. + + + +Authors: +-------- + Troll Tech AS, Norway + %package -n libqt4-devel-doc Group: Documentation/HTML Summary: Qt documentation @@ -156,6 +175,7 @@ make %{?jobs:-j%jobs} -C src/3rdparty/webkit/WebCore make %{?jobs:-j%jobs} -C src/xmlpatterns make %{?jobs:-j%jobs} -C demos +make %{?jobs:-j%jobs} -C examples %install export QTDIR=$PWD @@ -163,8 +183,8 @@ make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/3rdparty/webkit/WebCore install make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/xmlpatterns install make INSTALL_ROOT=$RPM_BUILD_ROOT -C demos install -# install all headers -#make INSTALL_ROOT=$RPM_BUILD_ROOT install +make INSTALL_ROOT=$RPM_BUILD_ROOT -C examples install +#ln -sf %_docdir/%{base_name}/examples/painting/svgviewer/svgviewer $RPM_BUILD_ROOT/usr/bin/svgviewer # reduce fileconflicts for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f @@ -236,7 +256,14 @@ %dir %_docdir/%base_name %_docdir/%base_name/demos +%files -n qt4-x11-tools +%defattr(-,root,root,755) +#/usr/bin/svgviewer + %changelog +* Tue Mar 18 2008 dmueller@suse.de +- update to 20080317 + * fixed compositing support * Tue Mar 11 2008 dmueller@suse.de - update to 20080310 * fixes s390(x) compile ++++++ 0180-window-role.diff ++++++ 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@kde.org> 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). --- 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 { Q_D(QObject); d->objectName = name; +#if defined(Q_WS_X11) + d->checkWindowRole(); +#endif } +#if defined(Q_WS_X11) +void QObjectPrivate::checkWindowRole() +{ +} +#endif + #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: mutable quint32 connectedSignals; QString objectName; +#if defined(Q_WS_X11) + virtual void checkWindowRole(); +#endif // 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: #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 // declare the widget's window role + QByteArray windowRole; if (QTLWExtra *topData = maybeTopData()) { - if (!topData->role.isEmpty()) { - QByteArray windowRole = topData->role.toUtf8(); - XChangeProperty(dpy, id, - ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, - (unsigned char *)windowRole.constData(), windowRole.length()); - } + if (!topData->role.isEmpty()) + windowRole = topData->role.toUtf8(); + } + if (windowRole.isEmpty()) // use object name as a fallback + windowRole = objectName.toUtf8(); + if (!windowRole.isEmpty()) { + XChangeProperty(dpy, id, + ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, + (unsigned char *)windowRole.constData(), windowRole.length()); } // set client leader property @@ -2852,6 +2856,17 @@ void QWidgetPrivate::setWindowRole() (unsigned char *)windowRole.constData(), windowRole.length()); } +void QWidgetPrivate::checkWindowRole() +{ + Q_Q(QWidget); + if( !q->windowRole().isEmpty() || !q->internalWinId()) + return; + QByteArray windowRole = objectName.toUtf8(); // use as a fallback + 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 { ++++++ libQtWebKit-devel.spec.in ++++++ --- libqt4/libQtWebKit-devel.spec.in 2008-03-02 12:59:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libQtWebKit-devel.spec.in 2008-03-14 16:40:33.000000000 +0100 @@ -45,6 +45,24 @@ -------- Troll Tech AS, Norway +%package -n qt4-x11-tools +Group: System/Libraries +Summary: C++ Program Library, Core Components +Requires: libqt4-x11 >= %version + +%description -n qt4-x11-tools +Qt is a set of libraries for developing applications. + +This package contains base tools, like string, xml, and network +handling. + + + +Authors: +-------- + Troll Tech AS, Norway + + %package -n libqt4-devel-doc Group: Documentation/HTML Summary: Qt documentation @@ -80,6 +98,7 @@ make %{?jobs:-j%jobs} -C src/3rdparty/webkit/WebCore make %{?jobs:-j%jobs} -C src/xmlpatterns make %{?jobs:-j%jobs} -C demos +make %{?jobs:-j%jobs} -C examples %install export QTDIR=$PWD @@ -87,8 +106,8 @@ make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/3rdparty/webkit/WebCore install make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/xmlpatterns install make INSTALL_ROOT=$RPM_BUILD_ROOT -C demos install -# install all headers -#make INSTALL_ROOT=$RPM_BUILD_ROOT install +make INSTALL_ROOT=$RPM_BUILD_ROOT -C examples install +#ln -sf %_docdir/%{base_name}/examples/painting/svgviewer/svgviewer $RPM_BUILD_ROOT/usr/bin/svgviewer # reduce fileconflicts for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do @@ -165,4 +184,8 @@ %dir %_docdir/%base_name %_docdir/%base_name/demos +%files -n qt4-x11-tools +%defattr(-,root,root,755) +#/usr/bin/svgviewer + %changelog ++++++ prefer-linked-opengl.diff ++++++ --- src/opengl/qgl_x11.cpp +++ src/opengl/qgl_x11.cpp @@ -933,6 +933,9 @@ void QGLContext::generateFontDisplayLists(const QFont & fnt, int listBase) \a proc. 0 is returned if a pointer to the function could not be obtained. */ + +#include <dlfcn.h> + void *QGLContext::getProcAddress(const QString &proc) const { typedef void *(*qt_glXGetProcAddressARB)(const GLubyte *); @@ -944,9 +947,13 @@ void *QGLContext::getProcAddress(const QString &proc) const if (!glXGetProcAddressARB) { QString glxExt = QString(QLatin1String(glXGetClientString(QX11Info::display(), GLX_EXTENSIONS))); if (glxExt.contains(QLatin1String("GLX_ARB_get_proc_address"))) { - extern const QString qt_gl_library_name(); - QLibrary lib(qt_gl_library_name()); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + void* handle=dlopen(NULL, RTLD_NODELETE | RTLD_LAZY); + glXGetProcAddressARB = (qt_glXGetProcAddressARB) dlsym(handle, "glXGetProcAddressARB"); + if (!glXGetProcAddressARB) { + extern const QString qt_gl_library_name(); + QLibrary lib(qt_gl_library_name()); + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } } resolved = true; } ++++++ qt-x11-opensource-src-4.4.0-snapshot-20080310.tar.bz2 -> qt-x11-opensource-src-4.4.0-snapshot-20080317.tar.bz2 ++++++ libqt4/qt-x11-opensource-src-4.4.0-snapshot-20080310.tar.bz2 /mounts/work_src_done/STABLE/libqt4/qt-x11-opensource-src-4.4.0-snapshot-20080317.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org