[arch-commits] Commit in gnome-screensaver/trunk (4 files)

[Balló György]

    Date: Wednesday, April 10, 2013 @ 14:36:55
  Author: bgyorgy
Revision: 88036

upgpkg: gnome-screensaver 3.6.1-3

Move desktop file out of autostart (upstream patch)

Added:
  gnome-screensaver/trunk/fix-autoconf.patch
  gnome-screensaver/trunk/move-desktop-file.patch
Modified:
  gnome-screensaver/trunk/PKGBUILD
  gnome-screensaver/trunk/gnome-screensaver.pam

-------------------------+
 PKGBUILD                |   38 +++++++++++++++++++++++---------------
 fix-autoconf.patch      |   12 ++++++++++++
 gnome-screensaver.pam   |    2 +-
 move-desktop-file.patch |   34 ++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-10 10:46:47 UTC (rev 88035)
+++ PKGBUILD	2013-04-10 12:36:55 UTC (rev 88036)
@@ -1,36 +1,44 @@
 # $Id$
-# Maintainer:
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-screensaver
 pkgver=3.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Legacy GNOME screensaver"
-arch=(i686 x86_64)
-license=(GPL)
+arch=('i686' 'x86_64')
+license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
-depends=(dbus-glib libgnomekbd gnome-desktop gsettings-desktop-schemas libsystemd)
-makedepends=(pkgconfig intltool libxss)
-options=(!emptydirs)
+depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
+makedepends=('intltool' 'gnome-common')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-       gnome-screensaver.pam)
+       gnome-screensaver.pam
+       move-desktop-file.patch
+       fix-autoconf.patch)
 sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
-            '02423717e226b3127ff7e394bd7e31d2f691126607c88eb12cbb34628a2d90ec')
+            'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+            '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
+            'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb')
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-screensaver \
-      --localstatedir=/var \
-      --with-mit-ext --with-systemd
+  cd "$pkgname-$pkgver"
 
+  # Upstream patch that moves gnome-screensaver desktop file out of autostart
+  patch -Np1 -i "$srcdir/move-desktop-file.patch"
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --with-mit-ext
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
 }

Added: fix-autoconf.patch
===================================================================
--- fix-autoconf.patch	                        (rev 0)
+++ fix-autoconf.patch	2013-04-10 12:36:55 UTC (rev 88036)
@@ -0,0 +1,12 @@
+diff -Naur gnome-screensaver-3.6.1.orig/configure.ac gnome-screensaver-3.6.1/configure.ac
+--- gnome-screensaver-3.6.1.orig/configure.ac	2012-10-16 04:28:59.000000000 +0200
++++ gnome-screensaver-3.6.1/configure.ac	2013-04-10 14:24:44.844833193 +0200
+@@ -10,7 +10,7 @@
+ AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AM_MAINTAINER_MODE([enable])
+ 

Modified: gnome-screensaver.pam
===================================================================
--- gnome-screensaver.pam	2013-04-10 10:46:47 UTC (rev 88035)
+++ gnome-screensaver.pam	2013-04-10 12:36:55 UTC (rev 88036)
@@ -1,3 +1,3 @@
 #%PAM-1.0
 auth        substack     system-login
-auth        optional     pam_gnome_keyring.so
+-auth        optional     pam_gnome_keyring.so

Added: move-desktop-file.patch
===================================================================
--- move-desktop-file.patch	                        (rev 0)
+++ move-desktop-file.patch	2013-04-10 12:36:55 UTC (rev 88036)
@@ -0,0 +1,34 @@
+From 1940dc6bc8ad5ee2c029714efb1276c05ca80bd4 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim at feathertop.org>
+Date: Thu, 18 Oct 2012 23:08:56 +0000
+Subject: move gnome-screensaver desktop file out of autostart
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683060
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1dd5d46..97ffa07 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -47,7 +47,7 @@ noinst_PROGRAMS = 	\
+ 	test-window	\
+ 	$(NULL)
+ 
+-desktopdir = $(sysconfdir)/xdg/autostart
++desktopdir = $(datadir)/applications
+ desktop_in_files = gnome-screensaver.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in
+index fae80c4..82d6d6f 100644
+--- a/src/gnome-screensaver.desktop.in.in
++++ b/src/gnome-screensaver.desktop.in.in
+@@ -5,7 +5,6 @@ _Comment=Launch screensaver and locker program
+ Icon=preferences-desktop-screensaver
+ Exec=gnome-screensaver
+ OnlyShowIn=GNOME;
+-AutostartCondition=GNOME3 if-session gnome-fallback
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+--
+cgit v0.9.1