Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory
checked in at Mon Nov 22 23:40:58 CET 2010.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-11-15 15:33:07.000000000 +0100
+++ kdebase4-workspace/kdebase4-wallpapers.changes 2010-11-22 23:39:02.868639000 +0100
@@ -1,0 +2,16 @@
+Sun Nov 21 20:41:50 UTC 2010 - coolo@novell.com
+
+- disable enable-final for the moment and sort buildrequires
+
+-------------------------------------------------------------------
+Fri Nov 19 17:10:55 CET 2010 - dmueller@suse.de
+
+- update to 4.5.80
+ * KDE 4.6 Beta1
+ * no upstream changelog available.
+ * Removed patches
+ kdebase-workspace-4.3.95-ck-shutdown.patch (upstream)
+ plasma-new-default-panel.diff (upstream)
+ plasma-plaindesktop.diff (no longer needed)
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
python-kdebase4.changes: same change
calling whatdependson for head-i586
Old:
----
4_5_BRANCH.diff
kdebase-workspace-4.3.95-ck-shutdown.patch
kdebase-workspace-4.5.3.tar.bz2
plasma-new-default-panel.diff
plasma-plaindesktop.diff
New:
----
4_6_BRANCH.diff
kdebase-workspace-4.5.80.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-wallpapers (Version 4.5.3)
+# spec file for package kdebase4-wallpapers (Version 4.5.80)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,20 +18,13 @@
Name: kdebase4-wallpapers
-BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libknotificationitem-devel
-BuildRequires: libkdepimlibs4-devel libqimageblitz-devel libsmbclient-devel libxklavier-devel
-BuildRequires: libdbusmenu-qt-devel
-%if %suse_version > 1020
-BuildRequires: libusb-devel
-%else
-BuildRequires: libusb
-%endif
+BuildRequires: libdbusmenu-qt-devel libkdepimlibs4-devel libqimageblitz-devel
License: GPLv2+
Group: System/GUI/KDE
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
-Version: 4.5.3
-Release: 2
+Version: 4.5.80
+Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -56,8 +49,8 @@
%install
cd build/wallpapers
%makeinstall
- %kde_post_install
rm -rf $RPM_BUILD_ROOT/usr/share/wallpapers/Air
+ %kde_post_install
%clean
rm -rf $RPM_BUILD_ROOT
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-workspace (Version 4.5.3)
+# spec file for package kdebase4-workspace (Version 4.5.80)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,25 +18,49 @@
Name: kdebase4-workspace
-BuildRequires: NetworkManager-devel bluez-devel libkde4-devel libqimageblitz-devel
-BuildRequires: libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel pciutils-devel
-BuildRequires: audit-devel libQtWebKit-devel libsoprano-devel pam-devel soprano-backend-redland
-BuildRequires: libdbusmenu-qt-devel libkdepimlibs4-devel
-BuildRequires: libqalculate-devel
+BuildRequires: ConsoleKit-devel
+BuildRequires: NetworkManager-devel
+BuildRequires: audit-devel
+BuildRequires: bluez-devel
+BuildRequires: fdupes
BuildRequires: google-gadgets-devel
-BuildRequires: ConsoleKit-devel fdupes gpsd-devel liblazy liblazy-devel
+BuildRequires: gpsd-devel
+BuildRequires: libQtWebKit-devel
+BuildRequires: libdbusmenu-qt-devel
+BuildRequires: libkde4-devel
+BuildRequires: libkdepimlibs4-devel
+BuildRequires: liblazy-devel
+%if %suse_version < 1120
+BuildRequires: libpolkit-qt-devel
+%else
+BuildRequires: libpolkit-qt-1-devel
+%endif
+BuildRequires: libqalculate-devel
+BuildRequires: libqimageblitz-devel
+BuildRequires: libraw1394-devel
+BuildRequires: libsmbclient-devel
+BuildRequires: libsoprano-devel
+BuildRequires: libusb-devel
+BuildRequires: libusb-devel
+BuildRequires: libxklavier-devel
+BuildRequires: pam-devel
+BuildRequires: pciutils-devel
+BuildRequires: shared-desktop-ontologies-devel
+BuildRequires: soprano-backend-redland
%ifnarch s390 s390x
BuildRequires: libsensors4-devel
%endif
-%if %suse_version > 1110
+%if %suse_version > 1130
+Requires: polkit-kde-agent-1 polkit-kde-kcmmodules-1
+%else
Requires: polkit-kde-1
%endif
License: GPLv2+
Group: System/GUI/KDE
Summary: The KDE Workspace Components
Url: http://www.kde.org/
-Version: 4.5.3
-Release: 2
+Version: 4.5.80
+Release: 1
Source0: kdebase-workspace-%version.tar.bz2
Source1: rcksysguardd
Source2: titlebar_decor.png
@@ -44,7 +68,7 @@
Source4: sysconfig.displaymanager-kdm
Source91: kdebase4-workspace-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch0: 4_5_BRANCH.diff
+Patch0: 4_6_BRANCH.diff
Patch8: kwin-suse.diff
Patch18: startkde.diff
Patch60: kdm-audit-log.diff
@@ -71,18 +95,14 @@
Patch99: kdm-long-xserver-timeout.diff
Patch103: plasma-branding-defaults-corona.diff
Patch104: plasma-branding-defaults-applets.diff
-# slightly modified copy of standard desktop containment
-Patch105: plasma-plaindesktop.diff
Patch106: plasma-dashboard-leave.diff
Patch107: plasma-kickoff-newly-collapsing.diff
Patch108: plasma-panel-resize-hint.diff
Patch109: plasma-wallpaper-description.diff
-Patch111: plasma-new-default-panel.diff
Patch123: kdm-fix-generic-greeter.diff
Patch124: kdm-fix-labelcolors.diff
Patch125: pam-translate.diff
Patch201: plasma-notifications-kill-timer.diff
-Patch203: kdebase-workspace-4.3.95-ck-shutdown.patch
Patch208: kdm-themer-wallpaper-sizes.diff
Patch211: disable-python-support.diff
Patch212: build-final.diff
@@ -134,17 +154,6 @@
%prep
%setup -q -n kdebase-workspace-%version
%patch0
-###KDE44: still needed?
-#%patch111
-# prepare a patched copy of the default containment
-pushd plasma/desktop/containments
-cp -a desktop plaindesktop
-mv plaindesktop/plasma-containment-desktop.desktop plaindesktop/plasma-containment-plaindesktop.desktop
-mv plaindesktop/plasma-containment-desktopdashboard.desktop plaindesktop/plasma-containment-plaindesktopdashboard.desktop
-mv plaindesktop/plasma_desktop_containment.kwinrules plaindesktop/plasma_plaindesktop_containment.kwinrules
-sed -i -re '/(Name|Comment)\[/d' plaindesktop/plasma-containment-plaindesktop.desktop
-sed -i -re '/(Name|Comment)\[/d' plaindesktop/plasma-containment-plaindesktopdashboard.desktop
-popd
###KDE44: rediff!
#%patch8
%patch18
@@ -171,7 +180,6 @@
###KDE45: rediff!
#%patch103
%patch104
-%patch105
%patch106
###KDE45: rediff!
#%patch107
@@ -182,7 +190,6 @@
#%patch124 -p1
%patch125
%patch201 -p1
-%patch203 -p1
###KDE45: rediff!
#%patch208
%patch211
@@ -192,7 +199,6 @@
%build
EXTRA_FLAGS="-DKDE4_COMMON_PAM_SERVICE=xdm \
-DKDE4_KCHECKPASS_PAM_SERVICE=xdm \
- -DKDE4_ENABLE_FINAL=1 \
-DSYSCONF_INSTALL_DIR=/etc"
%cmake_kde4 -d build -- $EXTRA_FLAGS
%make_jobs
@@ -575,9 +581,6 @@
%_kde4_libdir/libplasmaclock.so
%_kde4_libdir/libkephal.so
%_kde4_libdir/libplasma-geolocation-interface.so
-%if %suse_version < 1120
-%_kde4_libdir/libpolkitkdeprivate.so
-%endif
%_kde4_libdir/libplasmagenericshell.so
%files -n kdm -f filelists/kdm
@@ -614,7 +617,9 @@
#positives
%doc COPYING COPYING.DOC README
%doc %lang(en) %_kde4_htmldir/en/
+%_kde4_mandir/man1/plasmapkg.1.gz
%_kde4_mandir/man1/plasmaengineexplorer.1.gz
+%_kde4_mandir/man1/plasmoidviewer.1.gz
%config %_kde4_sysconfdir/dbus-1/system.d/org.kde.*
%_kde4_bindir/*
%_kde4_libdir/kconf_update_bin/
@@ -634,18 +639,7 @@
%_datadir/kde4/services/
%_datadir/kde4/servicetypes/
%_datadir/autostart/
-%if %suse_version < 1120
-%_kde4_libdir/libpolkitkdeprivate.so.*
-%_kde4_libexecdir/polkit-kde-manager
-%_kde4_modulesdir/kcm_pkk_authorization.so
-%_kde4_servicesdir/kcm_pkk_authorization.desktop
-%lang(en) %doc %_datadir/doc/kde/HTML/en/PolicyKit-kde
-%_datadir/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
-%_datadir/dbus-1/services/org.kde.PolicyKit.service
-%_datadir/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy
-%_datadir/PolicyKit/policy/org.kde.ksysguard.processlisthelper.policy
-%_datadir/PolicyKit/policy/org.kde.fontinst.policy
-%else
+%if %suse_version > 1130
%_datadir/polkit-1/
%_datadir/polkit-1/actions/org.kde.fontinst.policy
%_datadir/polkit-1/actions/org.kde.kcontrol.kcmclock.policy
@@ -681,7 +675,6 @@
%exclude %_kde4_libdir/libprocessui.so
%exclude %_kde4_libdir/libksgrd.so
%exclude %_kde4_libdir/libkwineffects.so
-%exclude %_kde4_libdir/libkwinnvidiahack.so
%exclude %_kde4_libdir/libtaskmanager.so
%exclude %_kde4_libdir/libweather_ion.so
%exclude %_kde4_libdir/libkfontinst.so
@@ -691,9 +684,6 @@
%exclude %_kde4_libdir/libplasma-geolocation-interface.so
%exclude %_kde4_libdir/libksignalplotter.so
%exclude %_kde4_libdir/liboxygenstyle.so
-%if %suse_version < 1120
-%exclude %_kde4_libdir/libpolkitkdeprivate.so
-%endif
%exclude %_kde4_modulesdir/kcm_kdm.so
%exclude %_kde4_servicesdir/kdm.desktop
%exclude %_kde_config_dir/kdm.knsrc
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package python-kdebase4 (Version 4.5.3)
+# spec file for package python-kdebase4 (Version 4.5.80)
#
# 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.3
-Release: 2
+Version: 4.5.80
+Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: python-kde4 = %{version}
++++++ 4_5_BRANCH.diff -> 4_6_BRANCH.diff ++++++
--- KDE/kdebase4-workspace/4_5_BRANCH.diff 2010-08-27 13:43:28.000000000 +0200
+++ kdebase4-workspace/4_6_BRANCH.diff 2010-11-21 20:48:51.000000000 +0100
@@ -1,7 +1,9 @@
package: kdebase-workspace-4.5.0.tar.bz2
kdemod: kdebase/workspace
---- BRANCH_STATUS
-+++ BRANCH_STATUS
+Index: BRANCH_STATUS
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ BRANCH_STATUS 2010-11-21 20:47:03.389842356 +0100
@@ -0,0 +1,2 @@
+current HEAD: 1163120
+svn di between //tags/KDE/4.5.0/kdebase/workspace and //branches/KDE/4.5/kdebase/workspace
++++++ build-final.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,8 +1,8 @@
Index: kcontrol/keyboard/xkb_rules.cpp
===================================================================
---- kcontrol/keyboard/xkb_rules.cpp (revision 1147030)
-+++ kcontrol/keyboard/xkb_rules.cpp (working copy)
-@@ -36,6 +36,7 @@
+--- kcontrol/keyboard/xkb_rules.cpp.orig 2010-08-25 09:44:36.000000000 +0200
++++ kcontrol/keyboard/xkb_rules.cpp 2010-11-21 20:47:03.852717806 +0100
+@@ -37,6 +37,7 @@
#include
#include
#include
@@ -12,8 +12,8 @@
Index: kcontrol/keyboard/x11_helper.cpp
===================================================================
---- kcontrol/keyboard/x11_helper.cpp (revision 1147030)
-+++ kcontrol/keyboard/x11_helper.cpp (working copy)
+--- kcontrol/keyboard/x11_helper.cpp.orig 2010-11-05 11:47:09.000000000 +0100
++++ kcontrol/keyboard/x11_helper.cpp 2010-11-21 20:47:03.852717806 +0100
@@ -27,7 +27,7 @@
#include
#include
@@ -25,8 +25,8 @@
int X11Helper::MAX_GROUP_COUNT = 4;
Index: kcontrol/keyboard/xinput_helper.cpp
===================================================================
---- kcontrol/keyboard/xinput_helper.cpp (revision 1147030)
-+++ kcontrol/keyboard/xinput_helper.cpp (working copy)
+--- kcontrol/keyboard/xinput_helper.cpp.orig 2010-09-01 15:36:50.000000000 +0200
++++ kcontrol/keyboard/xinput_helper.cpp 2010-11-21 20:47:03.852717806 +0100
@@ -33,6 +33,7 @@
#include "x11_helper.h"
++++++ disable-python-support.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,6 +1,8 @@
---- /suse/dmueller/src/kde/4.4/kdebase/workspace/CMakeLists.txt
-+++ CMakeLists.txt
-@@ -60,7 +60,6 @@
+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
endif(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400")
macro_optional_find_package(PyKDE4)
++++++ kde4-migrate.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,8 +1,8 @@
Index: startkde.cmake
===================================================================
---- startkde.cmake.orig
-+++ startkde.cmake
-@@ -88,6 +88,11 @@ fi
+--- startkde.cmake.orig 2010-11-21 20:47:03.402842733 +0100
++++ startkde.cmake 2010-11-21 20:47:03.667718141 +0100
+@@ -84,6 +84,11 @@ fi
kdehome=$HOME/@KDE_DEFAULT_HOME@
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
++++++ kdebase-workspace-4.5.3.tar.bz2 -> kdebase-workspace-4.5.80.tar.bz2 ++++++
KDE/kdebase4-workspace/kdebase-workspace-4.5.3.tar.bz2 kdebase4-workspace/kdebase-workspace-4.5.80.tar.bz2 differ: char 11, line 1
++++++ kdm-all-users-nopass.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/backend/client.c
-+++ kdm/backend/client.c
-@@ -522,6 +522,9 @@
+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
+@@ -462,6 +462,9 @@ isNoPassAllowed(struct passwd *pw)
if (cursource != PWSRC_MANUAL)
return True;
@@ -10,9 +12,11 @@
#if defined(USE_PAM) || defined(_AIX)
/* Give nss_ldap, etc. a chance to normalize (uppercase) the name. */
if (!(pw = getpwnam(un)) ||
---- kdm/config.def
-+++ kdm/config.def
-@@ -1914,6 +1914,15 @@
+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:
(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.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/backend/bootman.c
-+++ kdm/backend/bootman.c
-@@ -133,31 +133,10 @@
+Index: kdm/backend/bootman.c
+===================================================================
+--- kdm/backend/bootman.c.orig 2010-07-06 08:54:30.000000000 +0200
++++ kdm/backend/bootman.c 2010-11-21 20:47:03.434812097 +0100
+@@ -133,31 +133,10 @@ setGrub(const char *opt, SdRec *sdr)
static void
commitGrub(void)
{
++++++ kdm-dont-grab-mouse.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/kfrontend/kdm_greet.c
-+++ kdm/kfrontend/kdm_greet.c
-@@ -458,7 +458,6 @@
+Index: kdm/kfrontend/kdm_greet.c
+===================================================================
+--- kdm/kfrontend/kdm_greet.c.orig 2010-07-06 08:54:31.000000000 +0200
++++ kdm/kfrontend/kdm_greet.c 2010-11-21 20:47:03.694718280 +0100
+@@ -458,7 +458,6 @@ secureInputs(Display *dpy)
{
debug("secureInputs %s\n", dname);
secureKeyboard(dpy);
@@ -8,7 +10,7 @@
XSetInputFocus(dpy, None, None, CurrentTime);
debug("secureInputs %s done\n", dname);
}
-@@ -469,7 +468,6 @@
+@@ -469,7 +468,6 @@ unsecureInputs(Display *dpy)
debug("unsecureInputs %s\n", dname);
XSetInputFocus(dpy, PointerRoot, PointerRoot, CurrentTime);
XUngrabKeyboard(dpy, CurrentTime);
++++++ kdm-kdmconf.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/kfrontend/genkdmconf.c
-+++ kdm/kfrontend/genkdmconf.c
-@@ -1029,6 +1029,26 @@
+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
}
static void
@@ -27,7 +29,7 @@
doLinkFile(const char *name)
{
File file;
-@@ -1067,9 +1087,10 @@
+@@ -1074,9 +1094,10 @@ writeFile(const char *tname, int mode, c
fputs_(cont, f);
fclose_(f);
addedFile(tname);
@@ -39,7 +41,7 @@
static void
handleBgCfg(Entry *ce, Section *cs)
{
-@@ -3136,9 +3157,6 @@
+@@ -3166,9 +3187,6 @@ int main(int argc, char **argv)
memcmp(oldkde + olen - sizeof(SHR_CONF) + 1,
SHR_CONF, sizeof(SHR_CONF)))
{
@@ -49,7 +51,7 @@
oldkdepfx = oldkde;
} else
ASPrintf((char **)&oldkdepfx,
-@@ -3250,6 +3268,8 @@
+@@ -3280,6 +3298,8 @@ int main(int argc, char **argv)
f = createFile("kdmrc", kdmrcmode);
writeKdmrc(f);
fclose_(f);
@@ -58,7 +60,7 @@
f = createFile("README", 0644);
fprintf_(f,
-@@ -3298,6 +3318,8 @@
+@@ -3328,6 +3348,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.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -7,9 +7,9 @@
Index: kdm/config.def
===================================================================
---- kdm/config.def.orig
-+++ kdm/config.def
-@@ -1346,7 +1346,7 @@ Description:
+--- 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:
Key: ServerTimeout
Type: int
++++++ kdm-make_it_cool.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/kfrontend/kgreeter.cpp
-+++ kdm/kfrontend/kgreeter.cpp
-@@ -67,20 +67,20 @@
+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
+@@ -68,20 +68,20 @@ Foundation, Inc., 51 Franklin Street, Fi
class UserListView : public QListWidget {
public:
@@ -24,7 +26,7 @@
virtual QSize sizeHint() const
{
if (!cachedSizeHint.isValid()) {
-@@ -148,6 +148,7 @@
+@@ -149,6 +149,7 @@ class UserListView : public QListWidget
private:
bool m_suppressClick;
@@ -32,7 +34,7 @@
};
class UserListViewItem : public QListWidgetItem {
-@@ -184,7 +185,7 @@
+@@ -185,7 +186,7 @@ KGreeter::KGreeter(bool framed)
"PrevUser");
if (_userList) {
@@ -41,7 +43,7 @@
connect(userView, SIGNAL(itemClicked(QListWidgetItem *)),
SLOT(slotUserClicked(QListWidgetItem *)));
connect(userView, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
-@@ -192,8 +193,6 @@
+@@ -193,8 +194,6 @@ KGreeter::KGreeter(bool framed)
}
if (_userCompletion)
userList = new QStringList;
@@ -50,7 +52,7 @@
sessMenu = new QMenu(this);
connect(sessMenu, SIGNAL(triggered(QAction *)),
-@@ -364,8 +363,11 @@
+@@ -365,8 +364,11 @@ UserList::UserList(char **in)
}
}
@@ -63,7 +65,7 @@
{
struct passwd *ps;
-@@ -391,6 +393,9 @@
+@@ -392,6 +394,9 @@ KGreeter::insertUsers()
if (_showUsers == SHOW_ALL) {
UserList noUsers(_noUsers);
QSet<QString> dupes;
@@ -73,7 +75,7 @@
for (setpwent(); (ps = getpwent()) != 0;) {
if (*ps->pw_dir && *ps->pw_shell &&
(ps->pw_uid >= (unsigned)_lowUserId ||
-@@ -402,10 +407,55 @@
+@@ -403,10 +408,55 @@ KGreeter::insertUsers()
QString username(QFile::decodeName(ps->pw_name));
if (!dupes.contains(username)) {
dupes.insert(username);
@@ -130,7 +132,7 @@
} else {
UserList users(_users);
if (users.hasGroups()) {
-@@ -782,6 +832,9 @@
+@@ -783,6 +833,9 @@ KStdGreeter::KStdGreeter()
break; }
}
@@ -140,7 +142,7 @@
if (userView) {
if (clock)
inner_box->addWidget(clock, 0, Qt::AlignCenter);
-@@ -894,6 +947,7 @@
+@@ -895,6 +948,7 @@ KThemedGreeter::KThemedGreeter(KdmThemer
setMouseTracking(true);
adjustGeometry();
@@ -148,7 +150,7 @@
themer->setWidget(this);
-@@ -982,6 +1036,13 @@
+@@ -983,6 +1037,13 @@ KThemedGreeter::KThemedGreeter(KdmThemer
completeMenu();
#endif
@@ -162,7 +164,7 @@
if ((system_button = themer->findNode("system_button"))) {
if (optMenu)
addAction(optMenu->menuAction());
-@@ -1020,6 +1081,8 @@
+@@ -1021,6 +1082,8 @@ KThemedGreeter::pluginSetup()
inherited::pluginSetup();
if (userView && verify->entitiesLocal() && verify->entityPresettable() && userlist_node) {
@@ -171,9 +173,11 @@
userlist_node->setWidget(userView);
userlist_rect->setVisible(true);
} else {
---- kdm/kfrontend/kgreeter.h
-+++ kdm/kfrontend/kgreeter.h
-@@ -70,7 +70,7 @@
+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
+@@ -70,7 +70,7 @@ class KGreeter : public KGDialog, public
protected:
void insertUser(const QImage &, const QString &, struct passwd *);
@@ -182,9 +186,11 @@
void putSession(const QString &, const QString &, bool, const char *);
void insertSessions();
virtual void pluginSetup();
---- kdm/kfrontend/themer/kdmitem.cpp
-+++ kdm/kfrontend/themer/kdmitem.cpp
-@@ -65,7 +65,6 @@
+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
+@@ -65,7 +65,6 @@ KdmItem::KdmItem(QObject *parent, const
!modes.split(",", QString::SkipEmptyParts).contains("console"))))
{
m_visible = false;
@@ -192,7 +198,7 @@
}
m_showType = sel.attribute("type");
-@@ -78,7 +77,6 @@
+@@ -78,7 +77,6 @@ KdmItem::KdmItem(QObject *parent, const
themer()->typeVisible(m_showType) == m_showTypeInvert)
{
m_visible = false;
@@ -200,9 +206,11 @@
}
}
---- kdm/kfrontend/themer/kdmlist.cpp
-+++ kdm/kfrontend/themer/kdmlist.cpp
-@@ -29,8 +29,6 @@
+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
+@@ -29,8 +29,6 @@ KdmList::KdmList(QObject *parent, const
: KdmItem(parent, node)
{
itemType = "list";
@@ -211,9 +219,11 @@
// Read RECT TAGS
QDomNodeList childList = node.childNodes();
---- kdm/kfrontend/themer/kdmthemer.cpp
-+++ kdm/kfrontend/themer/kdmthemer.cpp
-@@ -224,10 +224,6 @@
+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
} else {
continue;
}
++++++ kdm-relaxed-auth.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/backend/auth.c
-+++ kdm/backend/auth.c
-@@ -610,6 +610,7 @@
+Index: kdm/backend/auth.c
+===================================================================
+--- kdm/backend/auth.c.orig 2010-07-06 08:54:30.000000000 +0200
++++ kdm/backend/auth.c 2010-11-21 20:47:03.478727336 +0100
+@@ -610,6 +610,7 @@ defineLocal(FILE *file, Xauth *auth, int
writeAddr(FamilyLocal, strlen(name.nodename), (CARD8 *)name.nodename,
file, auth, ok);
#endif
@@ -8,7 +10,7 @@
/*
* For HP-UX, HP's Xlib expects a fully-qualified domain name, which
-@@ -1277,6 +1278,9 @@
+@@ -1277,6 +1278,9 @@ setUserAuthorization(struct display *d)
userEnviron = setEnv(userEnviron, "XAUTHORITY", envname);
systemEnviron = setEnv(systemEnviron, "XAUTHORITY", envname);
}
++++++ kdm-remove-duplicated-sessions.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,16 +1,8 @@
Index: kdm/kfrontend/sessions/CMakeLists.txt
===================================================================
---- kdm/kfrontend/sessions/CMakeLists.txt.orig
-+++ kdm/kfrontend/sessions/CMakeLists.txt
-@@ -2,7 +2,6 @@ configure_file(kde.desktop.cmake ${CMAKE
- configure_file(kde-safe.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kde-safe.desktop)
-
- install(FILES
-- ${CMAKE_CURRENT_BINARY_DIR}/kde.desktop
- ${CMAKE_CURRENT_BINARY_DIR}/kde-safe.desktop
- gnome.desktop
- 9wm.desktop
-@@ -12,19 +11,14 @@ install(FILES
+--- kdm/kfrontend/sessions/CMakeLists.txt.orig 2010-11-05 11:47:45.000000000 +0100
++++ kdm/kfrontend/sessions/CMakeLists.txt 2010-11-21 20:47:03.551842096 +0100
+@@ -12,19 +12,14 @@ install(FILES
amaterus.desktop
amiwm.desktop
asclassic.desktop
@@ -30,7 +22,7 @@
ion.desktop
larswm.desktop
lwm.desktop
-@@ -47,9 +41,6 @@ install(FILES
+@@ -47,9 +42,6 @@ install(FILES
w9wm.desktop
waimea.desktop
wm2.desktop
++++++ kdm-suspend-hal.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:16.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/backend/ctrl.c
-+++ kdm/backend/ctrl.c
-@@ -499,6 +499,10 @@
+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
+@@ -499,6 +499,10 @@ processCtrl(const char *string, int len,
Reply("nuke\t");
}
}
@@ -11,9 +13,11 @@
if ((d->displayType & d_location) == dLocal &&
anyReserveDisplays())
{
---- kdm/backend/greet.h
-+++ kdm/backend/greet.h
-@@ -150,6 +150,7 @@
+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
+@@ -150,6 +150,7 @@ from the copyright holder.
# define SHUT_REBOOT 1 /* how */
# define SHUT_HALT 2
# define SHUT_CONSOLE -1 /* pseudo-code */
@@ -21,9 +25,11 @@
# define SHUT_SCHEDULE 0 /* when; config only */
# define SHUT_TRYNOW 1
# define SHUT_FORCENOW 2
---- kdm/config.def
-+++ kdm/config.def
-@@ -1818,6 +1818,19 @@
+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:
Who is allowed to shut down the system. This applies both to the
greeter and to the command sockets.
@@ -43,9 +49,11 @@
Key: AllowSdForceNow
Type: enum
None: no forced shutdown is allowed at all
---- kdm/kfrontend/CMakeLists.txt
-+++ kdm/kfrontend/CMakeLists.txt
-@@ -6,10 +6,14 @@
+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
+@@ -4,10 +4,14 @@ add_subdirectory( themes )
add_subdirectory( pics )
add_subdirectory( sessions )
@@ -53,14 +61,14 @@
+PKG_CHECK_MODULES(LAZY lazy)
+
include_directories(
- ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kdm/background
+ ${CMAKE_CURRENT_SOURCE_DIR}/../kcm/background
${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kdm
${QIMAGEBLITZ_INCLUDES}
+ ${LAZY_INCLUDE_DIRS}
)
set(kdmthemer_SRCS
-@@ -72,7 +76,7 @@
+@@ -70,7 +74,7 @@ endif (WITH_KDM_XCONSOLE)
macro_add_file_dependencies(kdm_greet.h ${confci})
kde4_add_executable(kdm_greet ${kdm_greet_SRCS})
@@ -69,9 +77,11 @@
if (X11_XTest_FOUND)
target_link_libraries(kdm_greet ${X11_XTest_LIB})
endif (X11_XTest_FOUND)
---- kdm/kfrontend/kdmshutdown.cpp
-+++ kdm/kfrontend/kdmshutdown.cpp
-@@ -22,6 +22,7 @@
+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
+@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fi
*/
@@ -79,7 +89,7 @@
#include "kdmshutdown.h"
#include "kdm_greet.h"
#include "utils.h"
-@@ -33,6 +34,7 @@
+@@ -33,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include
#include <KStandardGuiItem>
#include
@@ -87,7 +97,7 @@
#include <QAction>
#include <QApplication>
-@@ -55,6 +57,10 @@
+@@ -55,6 +57,10 @@ Foundation, Inc., 51 Franklin Street, Fi
int KDMShutdownBase::curPlugin = -1;
PluginList KDMShutdownBase::pluginList;
@@ -98,7 +108,7 @@
KDMShutdownBase::KDMShutdownBase(int _uid, QWidget *_parent)
: inherited(_parent)
, box(new QVBoxLayout(this))
-@@ -65,6 +71,7 @@
+@@ -65,6 +71,7 @@ KDMShutdownBase::KDMShutdownBase(int _ui
, doesNuke(false)
, mayOk(true)
, maySched(false)
@@ -106,7 +116,7 @@
, rootlab(0)
, verify(0)
, needRoot(-1)
-@@ -85,6 +92,7 @@
+@@ -85,6 +92,7 @@ KDMShutdownBase::complete(QWidget *prevW
if (uid &&
((willShut && _allowShutdown == SHUT_ROOT) ||
@@ -114,7 +124,7 @@
(mayNuke && _allowNuke == SHUT_ROOT)))
{
rootlab = new QLabel(i18n("Root authorization required."), this);
-@@ -171,6 +179,7 @@
+@@ -171,6 +179,7 @@ KDMShutdownBase::updateNeedRoot()
{
int nNeedRoot = uid &&
(((willShut && _allowShutdown == SHUT_ROOT) ||
@@ -122,7 +132,7 @@
(_allowNuke == SHUT_ROOT && doesNuke)));
if (verify && nNeedRoot != needRoot) {
if (needRoot == 1)
-@@ -488,6 +497,63 @@
+@@ -488,6 +497,63 @@ KDMSlimShutdown::KDMSlimShutdown(QWidget
buttonlay->addWidget(btnReboot);
connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot()));
@@ -186,7 +196,7 @@
int dummy, cur;
if (getBootOptions(&targetList, &dummy, &cur)) {
QMenu *targets = new QMenu(this);
-@@ -523,6 +589,65 @@
+@@ -523,6 +589,65 @@ KDMSlimShutdown::KDMSlimShutdown(QWidget
buttonlay->addSpacing(KDialog::spacingHint());
}
@@ -252,9 +262,11 @@
void
KDMSlimShutdown::slotSched()
{
---- kdm/kfrontend/kdmshutdown.h
-+++ kdm/kfrontend/kdmshutdown.h
-@@ -67,7 +67,7 @@
+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
+@@ -67,7 +67,7 @@ class KDMShutdownBase : public FDialog,
#else
static const bool willShut = true;
#endif
@@ -263,7 +275,7 @@
private Q_SLOTS:
void slotSched();
-@@ -118,7 +118,6 @@
+@@ -118,7 +118,6 @@ class KDMShutdown : public KDMShutdownBa
QComboBox *targets;
int oldTarget;
int sch_st, sch_to;
@@ -271,7 +283,7 @@
};
class KDMRadioButton : public QRadioButton {
-@@ -161,11 +160,15 @@
+@@ -161,11 +160,15 @@ class KDMSlimShutdown : public FDialog {
void slotReboot();
void slotReboot(QAction *);
void slotSched();
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/config.def.sav 2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def 2010-08-31 14:24:02.948540554 +0200
-@@ -166,6 +166,9 @@
+Index: kdm/config.def
+===================================================================
+--- kdm/config.def.orig 2010-11-21 20:47:03.493842572 +0100
++++ kdm/config.def 2010-11-21 20:47:30.377718076 +0100
+@@ -168,6 +168,9 @@
Core config for 1st local display
[X-:0-Core]
@@ -69,7 +71,7 @@
User: core
Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR"
Merge: xdm(P_list)
-@@ -1062,9 +1080,10 @@ Description:
+@@ -1073,9 +1091,10 @@ Description:
Key: Enable
Type: bool
@@ -81,7 +83,7 @@
Comment: &
Description:
Whether &kdm; should listen to incoming &XDMCP; requests.
-@@ -1085,7 +1104,7 @@ Description:
+@@ -1096,7 +1115,7 @@ Description:
Key: KeyFile
Type: string
@@ -90,7 +92,7 @@
User: core
Instance: #KDMCONF "/kdmkeys"
Update: cp_keyfile
-@@ -1101,11 +1120,10 @@ Description:
+@@ -1112,11 +1131,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:
-@@ -1163,13 +1181,11 @@ Description:
+@@ -1174,13 +1192,11 @@ Description:
Key: Willing
Type: string
@@ -121,7 +123,7 @@
Comment:
The program which is invoked to dynamically generate replies to &XDMCP;
DirectQuery or BroadcastQuery requests.
-@@ -1243,7 +1259,7 @@ Type: enum
+@@ -1254,7 +1270,7 @@ Type: enum
None/BO_NONE: no boot manager
Grub/BO_GRUB: Grub boot manager
Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only)
@@ -130,7 +132,7 @@
User: core
User: greeter
Instance: #Grub
-@@ -1345,7 +1361,7 @@ Type: string
+@@ -1356,7 +1372,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.
-@@ -1355,13 +1371,13 @@ Description:
+@@ -1369,13 +1385,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.
-@@ -1451,6 +1467,8 @@ Type: bool
+@@ -1474,6 +1490,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.
-@@ -1549,11 +1567,10 @@ Description:
+@@ -1548,11 +1566,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
-@@ -1581,12 +1598,11 @@ Description:
+@@ -1580,12 +1597,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.
-@@ -1602,12 +1618,11 @@ Description:
+@@ -1601,12 +1617,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:
-@@ -1620,12 +1635,11 @@ Description:
+@@ -1619,12 +1634,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:
-@@ -1638,12 +1652,12 @@ Description:
+@@ -1637,12 +1651,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
-@@ -1755,10 +1769,11 @@ Description:
+@@ -1754,10 +1768,11 @@ Description:
Key: AllowRootLogin
Type: bool
@@ -252,7 +254,7 @@
Merge: xdm
Comment:
Allow root logins?
-@@ -1773,6 +1788,7 @@ User: core
+@@ -1772,6 +1787,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?
-@@ -1784,12 +1800,13 @@ Type: enum
+@@ -1783,12 +1799,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
-@@ -1866,6 +1883,7 @@ Type: bool
+@@ -1878,6 +1895,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>
-@@ -1899,7 +1917,7 @@ Default: ""
+@@ -1911,7 +1929,7 @@ Default: ""
PostProc: PautoLoginX
User: core(autoUser)
User: greeter
@@ -294,7 +296,7 @@
Merge: xdm:autoUser(P_autoUser)
Comment: &
Description:
-@@ -1930,10 +1948,10 @@ Description:
+@@ -1942,10 +1960,10 @@ Description:
Key: SessionsDirs
Type: list
@@ -307,7 +309,7 @@
Update: upd_sessionsdirs
Comment:
The directories containing session type definitions in .desktop format,
-@@ -2002,7 +2020,7 @@ Description:
+@@ -2014,7 +2032,7 @@ Description:
Key: UseSessReg
Type: bool
@@ -316,7 +318,7 @@
User: core
Instance: #*/!
Comment:
-@@ -2048,7 +2066,8 @@ Type: enum
+@@ -2060,7 +2078,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:
-@@ -2264,7 +2283,7 @@ Description:
+@@ -2276,7 +2295,7 @@ Description:
Key: HiddenUsers
Type: list
@@ -335,7 +337,7 @@
User: greeter-c(noUsers)
Instance: #*/"root"
# depends on {Min,Max}ShowUID
-@@ -2408,7 +2427,7 @@ Description:
+@@ -2422,7 +2441,7 @@ Description:
Key: UseBackground
Type: bool
@@ -344,7 +346,7 @@
User: greeter
Instance: #*/!
Comment:
-@@ -2546,6 +2565,7 @@ Type: bool
+@@ -2582,6 +2601,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.
-@@ -2634,9 +2654,9 @@ Description:
+@@ -2670,9 +2690,9 @@ Description:
Key: Preloader
Type: string
@@ -364,7 +366,7 @@
Update: upd_preloader
Comment: &
Description:
-@@ -2646,7 +2666,7 @@ Description:
+@@ -2682,7 +2702,7 @@ Description:
Key: UseTheme
Type: bool
@@ -373,7 +375,7 @@
User: greeter
Instance: */true
Comment: &
-@@ -2655,9 +2675,10 @@ Description:
+@@ -2691,9 +2711,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
-+++ kdm/kfrontend/CMakeLists.txt
-@@ -120,3 +120,5 @@
+Index: kdm/kfrontend/CMakeLists.txt
+===================================================================
+--- kdm/kfrontend/CMakeLists.txt.orig 2010-11-21 20:47:03.493842572 +0100
++++ kdm/kfrontend/CMakeLists.txt 2010-11-21 20:47:03.509842471 +0100
+@@ -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
-+++ kdm/kfrontend/genkdmconf.c
-@@ -53,6 +53,7 @@
+Index: kdm/kfrontend/genkdmconf.c
+===================================================================
+--- kdm/kfrontend/genkdmconf.c.orig 2010-11-05 11:47:46.000000000 +0100
++++ kdm/kfrontend/genkdmconf.c 2010-11-21 20:47:30.144717941 +0100
+@@ -53,6 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include
#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);
-@@ -1628,6 +1630,26 @@
+@@ -1633,6 +1635,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)
-@@ -2620,7 +2642,7 @@
+@@ -2625,7 +2647,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;
-@@ -2646,6 +2668,9 @@
+@@ -2651,6 +2673,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)
-@@ -2691,7 +2716,7 @@
+@@ -2696,7 +2721,7 @@ mergeKdmRcNewer(const char *path, int ob
;
}
@@ -476,9 +482,11 @@
return True;
}
---- kdm/kfrontend/kdm_config.c
-+++ kdm/kfrontend/kdm_config.c
-@@ -396,7 +396,7 @@
+Index: kdm/kfrontend/kdm_config.c
+===================================================================
+--- kdm/kfrontend/kdm_config.c.orig 2010-07-06 08:54:31.000000000 +0200
++++ kdm/kfrontend/kdm_config.c 2010-11-21 20:47:03.511842363 +0100
+@@ -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,8 +610,10 @@
static Entry *
findGEnt(int id)
{
---- kdm/kfrontend/read_sysconfig.sh.sav 2010-08-31 14:24:02.949538639 +0200
-+++ kdm/kfrontend/read_sysconfig.sh 2010-08-31 17:32:11.866195161 +0200
+Index: kdm/kfrontend/read_sysconfig.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kdm/kfrontend/read_sysconfig.sh 2010-11-21 20:47:03.511842363 +0100
@@ -0,0 +1,160 @@
+#!/bin/bash
+#
++++++ kdm-wordbreak.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/kfrontend/kfdialog.cpp
-+++ kdm/kfrontend/kfdialog.cpp
-@@ -28,6 +28,7 @@
+Index: kdm/kfrontend/kfdialog.cpp
+===================================================================
+--- kdm/kfrontend/kfdialog.cpp.orig 2010-08-05 18:55:46.000000000 +0200
++++ kdm/kfrontend/kfdialog.cpp 2010-11-21 20:47:03.524842955 +0100
+@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include <KGuiItem>
#include <KPushButton>
@@ -8,7 +10,7 @@
#include <QApplication>
#include <QDesktopWidget>
-@@ -171,6 +172,9 @@
+@@ -172,6 +173,9 @@ KFMsgBox::KFMsgBox(QWidget *parent, QMes
QLabel *label1 = new QLabel(this);
label1->setPixmap(QMessageBox::standardIcon(type));
QLabel *label2 = new QLabel(text, this);
++++++ pam-translate.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,6 +1,8 @@
---- libs/kdm/kgreet_generic.cpp
-+++ libs/kdm/kgreet_generic.cpp
-@@ -141,7 +141,9 @@
+Index: libs/kdm/kgreet_generic.cpp
+===================================================================
+--- 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,7 +13,7 @@
m_infoMsgs.append(qtext);
QLabel *label = new QLabel(qtext, m_parentWidget);
m_grid->addWidget(label, m_line++, 0, 1, 2);
-@@ -169,7 +171,10 @@
+@@ -169,7 +171,10 @@ KGenericGreeter::textPrompt(const char *
else
m_infoMsgs.clear();
++++++ plasma-branding-defaults-applets.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,5 +1,7 @@
---- plasma/desktop/applets/kickoff/applet/applet.cpp 2010/08/08 14:42:18 1.1
-+++ plasma/desktop/applets/kickoff/applet/applet.cpp 2010/08/08 14:46:44
+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
@@ -27,6 +27,7 @@
#include
#include
@@ -7,8 +9,8 @@
+#include <QFile>
// KDE
- #include <KIcon>
-@@ -187,7 +188,10 @@
+ #include <KAuthorized>
+@@ -188,7 +189,10 @@ void LauncherApplet::toolTipAboutToShow(
void LauncherApplet::configChanged()
{
KConfigGroup cg = config();
@@ -18,9 +20,9 @@
+ else
+ setPopupIcon(cg.readEntry("icon", "start-here-kde"));
constraintsEvent(Plasma::ImmutableConstraint);
- }
-@@ -202,7 +206,12 @@
+ if (d->launcher) {
+@@ -207,7 +211,12 @@ void LauncherApplet::configAccepted()
d->createLauncher();
KConfigGroup cg = config();
@@ -34,9 +36,11 @@
if (!iconname.isEmpty() && iconname != oldIcon) {
cg.writeEntry("icon", iconname);
---- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp 2010/08/08 14:42:18 1.1
-+++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp 2010/08/08 14:42:42
-@@ -167,6 +167,11 @@
+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
+@@ -167,6 +167,11 @@ FavoritesModel::~FavoritesModel()
void FavoritesModel::add(const QString& url)
{
@@ -48,9 +52,11 @@
Private::globalFavoriteList << url;
Private::globalFavoriteSet << url;
---- plasma/desktop/applets/kickoff/core/models.cpp 2010/08/08 14:42:18 1.1
-+++ plasma/desktop/applets/kickoff/core/models.cpp 2010/08/08 14:42:42
-@@ -177,7 +177,19 @@
+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
+@@ -177,7 +177,19 @@ QStringList Kickoff::systemApplicationLi
{
KConfigGroup appsGroup = componentData().config()->group("SystemApplications");
QStringList apps;
@@ -71,9 +77,11 @@
apps = appsGroup.readEntry("DesktopFiles", apps);
return apps;
}
---- plasma/desktop/applets/kickoff/core/systemmodel.cpp 2010/08/08 14:42:18 1.1
-+++ plasma/desktop/applets/kickoff/core/systemmodel.cpp 2010/08/08 14:42:42
-@@ -81,7 +81,7 @@
+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
+@@ -81,7 +81,7 @@ public:
connect(placesModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
q, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
@@ -82,7 +90,7 @@
<< i18n("Places")
<< i18n("Removable Storage")
<< i18n("Storage");
-@@ -225,19 +225,33 @@
+@@ -225,19 +225,33 @@ QVariant SystemModel::data(const QModelI
}
KService::Ptr service = d->appsList[index.row()];
@@ -129,8 +137,10 @@
}
if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) {
---- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010/08/08 14:42:18 1.1
-+++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010/08/08 14:49:52
+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
@@ -36,6 +36,7 @@
#include
#include
@@ -139,7 +149,7 @@
// KDE Libs
#include <KActionCollection>
-@@ -305,7 +306,10 @@
+@@ -305,7 +306,10 @@ MenuLauncherApplet::MenuLauncherApplet(Q
d->viewtypes << "RunCommand";
}
d->viewtypes << "Leave";
@@ -151,9 +161,11 @@
}
}
d->formattype = NameDescription;
---- plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2010/08/08 14:42:18 1.1
-+++ plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2010/08/08 14:42:42
-@@ -69,7 +69,10 @@
+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
++++++ plasma-dashboard-leave.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,6 +1,8 @@
---- plasma/desktop/shell/dashboardview.cpp.orig
-+++ plasma/desktop/shell/dashboardview.cpp
-@@ -219,6 +219,15 @@ bool DashboardView::eventFilter(QObject
+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
widgetExplorer->setPos(0, containment()->geometry().height() - widgetExplorer->geometry().height());
}
++++++ plasma-notifications-kill-timer.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,8 +1,8 @@
-diff --git a/plasma/generic/dataengines/notifications/notificationsengine.cpp b/plasma/generic/dataengines/notifications/notificationsengine.cpp
-index 898b4f6..b75f2bd 100644
---- a/plasma/generic/dataengines/notifications/notificationsengine.cpp
-+++ b/plasma/generic/dataengines/notifications/notificationsengine.cpp
-@@ -211,6 +211,7 @@
+Index: kdebase-workspace-4.5.80/plasma/generic/dataengines/notifications/notificationsengine.cpp
+===================================================================
+--- kdebase-workspace-4.5.80.orig/plasma/generic/dataengines/notifications/notificationsengine.cpp 2010-11-11 15:41:03.000000000 +0100
++++ kdebase-workspace-4.5.80/plasma/generic/dataengines/notifications/notificationsengine.cpp 2010-11-21 20:47:03.824759539 +0100
+@@ -217,6 +217,7 @@ void NotificationsEngine::timerEvent(QTi
killTimer(event->timerId());
m_sourceTimers.remove(source);
m_timeouts.remove(event->timerId());
++++++ plasma-panel-resize-hint.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,6 +1,8 @@
---- plasma/desktop/shell/panelcontroller.cpp
-+++ plasma/desktop/shell/panelcontroller.cpp
-@@ -605,6 +605,8 @@
+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
newX = qMin(newX, screenGeom.left() + screenGeom.width()/3);
move(newX, pos().y());
resizeFrameHeight(geometry().left() - screenGeom.left());
@@ -9,7 +11,7 @@
break;
}
case Plasma::RightEdge: {
-@@ -613,6 +615,8 @@
+@@ -635,6 +637,8 @@ void PanelController::mouseMoveFilter(QM
newX = qMax(newX, screenGeom.left() + 2*(screenGeom.width()/3) - width());
move(newX, pos().y());
resizeFrameHeight(screenGeom.right() - geometry().right());
@@ -18,7 +20,7 @@
break;
}
case Plasma::TopEdge: {
-@@ -621,6 +625,9 @@
+@@ -643,6 +647,9 @@ void PanelController::mouseMoveFilter(QM
newY = qMin(newY, screenGeom.top() + screenGeom.height()/3);
move(pos().x(), newY);
resizeFrameHeight(geometry().top() - screenGeom.top());
@@ -28,7 +30,7 @@
break;
}
case Plasma::BottomEdge:
-@@ -630,6 +637,8 @@
+@@ -652,6 +659,8 @@ void PanelController::mouseMoveFilter(QM
newY = qMax(newY, screenGeom.top() + 2*(screenGeom.height()/3) - height());
move(pos().x(), newY);
resizeFrameHeight(screenGeom.bottom() - geometry().bottom());
++++++ plasma-wallpaper-description.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,6 +1,8 @@
---- plasma/generic/wallpapers/image/backgroundlistmodel.cpp.sav 2009-09-16 13:40:55.000000000 +0200
-+++ plasma/generic/wallpapers/image/backgroundlistmodel.cpp 2010-05-11 14:21:34.442041261 +0200
-@@ -18,6 +18,7 @@
+Index: plasma/generic/wallpapers/image/backgroundlistmodel.cpp
+===================================================================
+--- plasma/generic/wallpapers/image/backgroundlistmodel.cpp.orig 2010-08-19 10:51:52.000000000 +0200
++++ plasma/generic/wallpapers/image/backgroundlistmodel.cpp 2010-11-21 20:47:03.796739854 +0100
+@@ -19,6 +19,7 @@
#include
#include <KProgressDialog>
#include <KStandardDirs>
@@ -8,7 +10,7 @@
#include
#include
-@@ -347,6 +348,13 @@ void BackgroundFinder::start()
+@@ -375,6 +376,13 @@ void BackgroundFinder::start()
m_paths.append(wp.filePath());
}
} else if (suffixes.contains(wp.suffix().toLower()) && (!m_container || !m_container->contains(wp.filePath()))) {
@@ -22,7 +24,7 @@
//kDebug() << "adding" << wp.filePath() << setLabel;
if (setLabel) {
progress->setLabelText(i18n("Finding images for the wallpaper slideshow.") + "\n\n" +
-@@ -356,6 +364,7 @@ void BackgroundFinder::start()
+@@ -384,6 +392,7 @@ void BackgroundFinder::start()
//kDebug() << " adding image file" << wp.filePath();
++count;
m_papersFound << wp.filePath();
++++++ rotate-wacom-pointers.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,8 +1,8 @@
Index: kcontrol/randr/randrscreen.cpp
===================================================================
---- kcontrol/randr/randrscreen.cpp.orig
-+++ kcontrol/randr/randrscreen.cpp
-@@ -490,6 +490,8 @@ bool RandRScreen::applyProposed(bool con
+--- kcontrol/randr/randrscreen.cpp.orig 2010-09-01 15:36:50.000000000 +0200
++++ kcontrol/randr/randrscreen.cpp 2010-11-21 20:47:03.651718637 +0100
+@@ -538,6 +538,8 @@ bool RandRScreen::applyProposed(bool con
if (succeed && confirm)
succeed = RandR::confirm(r);
@@ -13,9 +13,9 @@
if (succeed)
Index: kcontrol/randr/randr.h
===================================================================
---- kcontrol/randr/randr.h.orig
-+++ kcontrol/randr/randr.h
-@@ -103,6 +103,7 @@ public:
+--- kcontrol/randr/randr.h.orig 2010-08-11 12:08:09.000000000 +0200
++++ kcontrol/randr/randr.h 2010-11-21 20:47:03.651718637 +0100
+@@ -104,6 +104,7 @@ public:
static bool confirm(const QRect &rect = QRect());
static SizeList sortSizes(const SizeList &sizes);
@@ -25,8 +25,8 @@
#endif
Index: kcontrol/randr/legacyrandrscreen.cpp
===================================================================
---- kcontrol/randr/legacyrandrscreen.cpp.orig
-+++ kcontrol/randr/legacyrandrscreen.cpp
+--- kcontrol/randr/legacyrandrscreen.cpp.orig 2010-09-01 15:36:50.000000000 +0200
++++ kcontrol/randr/legacyrandrscreen.cpp 2010-11-21 20:47:03.653717490 +0100
@@ -104,6 +104,7 @@ bool LegacyRandRScreen::applyProposed()
m_currentSize = m_proposedSize;
m_currentRotation = m_proposedRotation;
@@ -37,8 +37,8 @@
Index: kcontrol/randr/randrcrtc.cpp
===================================================================
---- kcontrol/randr/randrcrtc.cpp.orig
-+++ kcontrol/randr/randrcrtc.cpp
+--- kcontrol/randr/randrcrtc.cpp.orig 2008-11-19 11:17:57.000000000 +0100
++++ kcontrol/randr/randrcrtc.cpp 2010-11-21 20:47:03.653717490 +0100
@@ -317,6 +317,7 @@ bool RandRCrtc::applyProposed()
m_currentRect = m_proposedRect;
m_currentRate = mode.refreshRate();
@@ -49,8 +49,8 @@
else
Index: kcontrol/randr/randr.cpp
===================================================================
---- kcontrol/randr/randr.cpp.orig
-+++ kcontrol/randr/randr.cpp
+--- kcontrol/randr/randr.cpp.orig 2010-08-11 12:08:09.000000000 +0200
++++ kcontrol/randr/randr.cpp 2010-11-21 20:47:03.653717490 +0100
@@ -19,6 +19,8 @@
#include "randr.h"
@@ -59,8 +59,8 @@
+#include
bool RandR::has_1_2 = false;
- Time RandR::timestamp = 0;
-@@ -176,5 +178,40 @@ SizeList RandR::sortSizes(const SizeList
+ bool RandR::has_1_3 = false;
+@@ -177,5 +179,40 @@ SizeList RandR::sortSizes(const SizeList
return sorted;
}
++++++ startkde.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,8 +1,8 @@
Index: startkde.cmake
===================================================================
---- startkde.cmake.orig
-+++ startkde.cmake
-@@ -92,6 +92,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD
+--- 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
mkdir -m 700 -p $kdehome
mkdir -m 700 -p $kdehome/share
mkdir -m 700 -p $kdehome/share/config
@@ -12,7 +12,7 @@
cat >$kdehome/share/config/startupconfigkeys <
#include
@@ -19,7 +19,7 @@
#include
#include
#include
-@@ -648,9 +649,16 @@ void KSMShutdownDlg::slotSuspend(QAction
+@@ -666,9 +667,16 @@ void KSMShutdownDlg::slotSuspend(QAction
{
m_bootOption.clear();
Solid::Control::PowerManager::SuspendMethod spdMethod = action->data().valueSolid::Control::PowerManager::SuspendMethod();
++++++ systemsettings-desktop.diff ++++++
--- /var/tmp/diff_new_pack.0l2giD/_old 2010-11-22 23:39:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0l2giD/_new 2010-11-22 23:39:17.000000000 +0100
@@ -1,7 +1,7 @@
Index: systemsettings/app/systemsettings.desktop
===================================================================
---- systemsettings/app/systemsettings.desktop.orig
-+++ 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
@@ -5,7 +5,7 @@ Type=Application
X-DocPath=systemsettings/index.html
X-KDE-StartupNotify=true
@@ -9,18 +9,18 @@
-GenericName=System Settings
+GenericName=Configure Desktop
GenericName[ar]=إعدادات النظام
+ GenericName[ast]=Preferencies del sistema
GenericName[be@latin]=Systemnyja nałady
- GenericName[bg]=Системни настройки
-@@ -81,7 +81,7 @@ GenericName[x-test]=xxSystem Settingsxx
+@@ -85,7 +85,7 @@ GenericName[x-test]=xxSystem Settingsxx
GenericName[zh_CN]=系统设置
GenericName[zh_TW]=系統設定
-Name=System Settings
+Name=Personal Settings
Name[ar]=إعدادات النظام
+ Name[ast]=Preferencies del sistema
Name[be]=Сістэмныя настаўленні
- Name[be@latin]=Systemnyja nałady
-@@ -162,4 +162,4 @@ Name[zh_CN]=系统设置
+@@ -170,4 +170,4 @@ Name[zh_CN]=系统设置
Name[zh_TW]=系統設定
X-DBUS-StartupType=Unique
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org