[arch-commits] Commit in kdebase-workspace/repos (40 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Mon Feb 10 11:01:54 UTC 2014
Date: Monday, February 10, 2014 @ 12:01:54
Author: andrea
Revision: 205802
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdebase-workspace/repos/extra-i686/PKGBUILD
(from rev 205801, kdebase-workspace/trunk/PKGBUILD)
kdebase-workspace/repos/extra-i686/etc-scripts.patch
(from rev 205801, kdebase-workspace/trunk/etc-scripts.patch)
kdebase-workspace/repos/extra-i686/kde-np.pam
(from rev 205801, kdebase-workspace/trunk/kde-np.pam)
kdebase-workspace/repos/extra-i686/kde.pam
(from rev 205801, kdebase-workspace/trunk/kde.pam)
kdebase-workspace/repos/extra-i686/kdebase-workspace.install
(from rev 205801, kdebase-workspace/trunk/kdebase-workspace.install)
kdebase-workspace/repos/extra-i686/kdm-xinitrd.patch
(from rev 205801, kdebase-workspace/trunk/kdm-xinitrd.patch)
kdebase-workspace/repos/extra-i686/kdm.logrotate
(from rev 205801, kdebase-workspace/trunk/kdm.logrotate)
kdebase-workspace/repos/extra-i686/kdm.service
(from rev 205801, kdebase-workspace/trunk/kdm.service)
kdebase-workspace/repos/extra-i686/kscreensaver.pam
(from rev 205801, kdebase-workspace/trunk/kscreensaver.pam)
kdebase-workspace/repos/extra-i686/terminate-server.patch
(from rev 205801, kdebase-workspace/trunk/terminate-server.patch)
kdebase-workspace/repos/extra-x86_64/PKGBUILD
(from rev 205801, kdebase-workspace/trunk/PKGBUILD)
kdebase-workspace/repos/extra-x86_64/etc-scripts.patch
(from rev 205801, kdebase-workspace/trunk/etc-scripts.patch)
kdebase-workspace/repos/extra-x86_64/kde-np.pam
(from rev 205801, kdebase-workspace/trunk/kde-np.pam)
kdebase-workspace/repos/extra-x86_64/kde.pam
(from rev 205801, kdebase-workspace/trunk/kde.pam)
kdebase-workspace/repos/extra-x86_64/kdebase-workspace.install
(from rev 205801, kdebase-workspace/trunk/kdebase-workspace.install)
kdebase-workspace/repos/extra-x86_64/kdm-xinitrd.patch
(from rev 205801, kdebase-workspace/trunk/kdm-xinitrd.patch)
kdebase-workspace/repos/extra-x86_64/kdm.logrotate
(from rev 205801, kdebase-workspace/trunk/kdm.logrotate)
kdebase-workspace/repos/extra-x86_64/kdm.service
(from rev 205801, kdebase-workspace/trunk/kdm.service)
kdebase-workspace/repos/extra-x86_64/kscreensaver.pam
(from rev 205801, kdebase-workspace/trunk/kscreensaver.pam)
kdebase-workspace/repos/extra-x86_64/terminate-server.patch
(from rev 205801, kdebase-workspace/trunk/terminate-server.patch)
Deleted:
kdebase-workspace/repos/extra-i686/PKGBUILD
kdebase-workspace/repos/extra-i686/etc-scripts.patch
kdebase-workspace/repos/extra-i686/kde-np.pam
kdebase-workspace/repos/extra-i686/kde.pam
kdebase-workspace/repos/extra-i686/kdebase-workspace.install
kdebase-workspace/repos/extra-i686/kdm-xinitrd.patch
kdebase-workspace/repos/extra-i686/kdm.logrotate
kdebase-workspace/repos/extra-i686/kdm.service
kdebase-workspace/repos/extra-i686/kscreensaver.pam
kdebase-workspace/repos/extra-i686/terminate-server.patch
kdebase-workspace/repos/extra-x86_64/PKGBUILD
kdebase-workspace/repos/extra-x86_64/etc-scripts.patch
kdebase-workspace/repos/extra-x86_64/kde-np.pam
kdebase-workspace/repos/extra-x86_64/kde.pam
kdebase-workspace/repos/extra-x86_64/kdebase-workspace.install
kdebase-workspace/repos/extra-x86_64/kdm-xinitrd.patch
kdebase-workspace/repos/extra-x86_64/kdm.logrotate
kdebase-workspace/repos/extra-x86_64/kdm.service
kdebase-workspace/repos/extra-x86_64/kscreensaver.pam
kdebase-workspace/repos/extra-x86_64/terminate-server.patch
----------------------------------------+
/PKGBUILD | 174 +++++++++++++++++++++++++++++++
/etc-scripts.patch | 22 +++
/kde-np.pam | 24 ++++
/kde.pam | 16 ++
/kdebase-workspace.install | 62 +++++++++++
/kdm-xinitrd.patch | 36 ++++++
/kdm.logrotate | 12 ++
/kdm.service | 18 +++
/kscreensaver.pam | 2
/terminate-server.patch | 22 +++
extra-i686/PKGBUILD | 87 ---------------
extra-i686/etc-scripts.patch | 11 -
extra-i686/kde-np.pam | 12 --
extra-i686/kde.pam | 8 -
extra-i686/kdebase-workspace.install | 31 -----
extra-i686/kdm-xinitrd.patch | 18 ---
extra-i686/kdm.logrotate | 6 -
extra-i686/kdm.service | 9 -
extra-i686/kscreensaver.pam | 1
extra-i686/terminate-server.patch | 11 -
extra-x86_64/PKGBUILD | 87 ---------------
extra-x86_64/etc-scripts.patch | 11 -
extra-x86_64/kde-np.pam | 12 --
extra-x86_64/kde.pam | 8 -
extra-x86_64/kdebase-workspace.install | 31 -----
extra-x86_64/kdm-xinitrd.patch | 18 ---
extra-x86_64/kdm.logrotate | 6 -
extra-x86_64/kdm.service | 9 -
extra-x86_64/kscreensaver.pam | 1
extra-x86_64/terminate-server.patch | 11 -
30 files changed, 388 insertions(+), 388 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/PKGBUILD 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.11.6
-_pkgver=4.12.2
-pkgrel=1
-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')
-groups=('kde')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxdamage
-depends=("kdelibs>=${pkgver}" 'kdepim-runtime' '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')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
- 'appmenu-qt: menu applications over dbus')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/stable/${_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')
-sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
- '660eae40a707d2711d8d7f32a93214865506b795'
- '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
- 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
- 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
- 'c079ebd157c836ba996190f0d2bcea1a7828d02c'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'd509dac592bd8b310df27991b208c95b6d907514')
-
-prepare() {
- mkdir 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
-
- # 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
- 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/extra-i686/PKGBUILD (from rev 205801, kdebase-workspace/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.11.6
+_pkgver=4.12.2
+pkgrel=2
+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')
+groups=('kde')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=("kdelibs>=${pkgver}" 'kdepim-runtime' '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')
+install="${pkgname}.install"
+backup=('usr/share/config/kdm/kdmrc')
+source=("http://download.kde.org/stable/${_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')
+sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
+ '660eae40a707d2711d8d7f32a93214865506b795'
+ '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
+ '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
+ 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+ 'c079ebd157c836ba996190f0d2bcea1a7828d02c'
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+ 'd509dac592bd8b310df27991b208c95b6d907514')
+
+prepare() {
+ mkdir 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
+
+ # 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
+ 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
+}
Deleted: extra-i686/etc-scripts.patch
===================================================================
--- extra-i686/etc-scripts.patch 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/etc-scripts.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,11 +0,0 @@
---- 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/extra-i686/etc-scripts.patch (from rev 205801, kdebase-workspace/trunk/etc-scripts.patch)
===================================================================
--- extra-i686/etc-scripts.patch (rev 0)
+++ extra-i686/etc-scripts.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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: extra-i686/kde-np.pam
===================================================================
--- extra-i686/kde-np.pam 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/kde-np.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,12 +0,0 @@
-#%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/extra-i686/kde-np.pam (from rev 205801, kdebase-workspace/trunk/kde-np.pam)
===================================================================
--- extra-i686/kde-np.pam (rev 0)
+++ extra-i686/kde-np.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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
Deleted: extra-i686/kde.pam
===================================================================
--- extra-i686/kde.pam 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/kde.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth include system-login
-
-account include system-login
-
-password include system-login
-
-session include system-login
Copied: kdebase-workspace/repos/extra-i686/kde.pam (from rev 205801, kdebase-workspace/trunk/kde.pam)
===================================================================
--- extra-i686/kde.pam (rev 0)
+++ extra-i686/kde.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-login
+
+account include system-login
+
+password include system-login
+
+session include system-login
Deleted: extra-i686/kdebase-workspace.install
===================================================================
--- extra-i686/kdebase-workspace.install 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/kdebase-workspace.install 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,31 +0,0 @@
-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() {
- if getent passwd kdm >/dev/null 2>&1; then
- userdel kdm
- fi
- if getent group kdm >/dev/null 2>&1; then
- groupdel kdm
- fi
- 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/extra-i686/kdebase-workspace.install (from rev 205801, kdebase-workspace/trunk/kdebase-workspace.install)
===================================================================
--- extra-i686/kdebase-workspace.install (rev 0)
+++ extra-i686/kdebase-workspace.install 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1,31 @@
+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() {
+ if getent passwd kdm >/dev/null 2>&1; then
+ userdel kdm
+ fi
+ if getent group kdm >/dev/null 2>&1; then
+ groupdel kdm
+ fi
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+
+ if [ -d usr/share/apps/kdm/faces ]; then
+ rm -r usr/share/apps/kdm/faces
+ fi
+}
Deleted: extra-i686/kdm-xinitrd.patch
===================================================================
--- extra-i686/kdm-xinitrd.patch 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/kdm-xinitrd.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,18 +0,0 @@
---- 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/extra-i686/kdm-xinitrd.patch (from rev 205801, kdebase-workspace/trunk/kdm-xinitrd.patch)
===================================================================
--- extra-i686/kdm-xinitrd.patch (rev 0)
+++ extra-i686/kdm-xinitrd.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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"
Deleted: extra-i686/kdm.logrotate
===================================================================
--- extra-i686/kdm.logrotate 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/kdm.logrotate 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,6 +0,0 @@
-/var/log/kdm.log {
- maxage 365
- size=+1024k
- notifempty
- missingok
-}
Copied: kdebase-workspace/repos/extra-i686/kdm.logrotate (from rev 205801, kdebase-workspace/trunk/kdm.logrotate)
===================================================================
--- extra-i686/kdm.logrotate (rev 0)
+++ extra-i686/kdm.logrotate 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1,6 @@
+/var/log/kdm.log {
+ maxage 365
+ size=+1024k
+ notifempty
+ missingok
+}
Deleted: extra-i686/kdm.service
===================================================================
--- extra-i686/kdm.service 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/kdm.service 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,9 +0,0 @@
-[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/extra-i686/kdm.service (from rev 205801, kdebase-workspace/trunk/kdm.service)
===================================================================
--- extra-i686/kdm.service (rev 0)
+++ extra-i686/kdm.service 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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
Deleted: extra-i686/kscreensaver.pam
===================================================================
--- extra-i686/kscreensaver.pam 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/kscreensaver.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1 +0,0 @@
-auth required pam_unix_auth.so
Copied: kdebase-workspace/repos/extra-i686/kscreensaver.pam (from rev 205801, kdebase-workspace/trunk/kscreensaver.pam)
===================================================================
--- extra-i686/kscreensaver.pam (rev 0)
+++ extra-i686/kscreensaver.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1 @@
+auth required pam_unix_auth.so
Deleted: extra-i686/terminate-server.patch
===================================================================
--- extra-i686/terminate-server.patch 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-i686/terminate-server.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,11 +0,0 @@
---- 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/extra-i686/terminate-server.patch (from rev 205801, kdebase-workspace/trunk/terminate-server.patch)
===================================================================
--- extra-i686/terminate-server.patch (rev 0)
+++ extra-i686/terminate-server.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/PKGBUILD 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.11.6
-_pkgver=4.12.2
-pkgrel=1
-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')
-groups=('kde')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxdamage
-depends=("kdelibs>=${pkgver}" 'kdepim-runtime' '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')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
- 'appmenu-qt: menu applications over dbus')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/stable/${_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')
-sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
- '660eae40a707d2711d8d7f32a93214865506b795'
- '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
- 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
- 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
- 'c079ebd157c836ba996190f0d2bcea1a7828d02c'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'd509dac592bd8b310df27991b208c95b6d907514')
-
-prepare() {
- mkdir 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
-
- # 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
- 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/extra-x86_64/PKGBUILD (from rev 205801, kdebase-workspace/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.11.6
+_pkgver=4.12.2
+pkgrel=2
+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')
+groups=('kde')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=("kdelibs>=${pkgver}" 'kdepim-runtime' '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')
+install="${pkgname}.install"
+backup=('usr/share/config/kdm/kdmrc')
+source=("http://download.kde.org/stable/${_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')
+sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
+ '660eae40a707d2711d8d7f32a93214865506b795'
+ '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
+ '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
+ 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+ 'c079ebd157c836ba996190f0d2bcea1a7828d02c'
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+ 'd509dac592bd8b310df27991b208c95b6d907514')
+
+prepare() {
+ mkdir 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
+
+ # 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
+ 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
+}
Deleted: extra-x86_64/etc-scripts.patch
===================================================================
--- extra-x86_64/etc-scripts.patch 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/etc-scripts.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,11 +0,0 @@
---- 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/extra-x86_64/etc-scripts.patch (from rev 205801, kdebase-workspace/trunk/etc-scripts.patch)
===================================================================
--- extra-x86_64/etc-scripts.patch (rev 0)
+++ extra-x86_64/etc-scripts.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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: extra-x86_64/kde-np.pam
===================================================================
--- extra-x86_64/kde-np.pam 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/kde-np.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,12 +0,0 @@
-#%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/extra-x86_64/kde-np.pam (from rev 205801, kdebase-workspace/trunk/kde-np.pam)
===================================================================
--- extra-x86_64/kde-np.pam (rev 0)
+++ extra-x86_64/kde-np.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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
Deleted: extra-x86_64/kde.pam
===================================================================
--- extra-x86_64/kde.pam 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/kde.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth include system-login
-
-account include system-login
-
-password include system-login
-
-session include system-login
Copied: kdebase-workspace/repos/extra-x86_64/kde.pam (from rev 205801, kdebase-workspace/trunk/kde.pam)
===================================================================
--- extra-x86_64/kde.pam (rev 0)
+++ extra-x86_64/kde.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-login
+
+account include system-login
+
+password include system-login
+
+session include system-login
Deleted: extra-x86_64/kdebase-workspace.install
===================================================================
--- extra-x86_64/kdebase-workspace.install 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/kdebase-workspace.install 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,31 +0,0 @@
-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() {
- if getent passwd kdm >/dev/null 2>&1; then
- userdel kdm
- fi
- if getent group kdm >/dev/null 2>&1; then
- groupdel kdm
- fi
- 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/extra-x86_64/kdebase-workspace.install (from rev 205801, kdebase-workspace/trunk/kdebase-workspace.install)
===================================================================
--- extra-x86_64/kdebase-workspace.install (rev 0)
+++ extra-x86_64/kdebase-workspace.install 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1,31 @@
+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() {
+ if getent passwd kdm >/dev/null 2>&1; then
+ userdel kdm
+ fi
+ if getent group kdm >/dev/null 2>&1; then
+ groupdel kdm
+ fi
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+
+ if [ -d usr/share/apps/kdm/faces ]; then
+ rm -r usr/share/apps/kdm/faces
+ fi
+}
Deleted: extra-x86_64/kdm-xinitrd.patch
===================================================================
--- extra-x86_64/kdm-xinitrd.patch 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/kdm-xinitrd.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,18 +0,0 @@
---- 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/extra-x86_64/kdm-xinitrd.patch (from rev 205801, kdebase-workspace/trunk/kdm-xinitrd.patch)
===================================================================
--- extra-x86_64/kdm-xinitrd.patch (rev 0)
+++ extra-x86_64/kdm-xinitrd.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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"
Deleted: extra-x86_64/kdm.logrotate
===================================================================
--- extra-x86_64/kdm.logrotate 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/kdm.logrotate 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,6 +0,0 @@
-/var/log/kdm.log {
- maxage 365
- size=+1024k
- notifempty
- missingok
-}
Copied: kdebase-workspace/repos/extra-x86_64/kdm.logrotate (from rev 205801, kdebase-workspace/trunk/kdm.logrotate)
===================================================================
--- extra-x86_64/kdm.logrotate (rev 0)
+++ extra-x86_64/kdm.logrotate 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1,6 @@
+/var/log/kdm.log {
+ maxage 365
+ size=+1024k
+ notifempty
+ missingok
+}
Deleted: extra-x86_64/kdm.service
===================================================================
--- extra-x86_64/kdm.service 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/kdm.service 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,9 +0,0 @@
-[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/extra-x86_64/kdm.service (from rev 205801, kdebase-workspace/trunk/kdm.service)
===================================================================
--- extra-x86_64/kdm.service (rev 0)
+++ extra-x86_64/kdm.service 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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
Deleted: extra-x86_64/kscreensaver.pam
===================================================================
--- extra-x86_64/kscreensaver.pam 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/kscreensaver.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1 +0,0 @@
-auth required pam_unix_auth.so
Copied: kdebase-workspace/repos/extra-x86_64/kscreensaver.pam (from rev 205801, kdebase-workspace/trunk/kscreensaver.pam)
===================================================================
--- extra-x86_64/kscreensaver.pam (rev 0)
+++ extra-x86_64/kscreensaver.pam 2014-02-10 11:01:54 UTC (rev 205802)
@@ -0,0 +1 @@
+auth required pam_unix_auth.so
Deleted: extra-x86_64/terminate-server.patch
===================================================================
--- extra-x86_64/terminate-server.patch 2014-02-10 11:01:34 UTC (rev 205801)
+++ extra-x86_64/terminate-server.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -1,11 +0,0 @@
---- 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/extra-x86_64/terminate-server.patch (from rev 205801, kdebase-workspace/trunk/terminate-server.patch)
===================================================================
--- extra-x86_64/terminate-server.patch (rev 0)
+++ extra-x86_64/terminate-server.patch 2014-02-10 11:01:54 UTC (rev 205802)
@@ -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