Thu Oct 31 01:09:50 PDT 2013

1 files changed, 13 insertions, 22 deletions

diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index da8fb0066..a58fa0bfe 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -5,32 +5,36 @@
 
 pkgname=cinnamon-screensaver
 pkgver=2.0.3
-pkgrel=1
+pkgrel=3
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://github.com/linuxmint/cinnamon-screensaver"
 backup=(etc/pam.d/cinnamon-screensaver)
-depends=('cinnamon' 'cinnamon-desktop')
+depends=('cinnamon-desktop' 'cinnamon-translations' 'dbus-glib' 'libgnomekbd')
 makedepends=('intltool' 'gnome-common')
-options=(!emptydirs)
 source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
        cinnamon-screensaver.pam
-       fix-dbus-compatibility.patch
+       away-message-fixes.patch
+       fix-systemd-lock.patch
        lock_screen_on_suspend.patch)
 sha256sums=('00c866e98994afc8939d1d347de631cebaa6ec34ad59646a7ccd223bd757cc7d'
             'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
-            'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6'
-            '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
+            'f9f3d555b0c325322469be765b488da599fc850f8ff5a74f72fdf69f68e04c96'
+            '14d3301a03883330bf044a40ea4dce74a829b03174833d21efe66ebeb940dc0c'
+            '54f281eeb0e97c8c46250e287719051e0a580f6c0de384760aaa3532b42616f1')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes
-  patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch
+  # Various fixes for away message handling
+  patch -Np1 -i ../away-message-fixes.patch
+
+  # Use the session path instead of the session id
+  patch -Np1 -i ../fix-systemd-lock.patch
 
   # Lock screen on suspend with systemd
-  patch -Np1 -i ${srcdir}/lock_screen_on_suspend.patch
+  patch -Np1 -i ../lock_screen_on_suspend.patch
 }
 
 build() {
@@ -47,17 +51,4 @@ package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver"
-
-  # Autostart only in Cinnamon
-  install -d "$pkgdir/etc/xdg/autostart/"
-  cp "$pkgdir/usr/share/applications/cinnamon-screensaver.desktop" \
-    "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
-  cp "$pkgdir/usr/share/applications/cinnamon-screensaver.desktop" \
-    "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop"
-  sed -i 's/^OnlyShowIn=.*/OnlyShowIn=GNOME;/' \
-    "$pkgdir"/etc/xdg/autostart/cinnamon{,2d}-screensaver.desktop
-  echo 'AutostartCondition=GNOME3 if-session cinnamon' \
-    >> "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop"
-  echo 'AutostartCondition=GNOME3 if-session cinnamon2d' \
-    >> "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
 }