Date: Thursday, April 25, 2013 @ 00:19:30 Author: bgyorgy Revision: 88928
upgpkg: gnome-settings-daemon-compat 3.6.4-3 Move desktop files out of autostart, so they can be easily reusable in custom sessions Added: gnome-settings-daemon-compat/trunk/move-desktop-file.patch Modified: gnome-settings-daemon-compat/trunk/PKGBUILD gnome-settings-daemon-compat/trunk/standalone-background-helper.patch gnome-settings-daemon-compat/trunk/standalone-media-keys-helper.patch Deleted: gnome-settings-daemon-compat/trunk/flashback-rename.patch ------------------------------------+ PKGBUILD | 22 ++++++------ flashback-rename.patch | 27 --------------- move-desktop-file.patch | 60 +++++++++++++++++++++++++++++++++++ standalone-background-helper.patch | 4 +- standalone-media-keys-helper.patch | 4 +- 5 files changed, 75 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-24 21:31:30 UTC (rev 88927) +++ PKGBUILD 2013-04-24 22:19:30 UTC (rev 88928) @@ -5,12 +5,12 @@ pkgname=gnome-settings-daemon-compat _pkgname=gnome-settings-daemon pkgver=3.6.4 -pkgrel=2 -pkgdesc="Compatibility package that provides background and mount helpers for the Gnome Flashback session" +pkgrel=3 +pkgdesc="Compatibility package that provides background, media keys and mount helpers for the Gnome Flashback session" arch=('i686' 'x86_64') license=('GPL') depends=('gnome-settings-daemon') -makedepends=('docbook-xsl' 'ibus' 'intltool' 'libcanberra' 'libnotify' 'libpulse' 'libwacom' 'nss' 'upower' 'xf86-input-wacom') +makedepends=('docbook-xsl' 'intltool' 'xf86-input-wacom') url="https://live.gnome.org/GnomeFlashback" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz standalone-background-helper.patch @@ -19,17 +19,17 @@ sessionisactive-port.patch revert-input-sources.patch xinput.patch - flashback-rename.patch - remove-libgsd-dependency.patch) + remove-libgsd-dependency.patch + move-desktop-file.patch) sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' - 'f9781a17d7baa2777b16fa2c71fb6053612131cffcfffcc635d49f9dacb1e637' - '4776de33b1517976b308a9ce23661cd0ac68ddd2bcf41465c73f8a2e2d09d20c' + '2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9' + 'ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162' '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a' '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915' '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a' 'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d' - '1edabf1a5a56d4b797ccdb7d5003bad396eebe98541d5aa330c9851340b68dfe' - '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c') + '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c' + 'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4') build() { cd $_pkgname-$pkgver @@ -51,8 +51,8 @@ # Remove libgsd dependency patch -Np1 -i ../remove-libgsd-dependency.patch - # GNOME Fallback renamed to Flashback - patch -Np1 -i ../flashback-rename.patch + # Move desktop files out of autostart, so they can be easily reusable in custom sessions + patch -Np1 -i ../move-desktop-file.patch autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \ Deleted: flashback-rename.patch =================================================================== --- flashback-rename.patch 2013-04-24 21:31:30 UTC (rev 88927) +++ flashback-rename.patch 2013-04-24 22:19:30 UTC (rev 88928) @@ -1,27 +0,0 @@ -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 14:34:43.743878119 +0200 -@@ -9,4 +9,4 @@ - NoDisplay=true - OnlyShowIn=GNOME;Unity; - X-GNOME-Autostart-Notify=true --AutostartCondition=GNOME3 if-session gnome-fallback -+AutostartCondition=GNOME3 if-session gnome-flashback -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 14:32:47.290988000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 14:34:43.743878119 +0200 -@@ -9,4 +9,4 @@ - NoDisplay=true - OnlyShowIn=GNOME;Unity; - X-GNOME-Autostart-Notify=true --AutostartCondition=GNOME3 if-session gnome-fallback -+AutostartCondition=GNOME3 if-session gnome-flashback -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 14:32:52.807791000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 14:35:16.714696636 +0200 -@@ -9,4 +9,4 @@ - NoDisplay=true - OnlyShowIn=GNOME;Unity; - X-GNOME-Autostart-Notify=true --AutostartCondition=GNOME3 if-session gnome-fallback -+AutostartCondition=GNOME3 if-session gnome-flashback Added: move-desktop-file.patch =================================================================== --- move-desktop-file.patch (rev 0) +++ move-desktop-file.patch 2013-04-24 22:19:30 UTC (rev 88928) @@ -0,0 +1,60 @@ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 23:13:10.169941000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 23:13:41.064001562 +0200 +@@ -9,4 +9,3 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am 2013-04-24 23:13:12.830004000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am 2013-04-24 23:13:36.613896914 +0200 +@@ -21,7 +21,7 @@ + $(SYSTEMD_LIBS) \ + $(AUTOMOUNT_LIBS) + +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/applications + autostart_in_files = gnome-fallback-mount-helper.desktop.in + autostart_in_in_files = gnome-fallback-mount-helper.desktop.in.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 23:13:07.229872000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 23:13:43.670729520 +0200 +@@ -9,4 +9,3 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am 2013-04-24 23:13:04.913151000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am 2013-04-24 23:13:47.907495798 +0200 +@@ -17,7 +17,7 @@ + $(SETTINGS_PLUGIN_LIBS) \ + $(BACKGROUND_LIBS) + +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/applications + autostart_in_files = gnome-fallback-background-helper.desktop.in + autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 23:12:58.579668000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 23:13:51.747586073 +0200 +@@ -9,4 +9,3 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am 2013-04-24 23:13:02.026416000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am 2013-04-24 23:13:54.570985777 +0200 +@@ -75,7 +75,7 @@ + $(MEDIA_KEYS_LIBS) \ + -lm + +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/applications + autostart_in_files = gnome-fallback-media-keys-helper.desktop.in + autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) Modified: standalone-background-helper.patch =================================================================== --- standalone-background-helper.patch 2013-04-24 21:31:30 UTC (rev 88927) +++ standalone-background-helper.patch 2013-04-24 22:19:30 UTC (rev 88928) @@ -114,8 +114,8 @@ +++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 17:39:36.450215685 +0200 @@ -0,0 +1,12 @@ +[Desktop Entry] -+_Name=Background Helper -+_Comment=Draw desktop background ++_Name=Background ++_Comment=Background plugin +Exec=@LIBEXECDIR@/gnome-fallback-background-helper +Icon=desktop +Terminal=false Modified: standalone-media-keys-helper.patch =================================================================== --- standalone-media-keys-helper.patch 2013-04-24 21:31:30 UTC (rev 88927) +++ standalone-media-keys-helper.patch 2013-04-24 22:19:30 UTC (rev 88928) @@ -84,9 +84,9 @@ @@ -0,0 +1,12 @@ +[Desktop Entry] +_Name=Media keys -+_Comment=Handle media keys ++_Comment=Media keys plugin +Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper -+Icon=drive-optical ++Icon=multimedia +Terminal=false +Type=Application +Categories=