Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Mon Jul 25 08:53:36 CEST 2011.
-------- --- KDE/kdebase4-workspace/kdebase4-workspace.changes 2011-07-01 11:34:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-workspace.changes 2011-07-22 17:00:40.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Jul 22 15:00:02 UTC 2011 - [email protected] + +- Remove unneeded security filters from rpmlintrc + +------------------------------------------------------------------- +Fri Jul 22 10:22:25 UTC 2011 - [email protected] + +- Add BuildRequires on libprison-devel to add barcode support to + klipper. + +------------------------------------------------------------------- +Fri Jul 22 08:43:17 UTC 2011 - [email protected] + +- Obsolete/Provide kdeaccessibility package + +------------------------------------------------------------------- +Thu Jul 21 12:34:46 UTC 2011 - [email protected] + +- Update to 4.6.95 + +------------------------------------------------------------------- python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- 4_6_BRANCH.diff Enable_direct_rendering_for_all_Mesa_drivers.diff kdebase-workspace-4.6.1-nm-09-compat.patch kdebase-workspace-4.6.5.tar.bz2 kdebase4-wallpapers.changes kdebase4-wallpapers.spec New: ---- kde-workspace-4.6.95.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:28.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:28.000000000 +0200 @@ -22,29 +22,26 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.6.5 +Version: 4.6.95 Release: 1 +BuildRequires: ConsoleKit-devel +%if %suse_version > 1140 +BuildRequires: NetworkManager-devel > 0.8.997 +%else +BuildRequires: NetworkManager-devel < 0.8.5 +%endif BuildRequires: audit-devel BuildRequires: bluez-devel -BuildRequires: ConsoleKit-devel BuildRequires: fdupes BuildRequires: google-gadgets-devel BuildRequires: gpsd-devel +BuildRequires: libQtWebKit-devel BuildRequires: libdbusmenu-qt-devel BuildRequires: libkde4-devel >= %version BuildRequires: libkdepimlibs4-devel BuildRequires: liblazy-devel -BuildRequires: libQtWebKit-devel -%if %suse_version > 1140 -BuildRequires: NetworkManager-devel > 0.8.997 -%else -BuildRequires: NetworkManager-devel < 0.8.5 -%endif -%if %suse_version < 1120 -BuildRequires: libpolkit-qt-devel -%else BuildRequires: libpolkit-qt-1-devel -%endif +BuildRequires: libprison-devel BuildRequires: libqalculate-devel BuildRequires: libqimageblitz-devel BuildRequires: libraw1394-devel @@ -60,17 +57,14 @@ %ifnarch s390 s390x BuildRequires: libsensors4-devel %endif -%if %suse_version > 1110 Requires: polkit-kde-agent-1 polkit-kde-kcmmodules-1 -%endif -Source0: kdebase-workspace-%version.tar.bz2 +Source0: kde-workspace-%version.tar.bz2 Source1: rcksysguardd Source2: titlebar_decor.png Source3: kwin-cubecap.png Source4: sysconfig.displaymanager-kdm Source91: kdebase4-workspace-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: 4_6_BRANCH.diff Patch8: kwin-suse.diff Patch18: startkde.diff Patch60: kdm-audit-log.diff @@ -100,50 +94,28 @@ Patch107: plasma-kickoff-newly-collapsing.diff Patch108: plasma-panel-resize-hint.diff Patch109: plasma-wallpaper-description.diff -Patch110: plasma-new-gpsd.diff 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 -Patch214: kwin-multihead.diff -## Additional Patch for compatbility with NM 0.9 -## As required by Factory at the moment -%if %suse_version > 1140 -Patch215: kdebase-workspace-4.6.1-nm-09-compat.patch -%endif -%if %suse_version >= 1140 -Patch216: Enable_direct_rendering_for_all_Mesa_drivers.diff -%endif Requires: kde4-kgreeter-plugins = %version Requires: kdebase4-workspace-liboxygenstyle = %version %kde4_runtime_requires -%if %suse_version == 1110 -Requires: %name-branding = 11.1 -%endif -%if %suse_version == 1120 -Requires: %name-branding = 11.2 -%endif %if %suse_version == 1130 Requires: %name-branding = 11.3 %endif -%if %suse_version > 1130 +%if %suse_version == 1140 Requires: %name-branding = 11.4 %endif +%if %suse_version > 1140 +Requires: %name-branding = 12.1 +%endif Recommends: kdebase4-SuSE kwin plasma-addons plasmoid-quickaccess python-kdebase4 -%if %suse_version < 1100 -Recommends: kdebase4-workspace-ksysguardd = %version -%else Requires: kdebase4-workspace-ksysguardd = %version -%endif Suggests: kdm kdebase4-wallpapers -%if %suse_version > 1100 Suggests: kdebase4-workspace-google-gadgets -%endif %define debug_package_requires %name = %version-%release kdelibs4-debuginfo Provides: kdebase3:/opt/kde3/bin/kicker Provides: powerdevil = 1.4.1 @@ -156,6 +128,10 @@ Provides: PolicyKit-kde = 0.2.0 Obsoletes: PolicyKit-kde < 0.2.0 Obsoletes: PolicyKit-kde-lang < 11.2 +# kdeaccessibility package used to contain Zion +# color scheme which is now in -workspace +Provides: kdeaccessibility = %{version} +Obsoletes: kdeaccessibility < %{version} %description This package contains the basic packages for a K Desktop Environment @@ -168,9 +144,8 @@ The KDE Team <[email protected]> %prep -%setup -q -n kdebase-workspace-%version -%patch0 -###KDE46: rewrite! +%setup -q -n kde-workspace-%version +###KDE47: rewrite! #%patch8 %patch18 #%patch60 @@ -188,41 +163,31 @@ %patch82 %patch88 ### Remove when KDM KCM configuration bugs are fixed +###KDE47: rediff! #%patch94 %patch98 %patch99 -%patch103 +###KDE47: rediff! +#%patch103 %patch104 %patch106 -%patch107 +###KDE47: rediff! +#%patch107 %patch108 -%patch109 -%if %suse_version > 1140 -%patch110 -%endif %patch123 -p1 %patch124 -p1 -%patch125 -%if %suse_version <= 1110 -%patch130 -%endif +###KDE47: rediff! +#%patch125 %patch201 -p1 -###KDE45: rediff! - kdm code may have added similar functionality +###KDE47: rediff - kdm code may have added similar functionality #%patch208 %patch211 -%patch214 -%if %suse_version > 1140 -%patch215 -p1 -%endif -%if %suse_version >= 1140 -%patch216 -p1 -%endif cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build +### TODO: -DKDE4_ENABLE_FINAL=1 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 @@ -282,23 +247,18 @@ Summary: The KDE Workspace Components License: GPLv2+ Group: System/GUI/KDE -%if %suse_version > 1030 #BRAND: FIXME -%if %suse_version == 1110 -Provides: %{name}-branding = 11.1 -%endif -%if %suse_version == 1120 -Provides: %{name}-branding = 11.2 -%endif %if %suse_version == 1130 Provides: %{name}-branding = 11.3 %endif -%if %suse_version > 1130 +%if %suse_version == 1140 Provides: %{name}-branding = 11.4 %endif +%if %suse_version > 1140 +Provides: %{name}-branding = 12.1 +%endif Conflicts: otherproviders(%{name}-branding) Supplements: packageand(kdebase4-workspace:branding-upstream) -%endif %description branding-upstream This package contains the basic packages for a K Desktop Environment @@ -308,23 +268,17 @@ Summary: KDE login and display manager - upstream branding License: GPLv2+ Group: System/GUI/KDE -%if %suse_version > 1030 -#BRAND: FIXME -%if %suse_version == 1110 -Provides: kdm-branding = 11.1 -%endif -%if %suse_version == 1120 -Provides: kdm-branding = 11.2 -%endif %if %suse_version == 1130 Provides: kdm-branding = 11.3 %endif -%if %suse_version > 1130 +%if %suse_version == 1140 Provides: kdm-branding = 11.4 %endif +%if %suse_version > 1140 +Provides: kdm-branding = 12.1 +%endif Conflicts: otherproviders(kdm-branding) Supplements: packageand(kdm:branding-upstream) -%endif PreReq: %fillup_prereq Provides: kde4-kdm-branding-upstream = 4.3.0 Obsoletes: kde4-kdm-branding-upstream < 4.3.0 @@ -376,8 +330,6 @@ %insserv_cleanup exit 0 -%if %suse_version > 1100 - %package google-gadgets License: GPLv2+ Group: System/GUI/KDE @@ -397,7 +349,6 @@ %post google-gadgets -p /sbin/ldconfig %postun google-gadgets -p /sbin/ldconfig -%endif %package -n kwin License: GPLv2+ @@ -405,18 +356,15 @@ Summary: KDE Window Manager Provides: windowmanager %kde4_runtime_requires -%if %suse_version == 1110 -Requires: %{name}-branding = 11.1 -%endif -%if %suse_version == 1120 -Requires: %{name}-branding = 11.2 -%endif %if %suse_version == 1130 Requires: %{name}-branding = 11.3 %endif -%if %suse_version > 1130 +%if %suse_version == 1140 Requires: %{name}-branding = 11.4 %endif +%if %suse_version > 1140 +Requires: %{name}-branding = 12.1 +%endif Provides: kdebase3:/opt/kde3/bin/kwin Provides: kde4-kwin = 4.3.0 @@ -478,18 +426,15 @@ License: GPLv2+ Group: System/GUI/KDE Summary: KDE login and display manager -%if %suse_version == 1110 -Requires: kdm-branding = 11.1 -%endif -%if %suse_version == 1120 -Requires: kdm-branding = 11.2 -%endif %if %suse_version == 1130 Requires: kdm-branding = 11.3 %endif -%if %suse_version > 1130 +%if %suse_version == 1140 Requires: kdm-branding = 11.4 %endif +%if %suse_version > 1140 +Requires: kdm-branding = 12.1 +%endif Requires: ConsoleKit-x11 xorg-x11-server Requires: kde4-kgreeter-plugins = %version Requires: pam-config @@ -540,6 +485,7 @@ -------- The KDE Team <[email protected]> + %post liboxygenstyle /sbin/ldconfig @@ -553,7 +499,7 @@ %_kde4_appsdir/kwin/titlebar_decor.png %_kde4_appsdir/ksplash/Themes/Default %dir %_kde4_wallpapersdir -%_kde4_wallpapersdir/Horos +#_kde4_wallpapersdir/Horos %files -n kdm-branding-upstream %defattr(-,root,root) @@ -571,14 +517,11 @@ %config(noreplace) %_kde4_sysconfdir/ksysguarddrc %_kde_config_dir/ksysguard.knsrc -%if %suse_version > 1100 - %files google-gadgets %defattr(-,root,root) %doc COPYING COPYING.DOC README %_kde4_modulesdir/plasma_*_ggl.so %_kde4_servicesdir/plasma-*-googlegadgets.desktop -%endif %files -n kwin -f filelists/kwin %defattr(-,root,root) @@ -593,7 +536,6 @@ %doc COPYING COPYING.DOC README /usr/include/* %_kde4_appsdir/cmake -%_kde4_libdir/cmake/KDE4Workspace-* %_kde4_libdir/liblsofui.so %_kde4_modulesdir/plugins/designer/ksysguardlsofwidgets.so %_kde4_libdir/libsolidcontrolifaces.so @@ -614,6 +556,7 @@ %_kde4_libdir/libkephal.so %_kde4_libdir/libplasma-geolocation-interface.so %_kde4_libdir/libplasmagenericshell.so +%_kde4_libdir/cmake/KDE4Workspace/ %files -n kdm -f filelists/kdm %defattr(-,root,root) @@ -629,9 +572,6 @@ %exclude %_kde4_appsdir/kdm/pics %_kde4_sbindir/rckdm %dir %_kde4_wallpapersdir -%if %suse_version < 1120 -%_datadir/PolicyKit/policy/org.kde.kcontrol.kcmkdm.policy -%endif %files -n kde4-kgreeter-plugins %defattr(-,root,root) @@ -670,16 +610,11 @@ %_datadir/kde4/services/ %_datadir/kde4/servicetypes/ %_datadir/autostart/ -%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 +%_datadir/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy %dir %_kde4_libdir/strigi %_kde4_libdir/strigi/strigita_font.so @@ -690,14 +625,11 @@ %exclude %_kde4_bindir/ksysguardd %exclude %_kde4_sysconfdir/ksysguarddrc %exclude %_kde_config_dir/ksysguard.knsrc -%if %suse_version > 1100 %exclude %_kde4_modulesdir/plasma_*_ggl.so %exclude %_kde4_servicesdir/plasma-*-googlegadgets.desktop -%endif %exclude %_kde4_servicesdir/kwin %exclude %_kde4_appsdir/kwin/default_rules/plasma_desktop_containment.kwinrules %exclude %_kde4_appsdir/cmake -%exclude %_kde4_libdir/cmake/KDE4Workspace-* %exclude %_kde4_libdir/liblsofui.so %exclude %_kde4_modulesdir/plugins/designer/ksysguardlsofwidgets.so %exclude %_kde4_libdir/libplasmagenericshell.so ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:28.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:28.000000000 +0200 @@ -18,6 +18,8 @@ Name: python-kdebase4 +BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libdbusmenu-qt-devel libkdepimlibs4-devel libqimageblitz-devel +BuildRequires: libknotificationitem-devel libsmbclient-devel libxklavier-devel python-kde4-devel %if %suse_version > 1030 BuildRequires: ConsoleKit-devel libpolkit-qt-devel %endif @@ -26,11 +28,9 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.6.5 +Version: 4.6.95 Release: 1 -BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libdbusmenu-qt-devel libkdepimlibs4-devel >= %version libqimageblitz-devel -BuildRequires: libknotificationitem-devel libsmbclient-devel libxklavier-devel python-kde4-devel >= %version -Source0: kdebase-workspace-%version.tar.bz2 +Source0: kde-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} @@ -45,7 +45,7 @@ The KDE Team <[email protected]> %prep -%setup -q -n kdebase-workspace-%version +%setup -q -n kde-workspace-%version %build %cmake_kde4 -d build ++++++ disable-python-support.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:28.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,8 +1,8 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig 2010-11-19 14:36:10.000000000 +0100 -+++ CMakeLists.txt 2010-11-21 20:47:03.838728014 +0100 -@@ -69,7 +69,6 @@ if(PYQT4_FOUND AND PYQT4_VERSION STRLESS +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -68,7 +68,6 @@ if(PYQT4_FOUND AND PYQT4_VERSION STRLESS endif(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400") macro_optional_find_package(PyKDE4) ++++++ kdebase-workspace-4.6.5.tar.bz2 -> kde-workspace-4.6.95.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.6.5.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kde-workspace-4.6.95.tar.bz2 differ: char 11, line 1 ++++++ kdebase4-workspace-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1 +1,2 @@ addFilter("untranslated-desktop-file .*/usr/share/wallpapers/.*") + ++++++ kdm-all-users-nopass.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,7 +1,7 @@ Index: kdm/backend/client.c =================================================================== ---- kdm/backend/client.c.orig 2010-11-19 11:51:17.000000000 +0100 -+++ kdm/backend/client.c 2010-11-21 20:47:03.608717921 +0100 +--- kdm/backend/client.c.orig ++++ kdm/backend/client.c @@ -462,6 +462,9 @@ isNoPassAllowed(struct passwd *pw) if (cursource != PWSRC_MANUAL) return True; @@ -14,9 +14,9 @@ if (!(pw = getpwnam(un)) || Index: kdm/config.def =================================================================== ---- kdm/config.def.orig 2010-11-21 20:47:03.509842471 +0100 -+++ kdm/config.def 2010-11-21 20:47:28.785842630 +0100 -@@ -1890,6 +1890,15 @@ Description: +--- kdm/config.def.orig ++++ kdm/config.def +@@ -1894,6 +1894,15 @@ Description: (and any other user with UID = 0). <emphasis>Never</emphasis> list <systemitem class="username">root</systemitem>. ++++++ kdm-cope-with-new-grub.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -36,4 +36,4 @@ + system(buffer); } - static char *lilo; + #define GRUB2_MENU "/boot/grub/grub.cfg" ++++++ kdm-kdmconf.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,8 +1,8 @@ Index: kdm/kfrontend/genkdmconf.c =================================================================== ---- kdm/kfrontend/genkdmconf.c.orig 2010-11-21 20:47:03.510842495 +0100 -+++ kdm/kfrontend/genkdmconf.c 2010-11-21 20:47:03.623718730 +0100 -@@ -1036,6 +1036,26 @@ copyFile(Entry *ce, int mode, int (*proc +--- kdm/kfrontend/genkdmconf.c.orig ++++ kdm/kfrontend/genkdmconf.c +@@ -1040,6 +1040,26 @@ copyFile(Entry *ce, int mode, int (*proc } static void @@ -29,7 +29,7 @@ doLinkFile(const char *name) { File file; -@@ -1074,9 +1094,10 @@ writeFile(const char *tname, int mode, c +@@ -1078,9 +1098,10 @@ writeFile(const char *tname, int mode, c fputs_(cont, f); fclose_(f); addedFile(tname); @@ -41,7 +41,7 @@ static void handleBgCfg(Entry *ce, Section *cs) { -@@ -3166,9 +3187,6 @@ int main(int argc, char **argv) +@@ -3170,9 +3191,6 @@ int main(int argc, char **argv) memcmp(oldkde + olen - sizeof(SHR_CONF) + 1, SHR_CONF, sizeof(SHR_CONF))) { @@ -51,7 +51,7 @@ oldkdepfx = oldkde; } else ASPrintf((char **)&oldkdepfx, -@@ -3280,6 +3298,8 @@ int main(int argc, char **argv) +@@ -3284,6 +3302,8 @@ int main(int argc, char **argv) f = createFile("kdmrc", kdmrcmode); writeKdmrc(f); fclose_(f); @@ -60,7 +60,7 @@ f = createFile("README", 0644); fprintf_(f, -@@ -3328,6 +3348,8 @@ int main(int argc, char **argv) +@@ -3332,6 +3352,8 @@ int main(int argc, char **argv) "\nTry 'genkdmconf --help' if you want to generate another configuration.\n" "\nYou may delete this README.\n"); fclose_(f); ++++++ kdm-long-xserver-timeout.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -7,9 +7,9 @@ Index: kdm/config.def =================================================================== ---- kdm/config.def.orig 2010-11-21 20:47:03.609717629 +0100 -+++ kdm/config.def 2010-11-21 20:47:03.708718667 +0100 -@@ -1359,7 +1359,7 @@ Description: +--- kdm/config.def.orig ++++ kdm/config.def +@@ -1363,7 +1363,7 @@ Description: Key: ServerTimeout Type: int ++++++ kdm-make_it_cool.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,7 +1,7 @@ Index: kdm/kfrontend/kgreeter.cpp =================================================================== ---- kdm/kfrontend/kgreeter.cpp.orig 2010-08-05 18:55:46.000000000 +0200 -+++ kdm/kfrontend/kgreeter.cpp 2010-11-21 20:47:03.567842759 +0100 +--- kdm/kfrontend/kgreeter.cpp.orig ++++ kdm/kfrontend/kgreeter.cpp @@ -68,20 +68,20 @@ Foundation, Inc., 51 Franklin Street, Fi class UserListView : public QListWidget { @@ -175,8 +175,8 @@ } else { Index: kdm/kfrontend/kgreeter.h =================================================================== ---- kdm/kfrontend/kgreeter.h.orig 2010-07-06 08:54:31.000000000 +0200 -+++ kdm/kfrontend/kgreeter.h 2010-11-21 20:47:03.567842759 +0100 +--- kdm/kfrontend/kgreeter.h.orig ++++ kdm/kfrontend/kgreeter.h @@ -70,7 +70,7 @@ class KGreeter : public KGDialog, public protected: @@ -188,8 +188,8 @@ virtual void pluginSetup(); Index: kdm/kfrontend/themer/kdmitem.cpp =================================================================== ---- kdm/kfrontend/themer/kdmitem.cpp.orig 2010-07-06 08:54:31.000000000 +0200 -+++ kdm/kfrontend/themer/kdmitem.cpp 2010-11-21 20:47:03.567842759 +0100 +--- kdm/kfrontend/themer/kdmitem.cpp.orig ++++ kdm/kfrontend/themer/kdmitem.cpp @@ -65,7 +65,6 @@ KdmItem::KdmItem(QObject *parent, const !modes.split(",", QString::SkipEmptyParts).contains("console")))) { @@ -208,8 +208,8 @@ Index: kdm/kfrontend/themer/kdmlist.cpp =================================================================== ---- kdm/kfrontend/themer/kdmlist.cpp.orig 2010-07-06 08:54:31.000000000 +0200 -+++ kdm/kfrontend/themer/kdmlist.cpp 2010-11-21 20:47:03.568842387 +0100 +--- kdm/kfrontend/themer/kdmlist.cpp.orig ++++ kdm/kfrontend/themer/kdmlist.cpp @@ -29,8 +29,6 @@ KdmList::KdmList(QObject *parent, const : KdmItem(parent, node) { @@ -221,9 +221,9 @@ QDomNodeList childList = node.childNodes(); Index: kdm/kfrontend/themer/kdmthemer.cpp =================================================================== ---- kdm/kfrontend/themer/kdmthemer.cpp.orig 2010-07-06 08:54:31.000000000 +0200 -+++ kdm/kfrontend/themer/kdmthemer.cpp 2010-11-21 20:47:03.568842387 +0100 -@@ -224,10 +224,6 @@ KdmThemer::generateItems(KdmItem *parent +--- kdm/kfrontend/themer/kdmthemer.cpp.orig ++++ kdm/kfrontend/themer/kdmthemer.cpp +@@ -223,10 +223,6 @@ KdmThemer::generateItems(KdmItem *parent } else { continue; } ++++++ kdm-suspend-hal.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,7 +1,7 @@ Index: kdm/backend/ctrl.c =================================================================== ---- kdm/backend/ctrl.c.orig 2010-08-05 18:55:40.000000000 +0200 -+++ kdm/backend/ctrl.c 2010-11-21 20:47:03.492842634 +0100 +--- kdm/backend/ctrl.c.orig ++++ kdm/backend/ctrl.c @@ -499,6 +499,10 @@ processCtrl(const char *string, int len, Reply("nuke\t"); } @@ -15,8 +15,8 @@ { Index: kdm/backend/greet.h =================================================================== ---- kdm/backend/greet.h.orig 2010-07-06 08:54:30.000000000 +0200 -+++ kdm/backend/greet.h 2010-11-21 20:47:03.492842634 +0100 +--- kdm/backend/greet.h.orig ++++ kdm/backend/greet.h @@ -150,6 +150,7 @@ from the copyright holder. # define SHUT_REBOOT 1 /* how */ # define SHUT_HALT 2 @@ -27,9 +27,9 @@ # define SHUT_FORCENOW 2 Index: kdm/config.def =================================================================== ---- kdm/config.def.orig 2010-10-12 15:07:22.000000000 +0200 -+++ kdm/config.def 2010-11-21 20:47:31.380718279 +0100 -@@ -1794,6 +1794,19 @@ Description: +--- kdm/config.def.orig ++++ kdm/config.def +@@ -1798,6 +1798,19 @@ Description: Who is allowed to shut down the system. This applies both to the greeter and to the command sockets. @@ -51,8 +51,8 @@ None: no forced shutdown is allowed at all Index: kdm/kfrontend/CMakeLists.txt =================================================================== ---- kdm/kfrontend/CMakeLists.txt.orig 2010-10-27 21:55:03.000000000 +0200 -+++ kdm/kfrontend/CMakeLists.txt 2010-11-21 20:47:31.380718279 +0100 +--- kdm/kfrontend/CMakeLists.txt.orig ++++ kdm/kfrontend/CMakeLists.txt @@ -4,10 +4,14 @@ add_subdirectory( themes ) add_subdirectory( pics ) add_subdirectory( sessions ) @@ -79,8 +79,8 @@ endif (X11_XTest_FOUND) Index: kdm/kfrontend/kdmshutdown.cpp =================================================================== ---- kdm/kfrontend/kdmshutdown.cpp.orig 2010-07-06 08:54:31.000000000 +0200 -+++ kdm/kfrontend/kdmshutdown.cpp 2010-11-21 20:47:03.494842502 +0100 +--- kdm/kfrontend/kdmshutdown.cpp.orig ++++ kdm/kfrontend/kdmshutdown.cpp @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fi */ @@ -264,8 +264,8 @@ { Index: kdm/kfrontend/kdmshutdown.h =================================================================== ---- kdm/kfrontend/kdmshutdown.h.orig 2010-07-06 08:54:31.000000000 +0200 -+++ kdm/kfrontend/kdmshutdown.h 2010-11-21 20:47:03.494842502 +0100 +--- kdm/kfrontend/kdmshutdown.h.orig ++++ kdm/kfrontend/kdmshutdown.h @@ -67,7 +67,7 @@ class KDMShutdownBase : public FDialog, #else static const bool willShut = true; ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdm/config.def +Index: kdm/config.def +=================================================================== +--- kdm/config.def.orig +++ kdm/config.def -@@ -168,6 +168,9 @@ +@@ -171,6 +171,9 @@ Core config for 1st local display [X-:0-Core] @@ -10,7 +12,7 @@ Greeter config for 1st local display [X-:0-Greeter] </kdmrc> -@@ -791,6 +794,21 @@ +@@ -794,6 +797,21 @@ Description: <emphasis>Do not</emphasis> change it, you may interfere with future upgrades and this could result in &kdm; failing to run. @@ -32,7 +34,7 @@ Key: PAMService If: defined(USE_PAM) Type: string -@@ -873,10 +891,10 @@ +@@ -876,10 +894,10 @@ Description: Key: PidFile Type: string @@ -46,7 +48,7 @@ Comment: Where &kdm; should store its PID (do not store if empty). Description: -@@ -900,10 +918,10 @@ +@@ -903,10 +921,10 @@ Description: Key: AuthDir Type: path # differs from XDM @@ -60,7 +62,7 @@ Comment: Where to store authorization files. Description: -@@ -929,7 +947,7 @@ +@@ -932,7 +950,7 @@ Description: Key: ExportList Type: list @@ -69,7 +71,7 @@ User: core Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR" Merge: xdm(P_list) -@@ -1073,9 +1091,10 @@ +@@ -1076,9 +1094,10 @@ Description: Key: Enable Type: bool @@ -81,7 +83,7 @@ Comment: & Description: Whether &kdm; should listen to incoming &XDMCP; requests. -@@ -1096,7 +1115,7 @@ +@@ -1099,7 +1118,7 @@ Description: Key: KeyFile Type: string @@ -90,7 +92,7 @@ User: core Instance: #KDMCONF "/kdmkeys" Update: cp_keyfile -@@ -1112,11 +1131,10 @@ +@@ -1115,11 +1134,10 @@ Description: Key: Xaccess Type: string # differs from xdm @@ -105,7 +107,7 @@ Comment: &XDMCP; access control file in the usual XDM-Xaccess format. Description: -@@ -1174,13 +1192,11 @@ +@@ -1177,13 +1195,11 @@ Description: Key: Willing Type: string @@ -121,16 +123,16 @@ Comment: The program which is invoked to dynamically generate replies to &XDMCP; DirectQuery or BroadcastQuery requests. -@@ -1254,7 +1270,7 @@ - None/BO_NONE: no boot manager +@@ -1258,7 +1274,7 @@ Type: enum Grub/BO_GRUB: Grub boot manager + Grub2/BO_GRUB2: Grub2 boot manager Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only) -Default: None +Default: Grub User: core User: greeter Instance: #Grub -@@ -1356,7 +1372,7 @@ +@@ -1360,7 +1376,7 @@ Type: string Default: DEF_SERVER_CMD DDefault: - User: core @@ -139,7 +141,7 @@ Update: upd_servercmd Comment: The command line to start the &X-Server;, without display number and VT spec. -@@ -1369,13 +1385,13 @@ +@@ -1373,13 +1389,13 @@ Description: This string is subject to word splitting. </para><para> The default is something reasonable for the system on which &kdm; was built, @@ -155,7 +157,7 @@ Comment: & Description: Additional arguments for the &X-Server;s for local sessions. -@@ -1474,6 +1490,8 @@ +@@ -1478,6 +1494,8 @@ Type: bool Default: false User: core Instance: #:*/! @@ -164,7 +166,7 @@ Merge: xdm Comment: Restart instead of resetting the local &X-Server; after session exit. -@@ -1548,11 +1566,10 @@ +@@ -1552,11 +1570,10 @@ Description: Key: Resources # XXX strictly speaking this is supposed to be a string list, i think. Type: string @@ -178,7 +180,7 @@ Comment: Specify a file with X-resources for the greeter, chooser and background. The KDE frontend does not use this file, so you do not need it unless you -@@ -1580,12 +1597,11 @@ +@@ -1584,12 +1601,11 @@ Description: Key: Setup Type: string @@ -193,7 +195,7 @@ Comment: A program to run before the greeter is shown. Can be used to start an xconsole or an alternative background generator. Subject to word splitting. -@@ -1601,12 +1617,11 @@ +@@ -1605,12 +1621,11 @@ Description: Key: Startup Type: string @@ -208,7 +210,7 @@ Comment: A program to run before a user session starts. Subject to word splitting. Description: -@@ -1619,12 +1634,11 @@ +@@ -1623,12 +1638,11 @@ Description: Key: Reset Type: string @@ -223,7 +225,7 @@ Comment: A program to run after a user session exits. Subject to word splitting. Description: -@@ -1637,12 +1651,12 @@ +@@ -1641,12 +1655,12 @@ Description: Key: Session Type: string @@ -238,7 +240,7 @@ Comment: The program which is run as the user which logs in. It is supposed to interpret the session argument (see SessionsDirs) and start an appropriate -@@ -1754,10 +1768,11 @@ +@@ -1758,10 +1772,11 @@ Description: Key: AllowRootLogin Type: bool @@ -252,7 +254,7 @@ Merge: xdm Comment: Allow root logins? -@@ -1772,6 +1787,7 @@ +@@ -1776,6 +1791,7 @@ User: core # sensible? Instance: */false Instance: :*/true @@ -260,7 +262,7 @@ Merge: xdm Comment: Allow to log in, when user has set an empty password? -@@ -1783,12 +1799,13 @@ +@@ -1787,12 +1803,13 @@ Type: enum None/SHUT_NONE: no <guilabel>Shutdown...</guilabel> menu entry is shown at all Root/SHUT_ROOT: the <systemitem class="username">root</systemitem> password must be entered to shut down All/SHUT_ALL: everybody can shut down the machine @@ -277,7 +279,7 @@ Comment: & Description: Who is allowed to shut down the system. This applies both to the -@@ -1865,6 +1882,7 @@ +@@ -1882,6 +1899,7 @@ Type: bool Default: false User: dep Instance: #:0/true @@ -285,7 +287,7 @@ Comment: & Description: Enable automatic login. <emphasis>Use with extreme care!</emphasis> -@@ -1898,7 +1916,7 @@ +@@ -1915,7 +1933,7 @@ Default: "" PostProc: PautoLoginX User: core(autoUser) User: greeter @@ -294,7 +296,7 @@ Merge: xdm:autoUser(P_autoUser) Comment: & Description: -@@ -1929,10 +1947,10 @@ +@@ -1946,10 +1964,10 @@ Description: Key: SessionsDirs Type: list @@ -307,7 +309,7 @@ Update: upd_sessionsdirs Comment: The directories containing session type definitions in .desktop format, -@@ -2001,7 +2019,7 @@ +@@ -2018,7 +2036,7 @@ Description: Key: UseSessReg Type: bool @@ -316,7 +318,7 @@ User: core Instance: #*/! Comment: -@@ -2047,7 +2065,8 @@ +@@ -2064,7 +2082,8 @@ Type: enum Clock/LOGO_CLOCK: a neat analog clock Default: Clock User: greeter @@ -326,7 +328,7 @@ Comment: What should be shown in the greeter's logo are: Description: -@@ -2263,7 +2282,7 @@ +@@ -2280,7 +2299,7 @@ Description: Key: HiddenUsers Type: list @@ -335,7 +337,7 @@ User: greeter-c(noUsers) Instance: #*/"root" # depends on {Min,Max}ShowUID -@@ -2409,7 +2428,7 @@ +@@ -2426,7 +2445,7 @@ Description: Key: UseBackground Type: bool @@ -344,7 +346,7 @@ User: greeter Instance: #*/! Comment: -@@ -2569,6 +2588,7 @@ +@@ -2586,6 +2605,7 @@ Type: bool Default: false User: greeter Instance: :0/true @@ -352,7 +354,7 @@ Comment: Enable &kdm;'s built-in xconsole. Note that this can be enabled for only one display at a time. -@@ -2657,9 +2677,9 @@ +@@ -2674,9 +2694,9 @@ Description: Key: Preloader Type: string @@ -364,7 +366,7 @@ Update: upd_preloader Comment: & Description: -@@ -2669,7 +2689,7 @@ +@@ -2686,7 +2706,7 @@ Description: Key: UseTheme Type: bool @@ -373,7 +375,7 @@ User: greeter Instance: */true Comment: & -@@ -2678,9 +2698,10 @@ +@@ -2695,9 +2715,10 @@ Description: Key: Theme Type: string @@ -386,17 +388,21 @@ Comment: & Description: The theme to use for the greeter. Can point to either a directory or an XML ---- kdm/kfrontend/CMakeLists.txt +Index: kdm/kfrontend/CMakeLists.txt +=================================================================== +--- kdm/kfrontend/CMakeLists.txt.orig +++ kdm/kfrontend/CMakeLists.txt -@@ -114,3 +114,5 @@ +@@ -118,3 +118,5 @@ install(TARGETS kdmctl ${INSTALL_TARGETS install(CODE " exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) ") + +install( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/read_sysconfig.sh DESTINATION ${DATA_INSTALL_DIR}/kdm ) ---- kdm/kfrontend/genkdmconf.c +Index: kdm/kfrontend/genkdmconf.c +=================================================================== +--- kdm/kfrontend/genkdmconf.c.orig +++ kdm/kfrontend/genkdmconf.c -@@ -53,6 +53,7 @@ +@@ -53,6 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include <config.ci> #define RCVERSTR stringify(RCVERMAJOR) "." stringify(RCVERMINOR) @@ -404,7 +410,7 @@ static int old_scripts, no_old_scripts, old_confs, no_old, no_backup, no_in_notice, use_destdir, mixed_scripts; -@@ -60,7 +61,7 @@ +@@ -60,7 +61,7 @@ static const char *newdir = KDMCONF, *fa *oldxdm, *oldkde, *oldkdepfx; static int oldver; @@ -413,7 +419,7 @@ typedef struct StrList { struct StrList *next; -@@ -542,6 +543,7 @@ +@@ -542,6 +543,7 @@ writeKdmrc(FILE *f) const char *cmt; putFqVal("General", "ConfigVersion", RCVERSTR); @@ -421,7 +427,7 @@ for (cs = config; cs; cs = cs->next) { fprintf_(f, "%s[%s]\n", cs->comment ? cs->comment : "\n", cs->name); -@@ -1633,6 +1635,26 @@ +@@ -1637,6 +1639,26 @@ upd_servercmd(Entry *ce, Section *cs ATT ce->written = True; } @@ -448,7 +454,7 @@ #ifdef XDMCP static void cp_keyfile(Entry *ce, Section *cs ATTR_UNUSED) -@@ -2625,7 +2647,7 @@ +@@ -2629,7 +2651,7 @@ static int mergeKdmRcNewer(const char *path, int obsRet) { char *p; @@ -457,7 +463,7 @@ RSection *rootsect, *cs; REntry *ce; int i, j, ma, mi; -@@ -2651,6 +2673,9 @@ +@@ -2655,6 +2677,9 @@ mergeKdmRcNewer(const char *path, int ob p, ma, mi); free(p); @@ -467,7 +473,7 @@ for (cs = rootsect; cs; cs = cs->next) { cp = strrchr(cs->name, '-'); if (!cp) -@@ -2696,7 +2721,7 @@ +@@ -2700,7 +2725,7 @@ mergeKdmRcNewer(const char *path, int ob ; } @@ -476,9 +482,11 @@ return True; } ---- kdm/kfrontend/kdm_config.c +Index: kdm/kfrontend/kdm_config.c +=================================================================== +--- kdm/kfrontend/kdm_config.c.orig +++ kdm/kfrontend/kdm_config.c -@@ -396,7 +396,7 @@ +@@ -396,7 +396,7 @@ static const char *kdmrc = KDMCONF "/kdm static Section *rootsec; static void @@ -487,7 +495,7 @@ { const char *nstr, *dstr, *cstr, *dhost, *dnum, *dclass; char *s, *e, *st, *en, *ek, *sl, *pt; -@@ -406,14 +406,9 @@ +@@ -406,14 +406,9 @@ readConfig() int nlen, dlen, clen, dhostl, dnuml, dclassl; int i, line, sectmoan, restl; File file; @@ -504,7 +512,7 @@ return; for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) { -@@ -439,7 +434,7 @@ +@@ -439,7 +434,7 @@ readConfig() e--; if (*e != ']') { cursec = 0; @@ -513,7 +521,7 @@ continue; } nstr = sl + 1; -@@ -449,7 +444,7 @@ +@@ -449,7 +444,7 @@ readConfig() !memcmp(nstr, cursec->name, nlen)) { logInfo("Multiple occurrences of section [%.*s] in %s. " @@ -522,7 +530,7 @@ goto secfnd; } if (nstr[0] == 'X' && nstr[1] == '-') { -@@ -505,7 +500,7 @@ +@@ -505,7 +500,7 @@ readConfig() illsec: cursec = 0; logError("Unrecognized section name [%.*s] at %s:%d\n", @@ -531,7 +539,7 @@ continue; newsec: if (!(cursec = Malloc(sizeof(*cursec)))) -@@ -533,7 +528,7 @@ +@@ -533,7 +528,7 @@ readConfig() if (!cursec) { if (sectmoan) { sectmoan = False; @@ -540,7 +548,7 @@ } goto sktoeol; } -@@ -541,13 +536,13 @@ +@@ -541,13 +536,13 @@ readConfig() for (; (s < file.eof) && (*s != '\n'); s++) if (*s == '=') goto haveeq; @@ -556,7 +564,7 @@ goto sktoeol; } if (!isspace(*ek)) -@@ -561,7 +556,7 @@ +@@ -561,7 +556,7 @@ readConfig() if (*s == '\\') { s++; if (s >= file.eof || *s == '\n') { @@ -565,7 +573,7 @@ break; } switch (*s) { -@@ -590,13 +585,13 @@ +@@ -590,13 +585,13 @@ readConfig() goto keyok; } logError("Unrecognized key '%.*s' in section [%.*s] at %s:%d\n", @@ -581,7 +589,7 @@ goto keyfnd; } if (!(curent = Malloc(sizeof(*curent)))) -@@ -612,6 +607,20 @@ +@@ -612,6 +607,20 @@ readConfig() } } @@ -602,7 +610,9 @@ static Entry * findGEnt(int id) { ---- kdm/kfrontend/read_sysconfig.sh +Index: kdm/kfrontend/read_sysconfig.sh +=================================================================== +--- /dev/null +++ kdm/kfrontend/read_sysconfig.sh @@ -0,0 +1,160 @@ +#!/bin/bash ++++++ kwin-suse.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,5 +1,3 @@ -Subject: put SUSE logo into kwin titlebar -Patch-upstream: no --- kwin/clients/oxygen/oxygenclient.cpp +++ kwin/clients/oxygen/oxygenclient.cpp @@ -59,6 +59,9 @@ ++++++ pam-translate.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,8 +1,8 @@ Index: libs/kdm/kgreet_generic.cpp =================================================================== ---- libs/kdm/kgreet_generic.cpp.orig -+++ libs/kdm/kgreet_generic.cpp -@@ -164,7 +164,9 @@ KGenericGreeter::textMessage(const char +--- libs/kdm/kgreet_generic.cpp.orig 2010-07-06 08:54:28.000000000 +0200 ++++ libs/kdm/kgreet_generic.cpp 2010-11-21 20:47:03.809718230 +0100 +@@ -141,7 +141,9 @@ KGenericGreeter::textMessage(const char if (m_infoMsgs.isEmpty()) revive(); @@ -11,18 +11,17 @@ + //(void) I18N_NOOP(""); + QString qtext = i18n( text ); m_infoMsgs.append(qtext); - m_messageLabel->setText( m_infoMsgs.join( "\n" )); + QLabel *label = new QLabel(qtext, m_parentWidget); + m_grid->addWidget(label, m_line++, 0, 1, 2); +@@ -169,7 +171,10 @@ KGenericGreeter::textPrompt(const char * + else + m_infoMsgs.clear(); -@@ -193,7 +195,11 @@ KGenericGreeter::textPrompt(const char * - m_children.append(m_label); - m_echo = echo; - -- m_label->setText( QString::fromUtf8( prompt ).trimmed()); +- QLabel *label = new QLabel(QString::fromUtf8(prompt).trimmed()); + // PAM does not translate these + ( void ) I18N_NOOP( "Password: " ); + ( void ) I18N_NOOP( "Password or swipe finger: " ); -+ m_label->setText( i18n( prompt ).trimmed()); -+ - m_lineEdit->setContextMenuPolicy( Qt::NoContextMenu ); - m_lineEdit->setCompletionObject( 0 ); - m_lineEdit->disconnect( this ); ++ QLabel *label = new QLabel(i18n( prompt ).trimmed()); + m_grid->addWidget(label, m_line, 0); + m_children.append(label); + m_echo = echo; ++++++ plasma-branding-defaults-applets.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,7 +1,7 @@ Index: plasma/desktop/applets/kickoff/applet/applet.cpp =================================================================== ---- plasma/desktop/applets/kickoff/applet/applet.cpp.orig 2010-11-05 11:47:50.000000000 +0100 -+++ plasma/desktop/applets/kickoff/applet/applet.cpp 2010-11-21 20:47:03.734717865 +0100 +--- plasma/desktop/applets/kickoff/applet/applet.cpp.orig ++++ plasma/desktop/applets/kickoff/applet/applet.cpp @@ -27,6 +27,7 @@ #include <QtGui/QVBoxLayout> #include <QtGui/QLabel> @@ -10,7 +10,7 @@ // KDE #include <KAuthorized> -@@ -188,7 +189,10 @@ void LauncherApplet::toolTipAboutToShow( +@@ -191,7 +192,10 @@ void LauncherApplet::toolTipAboutToShow( void LauncherApplet::configChanged() { KConfigGroup cg = config(); @@ -22,7 +22,7 @@ constraintsEvent(Plasma::ImmutableConstraint); if (d->launcher) { -@@ -207,7 +211,12 @@ void LauncherApplet::configAccepted() +@@ -210,7 +214,12 @@ void LauncherApplet::configAccepted() d->createLauncher(); KConfigGroup cg = config(); @@ -38,8 +38,8 @@ Index: plasma/desktop/applets/kickoff/core/favoritesmodel.cpp =================================================================== ---- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp.orig 2010-05-27 19:23:43.000000000 +0200 -+++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp 2010-11-21 20:47:03.735718347 +0100 +--- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp.orig ++++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp @@ -167,6 +167,11 @@ FavoritesModel::~FavoritesModel() void FavoritesModel::add(const QString& url) @@ -54,8 +54,8 @@ Index: plasma/desktop/applets/kickoff/core/models.cpp =================================================================== ---- plasma/desktop/applets/kickoff/core/models.cpp.orig 2009-10-15 18:33:38.000000000 +0200 -+++ plasma/desktop/applets/kickoff/core/models.cpp 2010-11-21 20:47:03.735718347 +0100 +--- plasma/desktop/applets/kickoff/core/models.cpp.orig ++++ plasma/desktop/applets/kickoff/core/models.cpp @@ -177,7 +177,19 @@ QStringList Kickoff::systemApplicationLi { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); @@ -79,8 +79,8 @@ } Index: plasma/desktop/applets/kickoff/core/systemmodel.cpp =================================================================== ---- plasma/desktop/applets/kickoff/core/systemmodel.cpp.orig 2010-04-15 10:59:33.000000000 +0200 -+++ plasma/desktop/applets/kickoff/core/systemmodel.cpp 2010-11-21 20:47:03.736717501 +0100 +--- plasma/desktop/applets/kickoff/core/systemmodel.cpp.orig ++++ plasma/desktop/applets/kickoff/core/systemmodel.cpp @@ -81,7 +81,7 @@ public: connect(placesModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), q, SLOT(sourceRowsRemoved(QModelIndex, int, int))); @@ -139,8 +139,8 @@ if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) { Index: plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp =================================================================== ---- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.orig 2010-11-19 11:51:20.000000000 +0100 -+++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010-11-21 20:47:03.737717526 +0100 +--- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.orig ++++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp @@ -36,6 +36,7 @@ #include <QtGui/QSpacerItem> #include <QtGui/QListWidget> @@ -161,19 +161,3 @@ } } d->formattype = NameDescription; -Index: plasma/desktop/applets/kickoff/ui/brandingbutton.cpp -=================================================================== ---- plasma/desktop/applets/kickoff/ui/brandingbutton.cpp.orig 2009-09-16 13:40:52.000000000 +0200 -+++ plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2010-11-21 20:47:03.737717526 +0100 -@@ -69,7 +69,10 @@ void BrandingButton::checkBranding() - void BrandingButton::openHomepage() - { - //FIXME: 4.3 .. add a brandingConfig to Theme -- KUrl home("http://www.kde.org";); -+ KConfig config("kickoffrc"); -+ KConfigGroup group = config.group("Branding"); -+ KUrl home(group.readEntry("Homepage", "http://www.kde.org/";)); -+ - QString themePath = KStandardDirs::locate("data", "desktoptheme/" + - Plasma::Theme::defaultTheme()->themeName() + - "/metadata.desktop"); ++++++ plasma-dashboard-leave.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,8 +1,8 @@ Index: plasma/desktop/shell/dashboardview.cpp =================================================================== ---- plasma/desktop/shell/dashboardview.cpp.orig 2010-07-24 11:43:13.000000000 +0200 -+++ plasma/desktop/shell/dashboardview.cpp 2010-11-21 20:47:03.765718635 +0100 -@@ -225,6 +225,15 @@ bool DashboardView::eventFilter(QObject +--- plasma/desktop/shell/dashboardview.cpp.orig ++++ plasma/desktop/shell/dashboardview.cpp +@@ -224,6 +224,15 @@ bool DashboardView::eventFilter(QObject widgetExplorer->setPos(0, containment()->geometry().height() - widgetExplorer->geometry().height()); } ++++++ plasma-panel-resize-hint.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,41 +1,41 @@ Index: plasma/desktop/shell/panelcontroller.cpp =================================================================== ---- plasma/desktop/shell/panelcontroller.cpp.orig 2010-10-05 13:39:06.000000000 +0200 -+++ plasma/desktop/shell/panelcontroller.cpp 2010-11-21 20:47:03.782718456 +0100 -@@ -627,6 +627,8 @@ void PanelController::mouseMoveFilter(QM +--- plasma/desktop/shell/panelcontroller.cpp.orig ++++ plasma/desktop/shell/panelcontroller.cpp +@@ -654,6 +654,8 @@ void PanelController::mouseMoveFilter(QM newX = qMin(newX, screenGeom.left() + screenGeom.width()/3); move(newX, pos().y()); resizeFrameHeight(geometry().left() - screenGeom.left()); -+ m_sizeTool->setText(i18n("Width: %1", geometry().left() - screenGeom.left())); -+ ++ m_sizeTool->setText(i18n("Width: %1", screenGeom.left() + (mapToGlobal(event->pos()).x() - ++ m_startDragControllerPos.x()))); break; } case Plasma::RightEdge: { -@@ -635,6 +637,8 @@ void PanelController::mouseMoveFilter(QM +@@ -662,6 +664,8 @@ void PanelController::mouseMoveFilter(QM newX = qMax(newX, screenGeom.left() + 2*(screenGeom.width()/3) - width()); move(newX, pos().y()); resizeFrameHeight(screenGeom.right() - geometry().right()); -+ m_sizeTool->setText(i18n("Width: %1", screenGeom.right() - geometry().right())); -+ ++ m_sizeTool->setText(i18n("Width: %1", screenGeom.right() - (mapToGlobal(event->pos()).x() - ++ m_startDragControllerPos.x()) - width() + 1)); break; } case Plasma::TopEdge: { -@@ -643,6 +647,9 @@ void PanelController::mouseMoveFilter(QM +@@ -670,6 +674,9 @@ void PanelController::mouseMoveFilter(QM newY = qMin(newY, screenGeom.top() + screenGeom.height()/3); move(pos().x(), newY); resizeFrameHeight(geometry().top() - screenGeom.top()); -+ m_sizeTool->setText(i18n("Height: %1", geometry().top() - screenGeom.top())); -+ ++ m_sizeTool->setText(i18n("Height: %1", screenGeom.top() + (mapToGlobal(event->pos()).y() - ++ m_startDragControllerPos.y()))); + break; } case Plasma::BottomEdge: -@@ -652,6 +659,8 @@ void PanelController::mouseMoveFilter(QM +@@ -679,6 +686,8 @@ void PanelController::mouseMoveFilter(QM newY = qMax(newY, screenGeom.top() + 2*(screenGeom.height()/3) - height()); move(pos().x(), newY); resizeFrameHeight(screenGeom.bottom() - geometry().bottom()); -+ m_sizeTool->setText(i18n("Height: %1", screenGeom.bottom() - geometry().bottom())); -+ ++ m_sizeTool->setText(i18n("Height: %1", screenGeom.bottom() - (mapToGlobal(event->pos()).y() - ++ m_startDragControllerPos.y()) - height() + 1)); break; } } ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -2,7 +2,7 @@ # This script is called automatically during autobuild checkin. version=$(grep '^Version:.*' kdebase4-workspace.spec) -for change in kdebase4-wallpapers python-kdebase4; do +for change in python-kdebase4; do cp -f kdebase4-workspace.changes $change.changes sed -i -e "s,Version:.*,$version," ${change}.spec done ++++++ startkde.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,8 +1,6 @@ -Index: startkde.cmake -=================================================================== ---- startkde.cmake.orig 2010-10-27 21:55:06.000000000 +0200 -+++ startkde.cmake 2010-11-21 20:47:29.435718302 +0100 -@@ -88,6 +88,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD +--- startkde.cmake 2011-06-22 16:29:19.000000000 +0200 ++++ startkde.cmake 2011-06-28 20:20:35.408688730 +0200 +@@ -88,6 +88,9 @@ mkdir -m 700 -p $kdehome mkdir -m 700 -p $kdehome/share mkdir -m 700 -p $kdehome/share/config @@ -10,9 +8,9 @@ +cp /etc/kde4/share/config/startupconfigkeys $kdehome/share/config/startupconfigkeys +else cat >$kdehome/share/config/startupconfigkeys <<EOF - kcminputrc Mouse cursorTheme 'Oxygen_Black' + kcminputrc Mouse cursorTheme 'Oxygen_White' kcminputrc Mouse cursorSize '' -@@ -102,6 +105,7 @@ krandrrc [Screen3] +@@ -102,6 +105,7 @@ kcmfonts General forceFontDPI 0 kdeglobals Locale Language '' # trigger requesting languages from KLocale EOF @@ -20,7 +18,7 @@ kstartupconfig4 returncode=$? if test $returncode -ne 0; then -@@ -181,7 +185,7 @@ fi +@@ -181,7 +185,7 @@ libpath=`kde4-config --path lib | tr : '\n'` ++++++ systemsettings-desktop.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,7 +1,7 @@ Index: systemsettings/app/systemsettings.desktop =================================================================== ---- systemsettings/app/systemsettings.desktop.orig 2010-11-05 11:47:11.000000000 +0100 -+++ systemsettings/app/systemsettings.desktop 2010-11-21 20:47:03.637718287 +0100 +--- systemsettings/app/systemsettings.desktop.orig ++++ systemsettings/app/systemsettings.desktop @@ -5,7 +5,7 @@ Type=Application X-DocPath=systemsettings/index.html X-KDE-StartupNotify=true @@ -11,7 +11,7 @@ GenericName[ar]=إعدادات النظام GenericName[ast]=Preferencies del sistema GenericName[be@latin]=Systemnyja nałady -@@ -85,7 +85,7 @@ GenericName[x-test]=xxSystem Settingsxx +@@ -87,7 +87,7 @@ GenericName[x-test]=xxSystem Settingsxx GenericName[zh_CN]=系统设置 GenericName[zh_TW]=系統設定 @@ -20,7 +20,7 @@ Name[ar]=إعدادات النظام Name[ast]=Preferencies del sistema Name[be]=Сістэмныя настаўленні -@@ -170,4 +170,4 @@ Name[zh_CN]=系统设置 +@@ -174,4 +174,4 @@ Name[zh_CN]=系统设置 Name[zh_TW]=系統設定 X-DBUS-StartupType=Unique ++++++ systemsettings-root-kcm.diff ++++++ --- /var/tmp/diff_new_pack.oFgsEi/_old 2011-07-25 08:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oFgsEi/_new 2011-07-25 08:48:29.000000000 +0200 @@ -1,5 +1,3 @@ -Subject: run the KCM as root - probably unnecessary now that the KCM is ported to KAuth -Patch-upstream: no Index: systemsettings/core/ModuleView.cpp =================================================================== --- systemsettings/core/ModuleView.cpp.orig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
