Hello community, here is the log from the commit of package qt3 checked in at Wed May 9 01:15:46 CEST 2007. -------- --- KDE/qt3/qt3.changes 2007-05-04 19:06:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/qt3/qt3.changes 2007-05-08 14:33:11.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 8 14:32:40 CEST 2007 - dmueller@suse.de + +- trust libxinerama only if it provides more screens + than xrandr crtcs (#264199) + +------------------------------------------------------------------- qt3-devel-doc.changes: same change qt3-extensions.changes: same change qt3-static.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.E29711/_old 2007-05-09 01:15:30.000000000 +0200 +++ /var/tmp/diff_new_pack.E29711/_new 2007-05-09 01:15:30.000000000 +0200 @@ -18,7 +18,7 @@ Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8 -Release: 23 +Release: 25 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -146,8 +146,7 @@ %patch120 %patch121 %patch122 -# bug 264199 -#%patch123 +%patch123 %patch124 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ @@ -231,6 +230,9 @@ /usr/share/pixmaps/assistant3.png %changelog +* Tue May 08 2007 - dmueller@suse.de +- trust libxinerama only if it provides more screens + than xrandr crtcs (#264199) * Fri May 04 2007 - dmueller@suse.de - fix permissions of qmake specs * Wed May 02 2007 - coolo@suse.de ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.E29711/_old 2007-05-09 01:15:30.000000000 +0200 +++ /var/tmp/diff_new_pack.E29711/_new 2007-05-09 01:15:30.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GNU General Public License (GPL), THE Q PUBLIC LICENSE (QPL) Version: 3.3.8 -Release: 24 +Release: 26 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -139,8 +139,7 @@ %patch120 %patch121 %patch122 -# bug 264199 -#%patch123 +%patch123 %patch124 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ @@ -475,6 +474,9 @@ %{_mandir}/man*/* %changelog +* Tue May 08 2007 - dmueller@suse.de +- trust libxinerama only if it provides more screens + than xrandr crtcs (#264199) * Fri May 04 2007 - dmueller@suse.de - fix permissions of qmake specs * Wed May 02 2007 - coolo@suse.de ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.E29711/_old 2007-05-09 01:15:30.000000000 +0200 +++ /var/tmp/diff_new_pack.E29711/_new 2007-05-09 01:15:30.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 23 +Release: 25 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -150,8 +150,7 @@ %patch120 %patch121 %patch122 -# bug 264199 -#%patch123 +%patch123 %patch124 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ @@ -367,6 +366,9 @@ /etc/profile.d/qt3.* %changelog +* Tue May 08 2007 - dmueller@suse.de +- trust libxinerama only if it provides more screens + than xrandr crtcs (#264199) * Fri May 04 2007 - dmueller@suse.de - fix permissions of qmake specs * Wed May 02 2007 - coolo@suse.de ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.E29711/_old 2007-05-09 01:15:30.000000000 +0200 +++ /var/tmp/diff_new_pack.E29711/_new 2007-05-09 01:15:30.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: Static library for developing GUI applications Version: 3.3.8 -Release: 23 +Release: 25 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -149,8 +149,7 @@ %patch120 %patch121 %patch122 -# bug 264199 -#%patch123 +%patch123 %patch124 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ @@ -221,6 +220,9 @@ /usr/lib/qt3/%{_lib}/libqt-mt.a %changelog +* Tue May 08 2007 - dmueller@suse.de +- trust libxinerama only if it provides more screens + than xrandr crtcs (#264199) * Fri May 04 2007 - dmueller@suse.de - fix permissions of qmake specs * Wed May 02 2007 - coolo@suse.de ++++++ use-xrandr-1.2.diff ++++++ --- /var/tmp/diff_new_pack.E29711/_old 2007-05-09 01:15:32.000000000 +0200 +++ /var/tmp/diff_new_pack.E29711/_new 2007-05-09 01:15:32.000000000 +0200 @@ -9,23 +9,46 @@ void QDesktopWidgetPrivate::init() { // get the screen count -@@ -121,6 +123,19 @@ void QDesktopWidgetPrivate::init() +@@ -121,11 +123,39 @@ void QDesktopWidgetPrivate::init() &unused, &unused) && XineramaIsActive(QPaintDevice::x11AppDisplay())); +- if (use_xinerama) { + // only use xinerama for old Xrandr versions +#ifndef QT_NO_XRANDR ++ int ncrtc = 0; + if (qt_use_xrandr) { + int major, minor; + ++#if RANDR_MAJOR > 1 || RANDR_MINOR > 1 + XRRQueryVersion(QPaintDevice::x11AppDisplay(), &major, &minor); + if (major > 1 || (major == 1 && minor >= 2)) { -+ use_xinerama = FALSE; -+ /* nothing further to do at the moment */ ++ XRRScreenResources* res; ++ res = XRRGetScreenResources(QPaintDevice::x11AppDisplay(), ++ QPaintDevice::x11AppRootWindow( 0 )); ++ if (res) { ++ ncrtc = res->ncrtc; ++ XRRFreeScreenResources(res); ++ } + } ++#endif + } +#endif + - if (use_xinerama) { ++ if (use_xinerama) xinerama_screeninfo = XineramaQueryScreens(QPaintDevice::x11AppDisplay(), &screenCount); +- defaultScreen = 0; +- } else ++ ++#ifndef QT_NO_XRANDR ++ if (use_xinerama && screenCount <= ncrtc) { ++ use_xinerama = FALSE; ++ } ++#endif ++ if (use_xinerama) ++ defaultScreen = 0; ++ else + #endif // QT_NO_XINERAMA + { + defaultScreen = DefaultScreen(QPaintDevice::x11AppDisplay()); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org