[arch-commits] Commit in kdebase-workspace/repos (26 files)

Jan Steffens heftig at archlinux.org
Fri Sep 25 17:46:19 UTC 2015


    Date: Friday, September 25, 2015 @ 19:46:18
  Author: heftig
Revision: 247484

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kdebase-workspace/repos/testing-i686/
  kdebase-workspace/repos/testing-i686/PKGBUILD
    (from rev 247483, kdebase-workspace/trunk/PKGBUILD)
  kdebase-workspace/repos/testing-i686/dbus-update-environment.patch
    (from rev 247483, kdebase-workspace/trunk/dbus-update-environment.patch)
  kdebase-workspace/repos/testing-i686/etc-scripts.patch
    (from rev 247483, kdebase-workspace/trunk/etc-scripts.patch)
  kdebase-workspace/repos/testing-i686/kde-np.pam
    (from rev 247483, kdebase-workspace/trunk/kde-np.pam)
  kdebase-workspace/repos/testing-i686/kde.pam
    (from rev 247483, kdebase-workspace/trunk/kde.pam)
  kdebase-workspace/repos/testing-i686/kdebase-workspace.install
    (from rev 247483, kdebase-workspace/trunk/kdebase-workspace.install)
  kdebase-workspace/repos/testing-i686/kdm-xinitrd.patch
    (from rev 247483, kdebase-workspace/trunk/kdm-xinitrd.patch)
  kdebase-workspace/repos/testing-i686/kdm.logrotate
    (from rev 247483, kdebase-workspace/trunk/kdm.logrotate)
  kdebase-workspace/repos/testing-i686/kdm.service
    (from rev 247483, kdebase-workspace/trunk/kdm.service)
  kdebase-workspace/repos/testing-i686/khotkeys-qt4.patch
    (from rev 247483, kdebase-workspace/trunk/khotkeys-qt4.patch)
  kdebase-workspace/repos/testing-i686/kscreensaver.pam
    (from rev 247483, kdebase-workspace/trunk/kscreensaver.pam)
  kdebase-workspace/repos/testing-i686/terminate-server.patch
    (from rev 247483, kdebase-workspace/trunk/terminate-server.patch)
  kdebase-workspace/repos/testing-x86_64/
  kdebase-workspace/repos/testing-x86_64/PKGBUILD
    (from rev 247483, kdebase-workspace/trunk/PKGBUILD)
  kdebase-workspace/repos/testing-x86_64/dbus-update-environment.patch
    (from rev 247483, kdebase-workspace/trunk/dbus-update-environment.patch)
  kdebase-workspace/repos/testing-x86_64/etc-scripts.patch
    (from rev 247483, kdebase-workspace/trunk/etc-scripts.patch)
  kdebase-workspace/repos/testing-x86_64/kde-np.pam
    (from rev 247483, kdebase-workspace/trunk/kde-np.pam)
  kdebase-workspace/repos/testing-x86_64/kde.pam
    (from rev 247483, kdebase-workspace/trunk/kde.pam)
  kdebase-workspace/repos/testing-x86_64/kdebase-workspace.install
    (from rev 247483, kdebase-workspace/trunk/kdebase-workspace.install)
  kdebase-workspace/repos/testing-x86_64/kdm-xinitrd.patch
    (from rev 247483, kdebase-workspace/trunk/kdm-xinitrd.patch)
  kdebase-workspace/repos/testing-x86_64/kdm.logrotate
    (from rev 247483, kdebase-workspace/trunk/kdm.logrotate)
  kdebase-workspace/repos/testing-x86_64/kdm.service
    (from rev 247483, kdebase-workspace/trunk/kdm.service)
  kdebase-workspace/repos/testing-x86_64/khotkeys-qt4.patch
    (from rev 247483, kdebase-workspace/trunk/khotkeys-qt4.patch)
  kdebase-workspace/repos/testing-x86_64/kscreensaver.pam
    (from rev 247483, kdebase-workspace/trunk/kscreensaver.pam)
  kdebase-workspace/repos/testing-x86_64/terminate-server.patch
    (from rev 247483, kdebase-workspace/trunk/terminate-server.patch)

