Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Mon Dec 13 17:50:09 CET 2010. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-11-24 10:46:07.000000000 +0100 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2010-12-13 17:48:30.269529000 +0100 @@ -1,0 +2,14 @@ +Fri Dec 3 17:10:13 CET 2010 - dmueller@suse.de + +- update to 4.5.85 + * KDE 4.6 Beta2 + * Final Beta before RC, various fixes from Beta1 + * no upstream changelog available. + + +------------------------------------------------------------------- +Tue Nov 30 16:03:27 CET 2010 - hpj@urpla.net + +- apply patch (no-randr-1.3.diff) that allows to build with openSUSE 11.1 + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- kdebase-workspace-4.5.80.tar.bz2 suspend-lock.diff New: ---- kdebase-workspace-4.5.85.tar.bz2 no-randr-1.3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.YRqCWh/_old 2010-12-13 17:48:44.000000000 +0100 +++ /var/tmp/diff_new_pack.YRqCWh/_new 2010-12-13 17:48:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.5.80) +# spec file for package kdebase4-wallpapers (Version 4.5.85) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.5.80 -Release: 2 +Version: 4.5.85 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.YRqCWh/_old 2010-12-13 17:48:44.000000000 +0100 +++ /var/tmp/diff_new_pack.YRqCWh/_new 2010-12-13 17:48:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.5.80) +# spec file for package kdebase4-workspace (Version 4.5.85) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -53,14 +53,16 @@ %if %suse_version > 1130 Requires: polkit-kde-agent-1 polkit-kde-kcmmodules-1 %else +%if %suse_version > 1110 Requires: polkit-kde-1 %endif +%endif License: GPLv2+ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.5.80 -Release: 2 +Version: 4.5.85 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd Source2: titlebar_decor.png @@ -86,7 +88,6 @@ Patch82: rotate-wacom-pointers.diff Patch88: kde4-migrate.diff Patch94: systemsettings-root-kcm.diff -Patch97: suspend-lock.diff Patch98: kdm-dont-grab-mouse.diff #Subject: Increase the time KDM waits for X to start up #From: Lubos Lunak @@ -102,6 +103,9 @@ Patch123: kdm-fix-generic-greeter.diff Patch124: kdm-fix-labelcolors.diff Patch125: pam-translate.diff +%if %suse_version <= 1110 +Patch130: no-randr-1.3.diff +%endif Patch201: plasma-notifications-kill-timer.diff Patch208: kdm-themer-wallpaper-sizes.diff Patch211: disable-python-support.diff @@ -177,7 +181,6 @@ %patch88 ###KDE45: rediff! #%patch94 -%patch97 %patch98 %patch99 ###KDE45: rediff! @@ -192,6 +195,9 @@ #%patch123 -p1 #%patch124 -p1 %patch125 +%if %suse_version <= 1110 +%patch130 +%endif %patch201 -p1 ###KDE45: rediff! #%patch208 @@ -202,6 +208,7 @@ %build EXTRA_FLAGS="-DKDE4_COMMON_PAM_SERVICE=xdm \ -DKDE4_KCHECKPASS_PAM_SERVICE=xdm \ + -DKDE4_ENABLE_FINAL=0 \ -DSYSCONF_INSTALL_DIR=/etc" %cmake_kde4 -d build -- $EXTRA_FLAGS %make_jobs @@ -633,7 +640,6 @@ %_kde4_libdir/*.so %_kde4_libdir/*.so.* %_datadir/applications/kde4/ -%_datadir/applications/kde4/ %_datadir/dbus-1/ %_datadir/icons/Oxygen* %_datadir/icons/hicolor/*/*/* @@ -645,11 +651,15 @@ %_datadir/kde4/services/ %_datadir/kde4/servicetypes/ %_datadir/autostart/ -%if %suse_version > 1130 +%if %suse_version > 1110 %_datadir/polkit-1/ %_datadir/polkit-1/actions/org.kde.fontinst.policy %_datadir/polkit-1/actions/org.kde.kcontrol.kcmclock.policy %_datadir/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy +%else +%_datadir/PolicyKit/policy/org.kde.fontinst.policy +%_datadir/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy +%_datadir/PolicyKit/policy/org.kde.ksysguard.processlisthelper.policy %endif %dir %_kde4_libdir/strigi %_kde4_libdir/strigi/strigita_font.so ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.YRqCWh/_old 2010-12-13 17:48:44.000000000 +0100 +++ /var/tmp/diff_new_pack.YRqCWh/_new 2010-12-13 17:48:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-kdebase4 (Version 4.5.80) +# spec file for package python-kdebase4 (Version 4.5.85) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.5.80 -Release: 2 +Version: 4.5.85 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} ++++++ 4_6_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.YRqCWh/_old 2010-12-13 17:48:44.000000000 +0100 +++ /var/tmp/diff_new_pack.YRqCWh/_new 2010-12-13 17:48:44.000000000 +0100 @@ -1,9 +1,7 @@ -package: kdebase-workspace-4.5.0.tar.bz2 +package: kdebase-workspace-4.5.85.tar.bz2 kdemod: kdebase/workspace -Index: BRANCH_STATUS -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ BRANCH_STATUS 2010-11-21 20:47:03.389842356 +0100 +--- BRANCH_STATUS ++++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1163120 -+svn di between //tags/KDE/4.5.0/kdebase/workspace and //branches/KDE/4.5/kdebase/workspace ++current HEAD: 1204116 ++svn di between //trunk/KDE/kdebase/workspace@1149349 and //trunk/KDE/kdebase/workspace ++++++ kdebase-workspace-4.5.80.tar.bz2 -> kdebase-workspace-4.5.85.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.5.80.tar.bz2 kdebase4-workspace/kdebase-workspace-4.5.85.tar.bz2 differ: char 11, line 1 ++++++ no-randr-1.3.diff ++++++ --- kcontrol/randr/randrscreen.cpp.orig 2010-11-29 22:14:50.652047425 +0100 +++ kcontrol/randr/randrscreen.cpp 2010-11-29 22:17:53.429902553 +0100 @@ -25,10 +25,15 @@ #include <KConfigGroup> #include <QAction> +#ifdef HAS_RANDR_1_3 RandRScreen::RandRScreen(int screenIndex) : m_originalPrimaryOutput(0), m_proposedPrimaryOutput(0), m_resources(0) +#else +RandRScreen::RandRScreen(int screenIndex) +: m_resources(0) +#endif //HAS_RANDR_1_3 { m_index = screenIndex; m_rect = QRect(0, 0, XDisplayWidth(QX11Info::display(), m_index), @@ -39,9 +44,9 @@ RandRScreen::RandRScreen(int screenIndex loadSettings(); load(); - +#ifdef HAS_RANDR_1_3 m_originalPrimaryOutput = primaryOutput(); - +#endif // select for randr input events int mask = RRScreenChangeNotifyMask | RRCrtcChangeNotifyMask | --- kcontrol/randr/randroutput.cpp.orig 2010-11-29 22:13:57.662467561 +0100 +++ kcontrol/randr/randroutput.cpp 2010-11-29 22:14:32.102294890 +0100 @@ -524,6 +524,7 @@ void RandROutput::slotEnable() void RandROutput::slotSetAsPrimary(bool primary) { +#ifdef HAS_RANDR_1_3 if (!primary) { if (m_screen->primaryOutput() == this) @@ -537,6 +538,7 @@ void RandROutput::slotSetAsPrimary(bool kDebug() << "Setting" << m_name << "as primary output"; m_screen->setPrimaryOutput(this); } +#endif //HAS_RANDR_1_3 } RandRCrtc *RandROutput::findEmptyCrtc() --- ./powerdevil/daemon/backends/upower/xrandrbrightness.cpp.orig 2010-11-29 22:49:13.578111272 +0100 +++ ./powerdevil/daemon/backends/upower/xrandrbrightness.cpp 2010-11-29 22:49:06.039024698 +0100 @@ -53,9 +53,11 @@ XRandrBrightness::XRandrBrightness() return; } +#ifdef HAS_RANDR_1_3 if (minor > 2) m_resources = XRRGetScreenResourcesCurrent(QX11Info::display(), QX11Info::appRootWindow()); // version 1.3, faster version else +#endif //HAS_RANDR_1_3 m_resources = XRRGetScreenResources(QX11Info::display(), QX11Info::appRootWindow()); if (!m_resources) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org