Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2014-05-22 06:52:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2014-04-30 15:05:46.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2014-05-22 06:55:50.000000000 +0200
@@ -1,0 +2,33 @@
+Wed May 21 09:05:29 UTC 2014 - [email protected]
+
+- Adjust some defaults back to the original ones from upstream.
+ This would ensure that with a default setup the user is able
+ to shutdown the system. Another step to remove dependencies on
+ the openSUSE sysconfig values, which is something that our
+ users are not happy with
+
+-------------------------------------------------------------------
+Tue May 20 11:28:23 UTC 2014 - [email protected]
+
+- Restore reading AutoLogin from the openSUSE sysconfig values
+ again. This breaks otherwise openqa
+
+-------------------------------------------------------------------
+Sat May 10 17:39:22 UTC 2014 - [email protected]
+
+- Install DBus interface files with devel subpackage, they are used
+ for development purposes only
+
+-------------------------------------------------------------------
+Tue May 6 20:38:47 UTC 2014 - [email protected]
+
+- Further reduce the number of KDM settings that are taken from
+ the values in sysconfig. We try to be on-par with GDM
+ (bnc#860507)
+
+-------------------------------------------------------------------
+Fri May 2 08:53:27 UTC 2014 - [email protected]
+
+- Added fix-crash-when-DesktopNames-isnt-set.patch, kde#334159
+
+-------------------------------------------------------------------
New:
----
fix-crash-when-DesktopNames-isnt-set.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.eNbhlf/_old 2014-05-22 06:55:52.000000000 +0200
+++ /var/tmp/diff_new_pack.eNbhlf/_new 2014-05-22 06:55:52.000000000 +0200
@@ -141,6 +141,8 @@
Patch67: remove_strigi.patch
# Taken from fedora, additional changes resubmitted to fedora
Patch71: kde-workspace-4.11.0-kdm-logind-multiseat.patch
+# PATCH-FIX-UPSTREAM fix-crash-when-DesktopNames-isnt-set.patch -- Fix crash
when DesktopNames isn't set in session's desktop file
+Patch100: fix-crash-when-DesktopNames-isnt-set.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding = %{_kde_branding_version}
Requires: %{name}-ksysguardd = %{version}
@@ -365,6 +367,7 @@
%if %{with_multiseat}
%patch71 -p1
%endif
+%patch100 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
@@ -538,6 +541,7 @@
%exclude %{_kde4_appsdir}/kwin/cubecap.png
%exclude %{_kde4_appsdir}/kwin/titlebar_decor.png
%{_kde4_appsdir}/kwin/default_rules/plasma_desktop_containment.kwinrules
+%exclude %{_kde4_datadir}/dbus-1/interfaces/org.kde.KWin.xml
%files liboxygenstyle
%defattr(-,root,root)
@@ -582,6 +586,7 @@
%{_kde4_libdir}/libplasmagenericshell.so
%{_kde4_libdir}/libsystemsettingsview.so
%{_kde4_libdir}/cmake/KDE4Workspace/
+%{_kde4_datadir}/dbus-1/interfaces/
%files -n python-kdebase4
%defattr(-,root,root)
@@ -615,7 +620,8 @@
%config %{_kde4_configdir}/
%config %{_kde4_configkcfgdir}/
%{_kde4_datadir}/autostart/
-%{_kde4_datadir}/dbus-1/
+%{_kde4_datadir}/dbus-1/services/
+%{_kde4_datadir}/dbus-1/system-services/
%{_kde4_datadir}/polkit-1/
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_iconsdir}/oxygen/*/*
++++++ fix-crash-when-DesktopNames-isnt-set.patch ++++++
From: David Faure <[email protected]>
Date: Fri, 02 May 2014 08:26:38 +0000
Subject: Fix crash when DesktopNames isn't set
X-Git-Url:
http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f
---
Fix crash when DesktopNames isn't set
BUG: 334159
FIXED-IN: 4.11.10
---
--- a/kdm/backend/client.c
+++ b/kdm/backend/client.c
@@ -1810,12 +1810,14 @@
!(sessargs = iniEntry(str, "Desktop Entry",
"Exec", 0)))
sessargs = "";
buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
- for (buf2 = buf; *buf2; ++buf2) {
- if (*buf2 == ';')
- *buf2 = ':';
+ if (buf) {
+ for (buf2 = buf; *buf2; ++buf2) {
+ if (*buf2 == ';')
+ *buf2 = ':';
+ }
+ userEnviron = setEnv(userEnviron,
"XDG_CURRENT_DESKTOP", buf);
+ free(buf);
}
- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP",
buf);
- free(buf);
free(str);
free(fname);
goto gotit;
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.eNbhlf/_old 2014-05-22 06:55:52.000000000 +0200
+++ /var/tmp/diff_new_pack.eNbhlf/_new 2014-05-22 06:55:52.000000000 +0200
@@ -260,23 +260,6 @@
Merge: xdm
Comment:
Allow to log in, when user has set an empty password?
-@@ -1788,12 +1804,13 @@
- 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
--Default: All
-+Default: Root
- User: core
- User: greeter
- Instance: */Root
--Instance: :*/All
--Merge: kdm:-Greeter/
-+Instance: #:*/All
-+Update: reset_sec_0_1
-+#Merge: kdm:-Greeter/
- Comment: &
- Description:
- Who is allowed to shut down the system. This applies both to the
@@ -1870,6 +1887,7 @@
Default: false
User: dep
@@ -611,7 +594,7 @@
{
--- kdm/kfrontend/read_sysconfig.sh 1970-01-01 01:00:00.000000000 +0100
+++ kdm/kfrontend/read_sysconfig.sh 2013-09-03 21:28:38.522493296 +0200
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,118 @@
+#!/bin/bash
+#
+# Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg, Germany.
@@ -655,30 +638,6 @@
+ ALLOW_ROOT_LOGIN="false"
+fi
+
-+case "$DISPLAYMANAGER_SHUTDOWN" in
-+ all|ALL|All)
-+ DISPLAYMANAGER_SHUTDOWN=All;;
-+ none|NONE|None)
-+ DISPLAYMANAGER_SHUTDOWN=None;;
-+ auto|Auto|AUTO)
-+ case "$PERMISSION_SECURITY" in
-+ *easy*)
-+ DISPLAYMANAGER_SHUTDOWN=All
-+ ;;
-+ *paranoid*)
-+ ECHO_MODE="NoEcho"
-+ ALLOW_ROOT_LOGIN="false"
-+ DISPLAYMANAGER_SHUTDOWN=Root
-+ ;;
-+ *)
-+ DISPLAYMANAGER_SHUTDOWN=Root
-+ ;;
-+ esac
-+ ;;
-+ * )
-+ DISPLAYMANAGER_SHUTDOWN=Root;;
-+esac
-+
+(
+echo "[X-*-Greeter]"
+if [ "$DISPLAYMANAGER_AD_INTEGRATION" = "yes" ]; then
@@ -719,7 +678,6 @@
+fi
+
+echo "[X-:*-Core]"
-+echo "AllowShutdown=${DISPLAYMANAGER_SHUTDOWN}"
+echo "AllowRootLogin=${ALLOW_ROOT_LOGIN}"
+
+echo "[X-*-Core]"
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