----------------------------------------------+
 testing-i686/PKGBUILD                        |   96 +++++++++++++++++++++++++
 testing-i686/dbus-update-environment.patch   |   12 +++
 testing-i686/etc-scripts.patch               |   11 ++
 testing-i686/kde-np.pam                      |   12 +++
 testing-i686/kde.pam                         |    8 ++
 testing-i686/kdebase-workspace.install       |   25 ++++++
 testing-i686/kdm-xinitrd.patch               |   18 ++++
 testing-i686/kdm.logrotate                   |    6 +
 testing-i686/kdm.service                     |    9 ++
 testing-i686/khotkeys-qt4.patch              |   22 +++++
 testing-i686/kscreensaver.pam                |    2 
 testing-i686/terminate-server.patch          |   11 ++
 testing-x86_64/PKGBUILD                      |   96 +++++++++++++++++++++++++
 testing-x86_64/dbus-update-environment.patch |   12 +++
 testing-x86_64/etc-scripts.patch             |   11 ++
 testing-x86_64/kde-np.pam                    |   12 +++
 testing-x86_64/kde.pam                       |    8 ++
 testing-x86_64/kdebase-workspace.install     |   25 ++++++
 testing-x86_64/kdm-xinitrd.patch             |   18 ++++
 testing-x86_64/kdm.logrotate                 |    6 +
 testing-x86_64/kdm.service                   |    9 ++
 testing-x86_64/khotkeys-qt4.patch            |   22 +++++
 testing-x86_64/kscreensaver.pam              |    2 
 testing-x86_64/terminate-server.patch        |   11 ++
 24 files changed, 464 insertions(+)

