Drop from [extra]

13 files changed, 308 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..c895f53a5b9d
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,76 @@
+# Generated by mksrcinfo v8
+# Sat Dec 12 10:14:08 UTC 2015
+pkgbase = kdebase-workspace
+	pkgdesc = Provides the interface and basic tools for the KDE workspace
+	pkgver = 4.11.22
+	pkgrel = 4
+	url = https://projects.kde.org/projects/kde/kde-workspace
+	install = kdebase-workspace.install
+	arch = i686
+	arch = x86_64
+	license = GPL
+	license = LGPL
+	license = FDL
+	makedepends = cmake
+	makedepends = automoc4
+	makedepends = boost
+	makedepends = kdebindings-python2
+	makedepends = networkmanager
+	depends = kdebase-runtime
+	depends = kdepimlibs4
+	depends = lm_sensors
+	depends = libraw1394
+	depends = qimageblitz
+	depends = polkit-kde
+	depends = xorg-xprop
+	depends = libxdamage
+	depends = libqalculate
+	depends = libxklavier
+	depends = xorg-xsetroot
+	depends = libxcomposite
+	depends = libxinerama
+	depends = xorg-xrdb
+	depends = libxres
+	depends = xorg-xrandr
+	depends = xorg-xmessage
+	depends = libusb-compat
+	depends = kde-base-artwork
+	depends = xcb-util-renderutil
+	depends = xcb-util-image
+	depends = ttf-font
+	depends = xcb-util-keysyms
+	depends = xcb-util-wm
+	depends = pciutils
+	depends = glu
+	optdepends = kde-wallpapers: wallpapers for KDE Plasma Workspaces
+	optdepends = appmenu-qt: menu applications over dbus
+	optdepends = kdepim4-runtime: to display events in the calendar
+	backup = usr/share/config/kdm/kdmrc
+	backup = etc/pam.d/kde
+	backup = etc/pam.d/kde-np
+	backup = etc/pam.d/kscreensaver
+	source = http://download.kde.org/stable/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
+	source = kde.pam
+	source = kde-np.pam
+	source = kscreensaver.pam
+	source = kdm.service
+	source = kdm.logrotate
+	source = etc-scripts.patch
+	source = terminate-server.patch
+	source = kdm-xinitrd.patch
+	source = khotkeys-qt4.patch
+	source = dbus-update-environment.patch
+	sha1sums = f08fbe309ed16c51ad31b0b260b2adeb7af1bb37
+	sha1sums = 660eae40a707d2711d8d7f32a93214865506b795
+	sha1sums = 6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe
+	sha1sums = c6afdf8964b2b2c4809b2e8e694729b2661e29df
+	sha1sums = b6f8e8692737b11eec1f8022ce74b5b23e247b1b
+	sha1sums = bbe55f2000217474ce7246f12ee437ceaaf7e9ae
+	sha1sums = c079ebd157c836ba996190f0d2bcea1a7828d02c
+	sha1sums = ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee
+	sha1sums = d509dac592bd8b310df27991b208c95b6d907514
+	sha1sums = aa9d2e5a69986c4c3d47829721ea99edb473be12
+	sha1sums = 410311314b1ccb1ed5607dcf8bd418074d8c4019
+
+pkgname = kdebase-workspace
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..c0e9fe959275
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,96 @@
+# $Id: PKGBUILD 253960 2015-12-08 15:40:43Z allan $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.11.22
+_pkgver=15.08.0
+pkgrel=4
+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
+}
diff --git a/dbus-update-environment.patch b/dbus-update-environment.patch
new file mode 100644
index 000000000000..5141765c38fa
--- /dev/null
+++ b/dbus-update-environment.patch
@@ -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
diff --git a/etc-scripts.patch b/etc-scripts.patch
new file mode 100644
index 000000000000..903a90a5303f
--- /dev/null
+++ b/etc-scripts.patch
@@ -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
diff --git a/kde-np.pam b/kde-np.pam
new file mode 100644
index 000000000000..2a4a940c765c
--- /dev/null
+++ b/kde-np.pam
@@ -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
diff --git a/kde.pam b/kde.pam
new file mode 100644
index 000000000000..a0a29483d8f3
--- /dev/null
+++ b/kde.pam
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth		include		system-login
+
+account		include		system-login
+
+password	include		system-login
+
+session		include		system-login
diff --git a/kdebase-workspace.install b/kdebase-workspace.install
new file mode 100644
index 000000000000..addc4b71fb33
--- /dev/null
+++ b/kdebase-workspace.install
@@ -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
+}
diff --git a/kdm-xinitrd.patch b/kdm-xinitrd.patch
new file mode 100644
index 000000000000..f5fc0e571262
--- /dev/null
+++ b/kdm-xinitrd.patch
@@ -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"
diff --git a/kdm.logrotate b/kdm.logrotate
new file mode 100644
index 000000000000..34331feaedcd
--- /dev/null
+++ b/kdm.logrotate
@@ -0,0 +1,6 @@
+/var/log/kdm.log {
+    maxage 365
+    size=+1024k
+    notifempty
+    missingok
+}
diff --git a/kdm.service b/kdm.service
new file mode 100644
index 000000000000..c57aba920cb6
--- /dev/null
+++ b/kdm.service
@@ -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
diff --git a/khotkeys-qt4.patch b/khotkeys-qt4.patch
new file mode 100644
index 000000000000..2fac860a65b4
--- /dev/null
+++ b/khotkeys-qt4.patch
@@ -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();
+     }
+ 
diff --git a/kscreensaver.pam b/kscreensaver.pam
new file mode 100644
index 000000000000..a32a14655219
--- /dev/null
+++ b/kscreensaver.pam
@@ -0,0 +1,2 @@
+#%PAM-1.0
+auth            include         system-login
diff --git a/terminate-server.patch b/terminate-server.patch
new file mode 100644
index 000000000000..0945913175a6
--- /dev/null
+++ b/terminate-server.patch
@@ -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