Hello community, here is the log from the commit of package qt3 checked in at Thu Mar 29 18:27:07 CEST 2007. -------- --- KDE/qt3/qt3.changes 2007-03-16 14:57:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3.changes 2007-03-29 18:02:51.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Mar 29 18:02:30 CEST 2007 - dmueller@suse.de + +- Fix XRandr 1.2 support + +------------------------------------------------------------------- qt3-devel-doc.changes: same change qt3-extensions.changes: same change qt3-static.changes: same change New: ---- use-xrandr-1.2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.v15003/_old 2007-03-29 18:26:34.000000000 +0200 +++ /var/tmp/diff_new_pack.v15003/_new 2007-03-29 18:26:34.000000000 +0200 @@ -18,7 +18,7 @@ Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8 -Release: 7 +Release: 10 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -84,6 +84,7 @@ Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff Patch122: 0076-fix-qprocess.diff +Patch123: use-xrandr-1.2.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -146,6 +147,7 @@ %patch120 %patch121 %patch122 +%patch123 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -228,6 +230,8 @@ /usr/share/pixmaps/assistant3.png %changelog +* Thu Mar 29 2007 - dmueller@suse.de +- Fix XRandr 1.2 support * Fri Mar 16 2007 - dmueller@suse.de - call XftDefaultSubstitute (#255330) * Thu Mar 15 2007 - dmueller@suse.de ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.v15003/_old 2007-03-29 18:26:34.000000000 +0200 +++ /var/tmp/diff_new_pack.v15003/_new 2007-03-29 18:26:34.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: 8 +Release: 11 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -79,6 +79,7 @@ Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff Patch122: 0076-fix-qprocess.diff +Patch123: use-xrandr-1.2.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -139,6 +140,7 @@ %patch120 %patch121 %patch122 +%patch123 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -472,6 +474,8 @@ %{_mandir}/man*/* %changelog +* Thu Mar 29 2007 - dmueller@suse.de +- Fix XRandr 1.2 support * Fri Mar 16 2007 - dmueller@suse.de - call XftDefaultSubstitute (#255330) * Thu Mar 15 2007 - dmueller@suse.de ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.v15003/_old 2007-03-29 18:26:34.000000000 +0200 +++ /var/tmp/diff_new_pack.v15003/_new 2007-03-29 18:26:34.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 7 +Release: 10 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -81,6 +81,7 @@ Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff Patch122: 0076-fix-qprocess.diff +Patch123: use-xrandr-1.2.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -150,6 +151,7 @@ %patch120 %patch121 %patch122 +%patch123 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -363,6 +365,8 @@ /etc/profile.d/qt3.* %changelog +* Thu Mar 29 2007 - dmueller@suse.de +- Fix XRandr 1.2 support * Fri Mar 16 2007 - dmueller@suse.de - call XftDefaultSubstitute (#255330) * Thu Mar 15 2007 - dmueller@suse.de ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.v15003/_old 2007-03-29 18:26:34.000000000 +0200 +++ /var/tmp/diff_new_pack.v15003/_new 2007-03-29 18:26:34.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 7 +Release: 10 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -78,6 +78,7 @@ Patch120: qt-font-default-subst.diff Patch121: qt3-warnings.diff Patch122: 0076-fix-qprocess.diff +Patch123: use-xrandr-1.2.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -149,6 +150,7 @@ %patch120 %patch121 %patch122 +%patch123 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -218,6 +220,8 @@ /usr/lib/qt3/%{_lib}/libqt-mt.a %changelog +* Thu Mar 29 2007 - dmueller@suse.de +- Fix XRandr 1.2 support * Fri Mar 16 2007 - dmueller@suse.de - call XftDefaultSubstitute (#255330) * Thu Mar 15 2007 - dmueller@suse.de ++++++ use-xrandr-1.2.diff ++++++ --- src/kernel/qdesktopwidget_x11.cpp +++ src/kernel/qdesktopwidget_x11.cpp @@ -111,6 +111,8 @@ QDesktopWidgetPrivate::~QDesktopWidgetPr if ( workareas ) delete [] workareas; } +extern bool qt_use_xrandr; + void QDesktopWidgetPrivate::init() { // get the screen count @@ -121,6 +123,19 @@ void QDesktopWidgetPrivate::init() &unused, &unused) && XineramaIsActive(QPaintDevice::x11AppDisplay())); + // only use xinerama for old Xrandr versions +#ifndef QT_NO_XRANDR + if (qt_use_xrandr) { + int major, minor; + + XRRQueryVersion(QPaintDevice::x11AppDisplay(), &major, &minor); + if (major > 1 || (major == 1 && minor >= 2)) { + use_xinerama = FALSE; + /* nothing further to do at the moment */ + } + } +#endif + if (use_xinerama) { xinerama_screeninfo = XineramaQueryScreens(QPaintDevice::x11AppDisplay(), &screenCount); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org