Copied: kdebase-workspace/repos/testing-i686/PKGBUILD (from rev 247483, kdebase-workspace/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.11.22
+_pkgver=15.08.0
+pkgrel=3
+pkgdesc="Provides the interface and basic tools for the KDE workspace"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kde-workspace'
+license=('GPL' 'LGPL' 'FDL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('kdebase-runtime' 'kdepimlibs4' 'lm_sensors' 'libraw1394'
+         'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libqalculate'
+         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
+         'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat'
+         'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font'
+         'xcb-util-keysyms' 'xcb-util-wm' 'pciutils' 'glu')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
+optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
+            'appmenu-qt: menu applications over dbus' 'kdepim4-runtime: to display events in the calendar')
+install="${pkgname}.install"
+backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kde' 'etc/pam.d/kde-np' 'etc/pam.d/kscreensaver')
+source=("http://download.kde.org/stable/applications/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
+        'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'khotkeys-qt4.patch' 'dbus-update-environment.patch')
+sha1sums=('f08fbe309ed16c51ad31b0b260b2adeb7af1bb37'
+          '660eae40a707d2711d8d7f32a93214865506b795'
+          '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
+          'c6afdf8964b2b2c4809b2e8e694729b2661e29df'
+          'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
+          'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+          'c079ebd157c836ba996190f0d2bcea1a7828d02c'
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          'aa9d2e5a69986c4c3d47829721ea99edb473be12'
+          '410311314b1ccb1ed5607dcf8bd418074d8c4019')
+
+prepare() {
+        mkdir build
+
+        cd ${_pkgname}-${pkgver}
+
+        # reads the shell scripts in /etc/kde/
+        patch -p0 -i "${srcdir}"/etc-scripts.patch
+        # sends env vars to existing dbus
+        patch -p1 -i "${srcdir}"/dbus-update-environment.patch
+        # FS#26120
+        patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
+        # FS#39188
+        patch -p1 -i "${srcdir}"/khotkeys-qt4.patch
+
+        # KDEBUG#202629
+        patch -p0 -i "${srcdir}"/terminate-server.patch
+}
+
+build() {
+        cd build
+        cmake ../${_pkgname}-${pkgver} \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DKDE4_BUILD_TESTS=OFF \
+          -DCMAKE_SKIP_RPATH=ON \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DWITH_Xmms=OFF \
+          -DWITH_libgps=OFF \
+          -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+          -DWITH_CkConnector=OFF \
+          -DWITH_NepomukCore=OFF \
+          -DWITH_Soprano=OFF
+        make
+}
+
+package() {
+	cd build
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
+	install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
+	install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
+
+	install -d -m755 "${pkgdir}"/usr/share/xsessions/
+	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
+      "${pkgdir}"/usr/share/xsessions/
+	install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
+
+	install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
+    install -D -m644 "${srcdir}"/kdm.service \
+      "${pkgdir}"/usr/lib/systemd/system/kdm.service
+    install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
+}

Copied: kdebase-workspace/repos/testing-i686/dbus-update-environment.patch (from rev 247483, kdebase-workspace/trunk/dbus-update-environment.patch)
===================================================================
--- testing-i686/dbus-update-environment.patch	                        (rev 0)
+++ testing-i686/dbus-update-environment.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,12 @@
+diff -u -r kde-workspace-4.11.22/startkde.cmake kde-workspace-4.11.22-dbus/startkde.cmake
+--- kde-workspace-4.11.22/startkde.cmake	2015-09-25 19:04:25.415328264 +0200
++++ kde-workspace-4.11.22-dbus/startkde.cmake	2015-09-25 19:06:06.115118584 +0200
+@@ -272,6 +272,8 @@
+ # D-Bus autolaunch is broken
+ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     eval `dbus-launch --sh-syntax --exit-with-session`
++else
++    dbus-update-activation-environment --systemd --all
+ fi
+ if $qdbus >/dev/null 2>/dev/null; then
+     : # ok

Copied: kdebase-workspace/repos/testing-i686/etc-scripts.patch (from rev 247483, kdebase-workspace/trunk/etc-scripts.patch)
===================================================================
--- testing-i686/etc-scripts.patch	                        (rev 0)
+++ testing-i686/etc-scripts.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -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

Copied: kdebase-workspace/repos/testing-i686/kde-np.pam (from rev 247483, kdebase-workspace/trunk/kde-np.pam)
===================================================================
--- testing-i686/kde-np.pam	                        (rev 0)
+++ testing-i686/kde-np.pam	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,12 @@
+#%PAM-1.0
+auth		required	pam_tally.so	onerr=succeed file=/var/log/faillog
+auth		required	pam_shells.so
+auth		requisite	pam_nologin.so
+auth		required	pam_env.so
+auth		optional	pam_permit.so
+
+account		include      system-login
+
+password	include      system-login
+
+session		include      system-login

Copied: kdebase-workspace/repos/testing-i686/kde.pam (from rev 247483, kdebase-workspace/trunk/kde.pam)
===================================================================
--- testing-i686/kde.pam	                        (rev 0)
+++ testing-i686/kde.pam	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth		include		system-login
+
+account		include		system-login
+
+password	include		system-login
+
+session		include		system-login

Copied: kdebase-workspace/repos/testing-i686/kdebase-workspace.install (from rev 247483, kdebase-workspace/trunk/kdebase-workspace.install)
===================================================================
--- testing-i686/kdebase-workspace.install	                        (rev 0)
+++ testing-i686/kdebase-workspace.install	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,25 @@
+post_install() {
+	groupadd -g 135 kdm &>/dev/null
+	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
+	chown -R 135:135 var/lib/kdm &>/dev/null
+	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+    update-desktop-database -q
+    genkdmconf --no-old --no-backup &>/dev/null
+}
+
+post_upgrade() {
+	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
+	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
+	chown -R 135:135 var/lib/kdm &>/dev/null
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+    genkdmconf &>/dev/null
+}
+
+post_remove() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+
+    if [ -d usr/share/apps/kdm/faces ]; then
+        rm -r usr/share/apps/kdm/faces
+    fi
+}

Copied: kdebase-workspace/repos/testing-i686/kdm-xinitrd.patch (from rev 247483, kdebase-workspace/trunk/kdm-xinitrd.patch)
===================================================================
--- testing-i686/kdm-xinitrd.patch	                        (rev 0)
+++ testing-i686/kdm-xinitrd.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,18 @@
+--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~	2011-10-04 22:11:24.787771512 +0000
++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c	2011-10-04 22:13:58.612702824 +0000
+@@ -742,6 +742,15 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
++"# run all system xinitrc shell scripts.\n"
++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
++"  for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
++"  if [ -x \"$i\" ]; then\n"
++"    . \"$i\"\n"
++"  fi\n"
++"  done\n"
++"fi\n"
++"\n"
+ "if [ -d /etc/X11/Xresources ]; then\n"
+ "  for i in /etc/X11/Xresources/*; do\n"
+ "    [ -f $i ] && xrdb -merge $i\n"

