[arch-commits] Commit in gnome-screensaver/repos (12 files)

Jan Steffens heftig at nymeria.archlinux.org
Wed Apr 10 19:21:48 UTC 2013 

    Date: Wednesday, April 10, 2013 @ 21:21:47
  Author: heftig
Revision: 88063

db-move: moved gnome-screensaver from [community-staging] to [community-testing] (i686, x86_64)

Added:
  gnome-screensaver/repos/community-testing-i686/
  gnome-screensaver/repos/community-testing-i686/PKGBUILD
    (from rev 88060, gnome-screensaver/repos/community-staging-i686/PKGBUILD)
  gnome-screensaver/repos/community-testing-i686/fix-autoconf.patch
    (from rev 88060, gnome-screensaver/repos/community-staging-i686/fix-autoconf.patch)
  gnome-screensaver/repos/community-testing-i686/gnome-screensaver.pam
    (from rev 88060, gnome-screensaver/repos/community-staging-i686/gnome-screensaver.pam)
  gnome-screensaver/repos/community-testing-i686/move-desktop-file.patch
    (from rev 88060, gnome-screensaver/repos/community-staging-i686/move-desktop-file.patch)
  gnome-screensaver/repos/community-testing-x86_64/
  gnome-screensaver/repos/community-testing-x86_64/PKGBUILD
    (from rev 88060, gnome-screensaver/repos/community-staging-x86_64/PKGBUILD)
  gnome-screensaver/repos/community-testing-x86_64/fix-autoconf.patch
    (from rev 88060, gnome-screensaver/repos/community-staging-x86_64/fix-autoconf.patch)
  gnome-screensaver/repos/community-testing-x86_64/gnome-screensaver.pam
    (from rev 88060, gnome-screensaver/repos/community-staging-x86_64/gnome-screensaver.pam)
  gnome-screensaver/repos/community-testing-x86_64/move-desktop-file.patch
    (from rev 88060, gnome-screensaver/repos/community-staging-x86_64/move-desktop-file.patch)
Deleted:
  gnome-screensaver/repos/community-staging-i686/
  gnome-screensaver/repos/community-staging-x86_64/

--------------------------------------------------+
 community-testing-i686/PKGBUILD                  |   44 +++++++++++++++++++++
 community-testing-i686/fix-autoconf.patch        |   12 +++++
 community-testing-i686/gnome-screensaver.pam     |    3 +
 community-testing-i686/move-desktop-file.patch   |   34 ++++++++++++++++
 community-testing-x86_64/PKGBUILD                |   44 +++++++++++++++++++++
 community-testing-x86_64/fix-autoconf.patch      |   12 +++++
 community-testing-x86_64/gnome-screensaver.pam   |    3 +
 community-testing-x86_64/move-desktop-file.patch |   34 ++++++++++++++++
 8 files changed, 186 insertions(+)

Copied: gnome-screensaver/repos/community-testing-i686/PKGBUILD (from rev 88060, gnome-screensaver/repos/community-staging-i686/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2013-04-10 19:21:47 UTC (rev 88063)
@@ -0,0 +1,44 @@
+# $Id$
+# 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=3
+pkgdesc="Legacy GNOME screensaver"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://live.gnome.org/GnomeScreensaver"
+backup=(etc/pam.d/gnome-screensaver)
+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
+       move-desktop-file.patch
+       fix-autoconf.patch)
+sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
+            'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+            '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
+            'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb')
+
+build() {
+  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"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
+}

Copied: gnome-screensaver/repos/community-testing-i686/fix-autoconf.patch (from rev 88060, gnome-screensaver/repos/community-staging-i686/fix-autoconf.patch)
===================================================================
--- community-testing-i686/fix-autoconf.patch	                        (rev 0)
+++ community-testing-i686/fix-autoconf.patch	2013-04-10 19:21:47 UTC (rev 88063)
@@ -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])
+ 

Copied: gnome-screensaver/repos/community-testing-i686/gnome-screensaver.pam (from rev 88060, gnome-screensaver/repos/community-staging-i686/gnome-screensaver.pam)
===================================================================
--- community-testing-i686/gnome-screensaver.pam	                        (rev 0)
+++ community-testing-i686/gnome-screensaver.pam	2013-04-10 19:21:47 UTC (rev 88063)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth        substack     system-login
+-auth        optional     pam_gnome_keyring.so

Copied: gnome-screensaver/repos/community-testing-i686/move-desktop-file.patch (from rev 88060, gnome-screensaver/repos/community-staging-i686/move-desktop-file.patch)
===================================================================
--- community-testing-i686/move-desktop-file.patch	                        (rev 0)
+++ community-testing-i686/move-desktop-file.patch	2013-04-10 19:21:47 UTC (rev 88063)
@@ -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

Copied: gnome-screensaver/repos/community-testing-x86_64/PKGBUILD (from rev 88060, gnome-screensaver/repos/community-staging-x86_64/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2013-04-10 19:21:47 UTC (rev 88063)
@@ -0,0 +1,44 @@
+# $Id$
+# 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=3
+pkgdesc="Legacy GNOME screensaver"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://live.gnome.org/GnomeScreensaver"
+backup=(etc/pam.d/gnome-screensaver)
+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
+       move-desktop-file.patch
+       fix-autoconf.patch)
+sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
+            'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+            '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
+            'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb')
+
+build() {
+  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"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
+}

Copied: gnome-screensaver/repos/community-testing-x86_64/fix-autoconf.patch (from rev 88060, gnome-screensaver/repos/community-staging-x86_64/fix-autoconf.patch)
===================================================================
--- community-testing-x86_64/fix-autoconf.patch	                        (rev 0)
+++ community-testing-x86_64/fix-autoconf.patch	2013-04-10 19:21:47 UTC (rev 88063)
@@ -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])
+ 

Copied: gnome-screensaver/repos/community-testing-x86_64/gnome-screensaver.pam (from rev 88060, gnome-screensaver/repos/community-staging-x86_64/gnome-screensaver.pam)
===================================================================
--- community-testing-x86_64/gnome-screensaver.pam	                        (rev 0)
+++ community-testing-x86_64/gnome-screensaver.pam	2013-04-10 19:21:47 UTC (rev 88063)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth        substack     system-login
+-auth        optional     pam_gnome_keyring.so

Copied: gnome-screensaver/repos/community-testing-x86_64/move-desktop-file.patch (from rev 88060, gnome-screensaver/repos/community-staging-x86_64/move-desktop-file.patch)
===================================================================
--- community-testing-x86_64/move-desktop-file.patch	                        (rev 0)
+++ community-testing-x86_64/move-desktop-file.patch	2013-04-10 19:21:47 UTC (rev 88063)
@@ -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

More information about the arch-commits mailing list