Thu Oct 6 23:14:37 UTC 2011

2 files changed, 49 insertions, 32 deletions

diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index c83933c40..d6316f37d 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137806 2011-09-11 11:17:09Z andrea $
+# $Id: PKGBUILD 139920 2011-10-05 19:09:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.7.1
-pkgrel=6
+pkgver=4.7.2
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -14,14 +14,17 @@ groups=('kde')
 # note on libxdamage:
 # 	not detected by namcap because libgl depends on it
 #	but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz'
-         'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier'
-         'xorg-xsetroot' 'libxcomposite' 'libxinerama')
+depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
+         'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
+         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
+         'xorg-xrdb')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python'
-              'networkmanager')
+             'networkmanager')
 optdepends=('kde-wallpapers: officials KDE wallapers')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
+replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
+          'kdebase-kinfocenter')
+conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
+           'kdebase-kinfocenter')
 install="${pkgname}.install"
 backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kde'
@@ -30,9 +33,8 @@ backup=('usr/share/config/kdm/kdmrc'
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch'
-        'important-performance-bugfix.patch')
-sha1sums=('c7867d2f788086078abbcff53a035a6131232539'
+        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('afd37b2f583690e391828c1ceb7311e2e8d37c6f'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
@@ -40,18 +42,16 @@ sha1sums=('c7867d2f788086078abbcff53a035a6131232539'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          '4fa046db21e3203771fd29bc0e1c32918862b894')
+          'd509dac592bd8b310df27991b208c95b6d907514')
 
 build() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
-	patch -p0 -i ${srcdir}/fixpath.patch
-	patch -p0 -i ${srcdir}/terminate-server.patch
+	cd "${srcdir}"/${_pkgname}-${pkgver}
+	patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch
+    patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
+	patch -p0 -i "${srcdir}"/fixpath.patch
+	patch -p0 -i "${srcdir}"/terminate-server.patch
 
-    # Already fixed upstream
-    patch -p1 -i "${srcdir}"/important-performance-bugfix.patch
-
-	cd ${srcdir}
+	cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${_pkgname}-${pkgver} \
@@ -61,23 +61,22 @@ build() {
         -DWITH_Xmms=OFF \
         -DWITH_Googlegadgets=OFF \
         -DWITH_libgps=OFF \
-        -DKWIN_MOBILE_EFFECTS=OFF \
         -DWITH_OpenGLES=OFF \
         -DKWIN_BUILD_WITH_OPENGLES=OFF
 	make
 }
 
 package() {
-	cd ${srcdir}/build
-	make DESTDIR=${pkgdir} install
+	cd "${srcdir}"/build
+	make DESTDIR="${pkgdir}" install
 
-	install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
-	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 -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
+	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 -g 135 -o 135 "${pkgdir}"/var/lib/kdm
 }
diff --git a/extra/kdebase-workspace/kdm-xinitrd.patch b/extra/kdebase-workspace/kdm-xinitrd.patch
new file mode 100644
index 000000000..f5fc0e571
--- /dev/null
+++ b/extra/kdebase-workspace/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"