Copied: kdebase-workspace/repos/testing-i686/kdm.logrotate (from rev 247483, kdebase-workspace/trunk/kdm.logrotate)
===================================================================
--- testing-i686/kdm.logrotate	                        (rev 0)
+++ testing-i686/kdm.logrotate	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,6 @@
+/var/log/kdm.log {
+    maxage 365
+    size=+1024k
+    notifempty
+    missingok
+}

Copied: kdebase-workspace/repos/testing-i686/kdm.service (from rev 247483, kdebase-workspace/trunk/kdm.service)
===================================================================
--- testing-i686/kdm.service	                        (rev 0)
+++ testing-i686/kdm.service	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,9 @@
+[Unit]
+Description=K Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+
+[Install]
+Alias=display-manager.service

Copied: kdebase-workspace/repos/testing-i686/khotkeys-qt4.patch (from rev 247483, kdebase-workspace/trunk/khotkeys-qt4.patch)
===================================================================
--- testing-i686/khotkeys-qt4.patch	                        (rev 0)
+++ testing-i686/khotkeys-qt4.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,22 @@
+--- kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp~	2014-03-05 18:41:23.126818552 +0000
++++ kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp	2014-03-05 18:42:05.563172036 +0000
+@@ -117,7 +117,7 @@
+ 
+ void DbusActionWidget::launchDbusBrowser() const
+     {
+-    if( KRun::runCommand( "qdbusviewer", window()) == 0 )
++    if( KRun::runCommand( "qdbusviewer-qt4", window()) == 0 )
+         {
+         KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" ));
+         }
+--- kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp~	2014-03-05 18:41:29.120107842 +0000
++++ kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp	2014-03-05 18:41:52.349936188 +0000
+@@ -133,7 +133,7 @@
+         }
+     kDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list;
+     KProcess proc;
+-    proc << "qdbus" << _application << _object << _function << args_list;
++    proc << "qdbus-qt4" << _application << _object << _function << args_list;
+     proc.startDetached();
+     }
+ 

Copied: kdebase-workspace/repos/testing-i686/kscreensaver.pam (from rev 247483, kdebase-workspace/trunk/kscreensaver.pam)
===================================================================
--- testing-i686/kscreensaver.pam	                        (rev 0)
+++ testing-i686/kscreensaver.pam	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,2 @@
+#%PAM-1.0
+auth            include         system-login

Copied: kdebase-workspace/repos/testing-i686/terminate-server.patch (from rev 247483, kdebase-workspace/trunk/terminate-server.patch)
===================================================================
--- testing-i686/terminate-server.patch	                        (rev 0)
+++ testing-i686/terminate-server.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,11 @@
+--- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
++++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
+@@ -1448,7 +1448,7 @@
+ 
+ Key: TerminateServer
+ Type: bool
+-Default: false
++Default: true
+ User: core
+ Instance: #:*/!
+ Merge: xdm

