[arch-commits] Commit in gnome-screensaver/trunk (PKGBUILD flashback-autostart.patch)

[Balló György]

    Date: Thursday, September 10, 2015 @ 12:51:08
  Author: bgyorgy
Revision: 139788

upgpkg: gnome-screensaver 3.6.1-12

Remove autostart file for GNOME Flashback, added to gnome-flashback package

Modified:
  gnome-screensaver/trunk/PKGBUILD
Deleted:
  gnome-screensaver/trunk/flashback-autostart.patch

---------------------------+
 PKGBUILD                  |    7 ---
 flashback-autostart.patch |   97 --------------------------------------------
 2 files changed, 1 insertion(+), 103 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-10 10:34:45 UTC (rev 139787)
+++ PKGBUILD	2015-09-10 10:51:08 UTC (rev 139788)
@@ -5,7 +5,7 @@
 
 pkgname=gnome-screensaver
 pkgver=3.6.1
-pkgrel=11
+pkgrel=12
 pkgdesc="Legacy GNOME screensaver"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -22,7 +22,6 @@
        lock_screen_on_suspend.patch
        lightdm_switch_user.patch
        use-screensaver-background.patch
-       flashback-autostart.patch
        recenter.patch)
 sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
             'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
@@ -32,7 +31,6 @@
             '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8'
             '5d40bd6e1843150912dc52932eaa94c0f6d57931fd45a3769ef40e2335fe3c6f'
             '7161ff962801d9e34ea564c372de4b5f93b30180b83c13aadbc9a8a1cd73ff65'
-            '73b78723696fac36b409ce10fe58ac2e03ed558f812a7b82cfd4d2386dfdaa03'
             '6c428b9296376e4b5e2aaf503a754a1ba58333aab50c82279b7c5615d8dd9e69')
 
 prepare() {
@@ -56,9 +54,6 @@
   # Honour background setting of the lock screen
   patch -Np1 -i "$srcdir/use-screensaver-background.patch"
 
-  # Add autostart file for GNOME Flashback
-  patch -Np1 -i "$srcdir/flashback-autostart.patch"
-
   # Restore the original position after shake
   patch -Np1 -i "$srcdir/recenter.patch"
 }

