[arch-commits] Commit in kdebase-workspace/trunk (5 files)

Wed Oct 17 15:51:57 UTC 2012

Date: Wednesday, October 17, 2012 @ 11:51:57
  Author: andrea
Revision: 169054

Use systemctl to shutdown/reboot the system; Remove not needed patch; refactor fixpath.patch; add missing mesa makedeps; do not backup pam stuff

Added:
  kdebase-workspace/trunk/etc-scripts.patch
  kdebase-workspace/trunk/use-systemctl.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD
  kdebase-workspace/trunk/kdebase-workspace.install
Deleted:
  kdebase-workspace/trunk/fixpath.patch

---------------------------+
 PKGBUILD                  |   28 +++++++++++++---------------
 etc-scripts.patch         |   11 +++++++++++
 fixpath.patch             |   34 ----------------------------------
 kdebase-workspace.install |    5 +++++
 use-systemctl.patch       |   13 +++++++++++++
 5 files changed, 42 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2012-10-17 14:11:43 UTC (rev 169053)
+++ PKGBUILD	2012-10-17 15:51:57 UTC (rev 169054)
@@ -5,7 +5,7 @@
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.9.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -19,18 +19,14 @@
          'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
          'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr'
          'xorg-xmessage' 'libusb-compat' 'kde-base-artwork')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa')
 optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
 install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
-        'etc/pam.d/kde'
-        'etc/pam.d/kde-np'
-        'etc/pam.d/kscreensaver')
-options=('emptydirs')
+backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'kdm.logrotate'
+        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'use-systemctl.patch'
         'logind-support.patch')
 sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -38,23 +34,25 @@
           'b7980f2e199963caf8e92b499042d244ece2fca0'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
-          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
+          'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+          'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'd509dac592bd8b310df27991b208c95b6d907514'
-          'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+          'dccf17527d8e7bf39f04befc8957fb0a8f2a68c9'
           'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
 
 build() {
 	cd ${_pkgname}-${pkgver}
 
+    # reads the shell scripts in /etc/kde/
+    patch -p0 -i "${srcdir}"/etc-scripts.patch
     # FS#26120
 	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
+    # FS#32028
+    patch -p1 -i "${srcdir}"/use-systemctl.patch
 
-	patch -p0 -i "${srcdir}"/fixpath.patch
-
     # KDEBUG#202629
 	patch -p0 -i "${srcdir}"/terminate-server.patch
-
     # KDEBUG#307412 (fixed upstream)
     patch -p1 -i "${srcdir}"/logind-support.patch
 

Added: etc-scripts.patch
===================================================================
--- etc-scripts.patch	                        (rev 0)
+++ etc-scripts.patch	2012-10-17 15:51:57 UTC (rev 169054)
@@ -0,0 +1,11 @@
+--- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
++++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
+@@ -206,7 +190,7 @@
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+ 
+-libpath=`kde4-config --path lib | tr : '\n'`
++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
+ 
+ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+   for file in "$prefix"*.sh; do

Deleted: fixpath.patch
===================================================================
--- fixpath.patch	2012-10-17 14:11:43 UTC (rev 169053)
+++ fixpath.patch	2012-10-17 15:51:57 UTC (rev 169054)
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do

Modified: kdebase-workspace.install
===================================================================
--- kdebase-workspace.install	2012-10-17 14:11:43 UTC (rev 169053)
+++ kdebase-workspace.install	2012-10-17 15:51:57 UTC (rev 169054)
@@ -12,6 +12,11 @@
 	chown -R 135:135 var/lib/kdm &>/dev/null
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
     update-desktop-database -q
+
+    if [[ $(vercmp $2 4.9.2-6) -le 0 ]]; then
+        echo ":: KDM now uses systemctl to shutdown/reboot the system."
+        echo "   Please replace your kdmrc with the kdmrc.pacnew or install systemd-sysvcompat."
+    fi
 }
 
 post_remove() {

Added: use-systemctl.patch
===================================================================
--- use-systemctl.patch	                        (rev 0)
+++ use-systemctl.patch	2012-10-17 15:51:57 UTC (rev 169054)
@@ -0,0 +1,13 @@
+--- kde-workspace-4.9.2/kdm/config.def~	2012-10-17 13:58:07.236399517 +0000
++++ kde-workspace-4.9.2/kdm/config.def	2012-10-17 14:01:35.181535177 +0000
+@@ -38,8 +38,8 @@
+ # define HALT_CMD	"/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
+ #elif defined(__linux__)
+-# define HALT_CMD	"/sbin/shutdown -h -P now"
+-# define REBOOT_CMD	"/sbin/shutdown -r now"
++# define HALT_CMD	"/usr/bin/systemctl poweroff"
++# define REBOOT_CMD	"/usr/bin/systemctl reboot"
+ #elif defined(BSD)
+ # define HALT_CMD	"/sbin/shutdown -p now"
+ # define REBOOT_CMD	"/sbin/shutdown -r now"