Copied: kdebase-workspace/repos/testing-x86_64/PKGBUILD (from rev 247483, kdebase-workspace/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.11.22
+_pkgver=15.08.0
+pkgrel=3
+pkgdesc="Provides the interface and basic tools for the KDE workspace"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kde-workspace'
+license=('GPL' 'LGPL' 'FDL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('kdebase-runtime' 'kdepimlibs4' 'lm_sensors' 'libraw1394'
+         'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libqalculate'
+         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
+         'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat'
+         'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font'
+         'xcb-util-keysyms' 'xcb-util-wm' 'pciutils' 'glu')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
+optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
+            'appmenu-qt: menu applications over dbus' 'kdepim4-runtime: to display events in the calendar')
+install="${pkgname}.install"
+backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kde' 'etc/pam.d/kde-np' 'etc/pam.d/kscreensaver')
+source=("http://download.kde.org/stable/applications/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
+        'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'khotkeys-qt4.patch' 'dbus-update-environment.patch')
+sha1sums=('f08fbe309ed16c51ad31b0b260b2adeb7af1bb37'
+          '660eae40a707d2711d8d7f32a93214865506b795'
+          '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
+          'c6afdf8964b2b2c4809b2e8e694729b2661e29df'
+          'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
+          'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+          'c079ebd157c836ba996190f0d2bcea1a7828d02c'
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          'aa9d2e5a69986c4c3d47829721ea99edb473be12'
+          '410311314b1ccb1ed5607dcf8bd418074d8c4019')
+
+prepare() {
+        mkdir build
+
+        cd ${_pkgname}-${pkgver}
+
+        # reads the shell scripts in /etc/kde/
+        patch -p0 -i "${srcdir}"/etc-scripts.patch
+        # sends env vars to existing dbus
+        patch -p1 -i "${srcdir}"/dbus-update-environment.patch
+        # FS#26120
+        patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
+        # FS#39188
+        patch -p1 -i "${srcdir}"/khotkeys-qt4.patch
+
+        # KDEBUG#202629
+        patch -p0 -i "${srcdir}"/terminate-server.patch
+}
+
+build() {
+        cd build
+        cmake ../${_pkgname}-${pkgver} \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DKDE4_BUILD_TESTS=OFF \
+          -DCMAKE_SKIP_RPATH=ON \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DWITH_Xmms=OFF \
+          -DWITH_libgps=OFF \
+          -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+          -DWITH_CkConnector=OFF \
+          -DWITH_NepomukCore=OFF \
+          -DWITH_Soprano=OFF
+        make
+}
+
+package() {
+	cd build
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
+	install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
+	install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
+
+	install -d -m755 "${pkgdir}"/usr/share/xsessions/
+	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
+      "${pkgdir}"/usr/share/xsessions/
+	install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
+
+	install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
+    install -D -m644 "${srcdir}"/kdm.service \
+      "${pkgdir}"/usr/lib/systemd/system/kdm.service
+    install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
+}

Copied: kdebase-workspace/repos/testing-x86_64/dbus-update-environment.patch (from rev 247483, kdebase-workspace/trunk/dbus-update-environment.patch)
===================================================================
--- testing-x86_64/dbus-update-environment.patch	                        (rev 0)
+++ testing-x86_64/dbus-update-environment.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,12 @@
+diff -u -r kde-workspace-4.11.22/startkde.cmake kde-workspace-4.11.22-dbus/startkde.cmake
+--- kde-workspace-4.11.22/startkde.cmake	2015-09-25 19:04:25.415328264 +0200
++++ kde-workspace-4.11.22-dbus/startkde.cmake	2015-09-25 19:06:06.115118584 +0200
+@@ -272,6 +272,8 @@
+ # D-Bus autolaunch is broken
+ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     eval `dbus-launch --sh-syntax --exit-with-session`
++else
++    dbus-update-activation-environment --systemd --all
+ fi
+ if $qdbus >/dev/null 2>/dev/null; then
+     : # ok

Copied: kdebase-workspace/repos/testing-x86_64/etc-scripts.patch (from rev 247483, kdebase-workspace/trunk/etc-scripts.patch)
===================================================================
--- testing-x86_64/etc-scripts.patch	                        (rev 0)
+++ testing-x86_64/etc-scripts.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -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

Copied: kdebase-workspace/repos/testing-x86_64/kde-np.pam (from rev 247483, kdebase-workspace/trunk/kde-np.pam)
===================================================================
--- testing-x86_64/kde-np.pam	                        (rev 0)
+++ testing-x86_64/kde-np.pam	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,12 @@
+#%PAM-1.0
+auth		required	pam_tally.so	onerr=succeed file=/var/log/faillog
+auth		required	pam_shells.so
+auth		requisite	pam_nologin.so
+auth		required	pam_env.so
+auth		optional	pam_permit.so
+
+account		include      system-login
+
+password	include      system-login
+
+session		include      system-login

Copied: kdebase-workspace/repos/testing-x86_64/kde.pam (from rev 247483, kdebase-workspace/trunk/kde.pam)
===================================================================
--- testing-x86_64/kde.pam	                        (rev 0)
+++ testing-x86_64/kde.pam	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth		include		system-login
+
+account		include		system-login
+
+password	include		system-login
+
+session		include		system-login

Copied: kdebase-workspace/repos/testing-x86_64/kdebase-workspace.install (from rev 247483, kdebase-workspace/trunk/kdebase-workspace.install)
===================================================================
--- testing-x86_64/kdebase-workspace.install	                        (rev 0)
+++ testing-x86_64/kdebase-workspace.install	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,25 @@
+post_install() {
+	groupadd -g 135 kdm &>/dev/null
+	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
+	chown -R 135:135 var/lib/kdm &>/dev/null
+	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+    update-desktop-database -q
+    genkdmconf --no-old --no-backup &>/dev/null
+}
+
+post_upgrade() {
+	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
+	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
+	chown -R 135:135 var/lib/kdm &>/dev/null
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+    genkdmconf &>/dev/null
+}
+
+post_remove() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+
+    if [ -d usr/share/apps/kdm/faces ]; then
+        rm -r usr/share/apps/kdm/faces
+    fi
+}