Deleted: flashback-autostart.patch
===================================================================
--- flashback-autostart.patch	2015-09-10 10:34:45 UTC (rev 139787)
+++ flashback-autostart.patch	2015-09-10 10:51:08 UTC (rev 139788)
@@ -1,97 +0,0 @@
-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	2014-12-05 20:38:42.386401000 +0100
-+++ gnome-screensaver-3.6.1/configure.ac	2014-12-05 20:42:07.474443655 +0100
-@@ -761,6 +761,7 @@
- po/Makefile.in
- src/Makefile
- src/gnome-screensaver.desktop.in
-+src/gnome-screensaver-autostart.desktop.in
- data/Makefile
- doc/Makefile
- doc/gnome-screensaver.xml
-diff -Naur gnome-screensaver-3.6.1.orig/po/POTFILES.in gnome-screensaver-3.6.1/po/POTFILES.in
---- gnome-screensaver-3.6.1.orig/po/POTFILES.in	2012-06-11 17:05:23.000000000 +0200
-+++ gnome-screensaver-3.6.1/po/POTFILES.in	2014-12-05 20:39:45.921183441 +0100
-@@ -4,6 +4,7 @@
- src/gnome-screensaver-dialog.c
- src/gnome-screensaver.c
- src/gnome-screensaver.desktop.in.in
-+src/gnome-screensaver-autostart.desktop.in.in
- src/gs-auth-pam.c
- src/gs-listener-dbus.c
- src/gs-lock-plug.c
-diff -Naur gnome-screensaver-3.6.1.orig/po/POTFILES.skip gnome-screensaver-3.6.1/po/POTFILES.skip
---- gnome-screensaver-3.6.1.orig/po/POTFILES.skip	2012-06-11 17:05:23.000000000 +0200
-+++ gnome-screensaver-3.6.1/po/POTFILES.skip	2014-12-05 20:39:47.271214330 +0100
-@@ -1 +1,2 @@
- src/gnome-screensaver.desktop.in
-+src/gnome-screensaver-autostart.desktop.in
-diff -Naur gnome-screensaver-3.6.1.orig/src/gnome-screensaver-autostart.desktop.in.in gnome-screensaver-3.6.1/src/gnome-screensaver-autostart.desktop.in.in
---- gnome-screensaver-3.6.1.orig/src/gnome-screensaver-autostart.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-screensaver-3.6.1/src/gnome-screensaver-autostart.desktop.in.in	2014-12-05 20:41:04.679658977 +0100
-@@ -0,0 +1,14 @@
-+[Desktop Entry]
-+Type=Application
-+_Name=Screensaver
-+_Comment=Launch screensaver and locker program
-+Icon=preferences-desktop-screensaver
-+Exec=gnome-screensaver
-+OnlyShowIn=GNOME-Flashback;
-+NoDisplay=true
-+X-GNOME-Autostart-Phase=Application
-+X-GNOME-Autostart-Notify=true
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=gnome-screensaver
-+X-GNOME-Bugzilla-Component=general
-+X-GNOME-Bugzilla-Version=@VERSION@
-diff -Naur gnome-screensaver-3.6.1.orig/src/gnome-screensaver.desktop.in.in gnome-screensaver-3.6.1/src/gnome-screensaver.desktop.in.in
---- gnome-screensaver-3.6.1.orig/src/gnome-screensaver.desktop.in.in	2014-12-05 20:38:42.383068000 +0100
-+++ gnome-screensaver-3.6.1/src/gnome-screensaver.desktop.in.in	2014-12-05 20:41:22.556738056 +0100
-@@ -4,7 +4,6 @@
- _Comment=Launch screensaver and locker program
- Icon=preferences-desktop-screensaver
- Exec=gnome-screensaver
--OnlyShowIn=GNOME;
- NoDisplay=true
- X-GNOME-Autostart-Phase=Application
- X-GNOME-Autostart-Notify=true
-diff -Naur gnome-screensaver-3.6.1.orig/src/Makefile.am gnome-screensaver-3.6.1/src/Makefile.am
---- gnome-screensaver-3.6.1.orig/src/Makefile.am	2014-12-05 20:38:42.383068000 +0100
-+++ gnome-screensaver-3.6.1/src/Makefile.am	2014-12-05 20:52:28.649076834 +0100
-@@ -47,6 +47,10 @@
- 	test-window	\
- 	$(NULL)
- 
-+autostartdir = $(sysconfdir)/xdg/autostart
-+autostart_in_files = gnome-screensaver-autostart.desktop.in
-+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-+
- desktopdir = $(datadir)/applications
- desktop_in_files = gnome-screensaver.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@@ -197,15 +201,18 @@
- 
- gnome_screensaver_LDFLAGS = -export-dynamic
- 
--EXTRA_DIST =				\
--	debug-screensaver.sh		\
--	gs-marshal.list			\
--	gnome-screensaver.desktop.in	\
-+EXTRA_DIST =					\
-+	debug-screensaver.sh			\
-+	gs-marshal.list				\
-+	gnome-screensaver.desktop.in		\
-+	gnome-screensaver-autostart.desktop.in	\
- 	$(NULL)
- 
--CLEANFILES = 				\
--	$(desktop_DATA) 		\
--	gnome-screensaver.desktop.in	\
-+CLEANFILES = 					\
-+	$(autostart_DATA) 			\
-+	$(desktop_DATA) 			\
-+	gnome-screensaver.desktop.in		\
-+	gnome-screensaver-autostart.desktop.in	\
- 	$(BUILT_SOURCES)
- 
- MAINTAINERCLEANFILES =			\