Copied: kdebase-workspace/repos/testing-x86_64/kdm-xinitrd.patch (from rev 247483, kdebase-workspace/trunk/kdm-xinitrd.patch)
===================================================================
--- testing-x86_64/kdm-xinitrd.patch	                        (rev 0)
+++ testing-x86_64/kdm-xinitrd.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,18 @@
+--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~	2011-10-04 22:11:24.787771512 +0000
++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c	2011-10-04 22:13:58.612702824 +0000
+@@ -742,6 +742,15 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
++"# run all system xinitrc shell scripts.\n"
++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
++"  for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
++"  if [ -x \"$i\" ]; then\n"
++"    . \"$i\"\n"
++"  fi\n"
++"  done\n"
++"fi\n"
++"\n"
+ "if [ -d /etc/X11/Xresources ]; then\n"
+ "  for i in /etc/X11/Xresources/*; do\n"
+ "    [ -f $i ] && xrdb -merge $i\n"

Copied: kdebase-workspace/repos/testing-x86_64/kdm.logrotate (from rev 247483, kdebase-workspace/trunk/kdm.logrotate)
===================================================================
--- testing-x86_64/kdm.logrotate	                        (rev 0)
+++ testing-x86_64/kdm.logrotate	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,6 @@
+/var/log/kdm.log {
+    maxage 365
+    size=+1024k
+    notifempty
+    missingok
+}

Copied: kdebase-workspace/repos/testing-x86_64/kdm.service (from rev 247483, kdebase-workspace/trunk/kdm.service)
===================================================================
--- testing-x86_64/kdm.service	                        (rev 0)
+++ testing-x86_64/kdm.service	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,9 @@
+[Unit]
+Description=K Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+
+[Install]
+Alias=display-manager.service

Copied: kdebase-workspace/repos/testing-x86_64/khotkeys-qt4.patch (from rev 247483, kdebase-workspace/trunk/khotkeys-qt4.patch)
===================================================================
--- testing-x86_64/khotkeys-qt4.patch	                        (rev 0)
+++ testing-x86_64/khotkeys-qt4.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,22 @@
+--- kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp~	2014-03-05 18:41:23.126818552 +0000
++++ kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp	2014-03-05 18:42:05.563172036 +0000
+@@ -117,7 +117,7 @@
+ 
+ void DbusActionWidget::launchDbusBrowser() const
+     {
+-    if( KRun::runCommand( "qdbusviewer", window()) == 0 )
++    if( KRun::runCommand( "qdbusviewer-qt4", window()) == 0 )
+         {
+         KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" ));
+         }
+--- kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp~	2014-03-05 18:41:29.120107842 +0000
++++ kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp	2014-03-05 18:41:52.349936188 +0000
+@@ -133,7 +133,7 @@
+         }
+     kDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list;
+     KProcess proc;
+-    proc << "qdbus" << _application << _object << _function << args_list;
++    proc << "qdbus-qt4" << _application << _object << _function << args_list;
+     proc.startDetached();
+     }
+ 

Copied: kdebase-workspace/repos/testing-x86_64/kscreensaver.pam (from rev 247483, kdebase-workspace/trunk/kscreensaver.pam)
===================================================================
--- testing-x86_64/kscreensaver.pam	                        (rev 0)
+++ testing-x86_64/kscreensaver.pam	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,2 @@
+#%PAM-1.0
+auth            include         system-login

Copied: kdebase-workspace/repos/testing-x86_64/terminate-server.patch (from rev 247483, kdebase-workspace/trunk/terminate-server.patch)
===================================================================
--- testing-x86_64/terminate-server.patch	                        (rev 0)
+++ testing-x86_64/terminate-server.patch	2015-09-25 17:46:18 UTC (rev 247484)
@@ -0,0 +1,11 @@
+--- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
++++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
+@@ -1448,7 +1448,7 @@
+ 
+ Key: TerminateServer
+ Type: bool
+-Default: false
++Default: true
+ User: core
+ Instance: #:*/!
+ Merge: xdm



More information about the arch-commits mailing list