[arch-commits] Commit in gnome-flashback/repos (10 files)

Balló György bgyorgy at archlinux.org
Mon Apr 24 13:21:49 UTC 2017


    Date: Monday, April 24, 2017 @ 13:21:48
  Author: bgyorgy
Revision: 225136

archrelease: copy trunk to community-i686, community-x86_64

Added:
  gnome-flashback/repos/community-i686/0001-menus-Don-t-exclude-any-desktop-files.patch
    (from rev 225135, gnome-flashback/trunk/0001-menus-Don-t-exclude-any-desktop-files.patch)
  gnome-flashback/repos/community-i686/PKGBUILD
    (from rev 225135, gnome-flashback/trunk/PKGBUILD)
  gnome-flashback/repos/community-x86_64/0001-menus-Don-t-exclude-any-desktop-files.patch
    (from rev 225135, gnome-flashback/trunk/0001-menus-Don-t-exclude-any-desktop-files.patch)
  gnome-flashback/repos/community-x86_64/PKGBUILD
    (from rev 225135, gnome-flashback/trunk/PKGBUILD)
Deleted:
  gnome-flashback/repos/community-i686/0001-end-session-dialog-ignore-invalid-inhibitor.patch
  gnome-flashback/repos/community-i686/0001-menus-Don-t-exclude-any-desktop-files.patch
  gnome-flashback/repos/community-i686/PKGBUILD
  gnome-flashback/repos/community-x86_64/0001-end-session-dialog-ignore-invalid-inhibitor.patch
  gnome-flashback/repos/community-x86_64/0001-menus-Don-t-exclude-any-desktop-files.patch
  gnome-flashback/repos/community-x86_64/PKGBUILD

-------------------------------------------------------------------------+
 /0001-menus-Don-t-exclude-any-desktop-files.patch                       |  226 ++++++++++
 /PKGBUILD                                                               |   74 +++
 community-i686/0001-end-session-dialog-ignore-invalid-inhibitor.patch   |   27 -
 community-i686/0001-menus-Don-t-exclude-any-desktop-files.patch         |  127 -----
 community-i686/PKGBUILD                                                 |   40 -
 community-x86_64/0001-end-session-dialog-ignore-invalid-inhibitor.patch |   27 -
 community-x86_64/0001-menus-Don-t-exclude-any-desktop-files.patch       |  127 -----
 community-x86_64/PKGBUILD                                               |   40 -
 8 files changed, 300 insertions(+), 388 deletions(-)

Deleted: community-i686/0001-end-session-dialog-ignore-invalid-inhibitor.patch
===================================================================
--- community-i686/0001-end-session-dialog-ignore-invalid-inhibitor.patch	2017-04-24 13:21:42 UTC (rev 225135)
+++ community-i686/0001-end-session-dialog-ignore-invalid-inhibitor.patch	2017-04-24 13:21:48 UTC (rev 225136)
@@ -1,27 +0,0 @@
-From 64f6806ec3942f6d2ac431c32883845200b37afc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels at gmail.com>
-Date: Fri, 18 Nov 2016 17:14:11 +0200
-Subject: end-session-dialog: ignore invalid inhibitor
-
-https://bugzilla.gnome.org/show_bug.cgi?id=771759
----
- gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c b/gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c
-index 50b2b36..b5f8fa2 100644
---- a/gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c
-+++ b/gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c
-@@ -295,6 +295,9 @@ add_inhibitor (GfInhibitDialog *dialog,
-   name = NULL;
-   pixbuf = NULL;
- 
-+  if (app_id == NULL)
-+    return;
-+
-   if (!IS_STRING_EMPTY (app_id))
-     {
-       if (!g_str_has_suffix (app_id, ".desktop"))
--- 
-cgit v0.12
-

Deleted: community-i686/0001-menus-Don-t-exclude-any-desktop-files.patch
===================================================================
--- community-i686/0001-menus-Don-t-exclude-any-desktop-files.patch	2017-04-24 13:21:42 UTC (rev 225135)
+++ community-i686/0001-menus-Don-t-exclude-any-desktop-files.patch	2017-04-24 13:21:48 UTC (rev 225136)
@@ -1,127 +0,0 @@
-From caa6a3c9271b01b11ca1e80bdbf87e500bb0438f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sat, 15 Oct 2016 00:28:42 +0200
-Subject: [PATCH] menus: Don't exclude any desktop files
-
-Otherwise these are listed in the "Other" section, which is not the proper place.
----
- data/menus/gnome-flashback-applications.menu | 96 +---------------------------
- 1 file changed, 1 insertion(+), 95 deletions(-)
-
-diff --git a/data/menus/gnome-flashback-applications.menu b/data/menus/gnome-flashback-applications.menu
-index a267f4f..0372835 100644
---- a/data/menus/gnome-flashback-applications.menu
-+++ b/data/menus/gnome-flashback-applications.menu
-@@ -151,54 +151,7 @@
-       <Include>
-         <And>
-           <Category>Settings</Category>
--          <Not>
--            <Or>
--              <Category>System</Category>
--              <Category>X-GNOME-Settings-Panel</Category>
--              <Category>X-Unity-Settings-Panel</Category>
--              <Filename>alacarte.desktop</Filename>
--              <Filename>caribou.desktop</Filename>
--              <Filename>dconf-editor.desktop</Filename>
--              <Filename>fedora-im-chooser.desktop</Filename>
--              <Filename>fedora-release-notes.desktop</Filename>
--              <Filename>firewall-config.desktop</Filename>
--              <Filename>flash-player-properties.desktop</Filename>
--              <Filename>gconf-editor.desktop</Filename>
--              <Filename>gnome-abrt.desktop</Filename>
--              <Filename>fedora-abrt.desktop</Filename>
--              <Filename>gnome-orca.desktop</Filename>
--              <Filename>gnome-power-statistics.desktop</Filename>
--              <Filename>gnome-user-share-properties.desktop</Filename>
--              <Filename>ibus.desktop</Filename>
--              <Filename>ibus-daemon.desktop</Filename>
--              <Filename>ibus-setup-anthy.desktop</Filename>
--              <Filename>ibus-setup.desktop</Filename>
--              <Filename>ibus-setup-hangul.desktop</Filename>
--              <Filename>ibus-setup-libbopomofo.desktop</Filename>
--              <Filename>ibus-setup-libpinyin.desktop</Filename>
--              <Filename>ibus-setup-m17n.desktop</Filename>
--              <Filename>ibus-setup-typing-booster.desktop</Filename>
--              <Filename>im-chooser.desktop</Filename>
--              <Filename>itweb-settings.desktop</Filename>
--              <Filename>jhbuild.desktop</Filename>
--              <Filename>javaws.desktop</Filename>
--              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
--              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
--              <Filename>log4j-chainsaw.desktop</Filename>
--              <Filename>log4j-logfactor5.desktop</Filename>
--              <Filename>nm-connection-editor.desktop</Filename>
--              <Filename>orca.desktop</Filename>
--              <Filename>setroubleshoot.desktop</Filename>
--              <Filename>authconfig.desktop</Filename>
--              <Filename>system-config-date.desktop</Filename>
--              <Filename>system-config-firewall.desktop</Filename>
--              <Filename>system-config-keyboard.desktop</Filename>
--              <Filename>system-config-language.desktop</Filename>
--              <Filename>system-config-printer.desktop</Filename>
--              <Filename>system-config-users.desktop</Filename>
--              <Filename>vino-preferences.desktop</Filename>
--            </Or>
--          </Not>
-+          <Not><Category>System</Category></Not>
-         </And>
-       </Include>
-     </Menu>
-@@ -209,53 +162,6 @@
-         <And>
-           <Category>Settings</Category>
-           <Category>System</Category>
--          <Not>
--            <Or>
--              <Category>X-GNOME-Settings-Panel</Category>
--              <Category>X-Unity-Settings-Panel</Category>
--              <Filename>alacarte.desktop</Filename>
--              <Filename>caribou.desktop</Filename>
--              <Filename>dconf-editor.desktop</Filename>
--              <Filename>fedora-im-chooser.desktop</Filename>
--              <Filename>fedora-release-notes.desktop</Filename>
--              <Filename>firewall-config.desktop</Filename>
--              <Filename>flash-player-properties.desktop</Filename>
--              <Filename>gconf-editor.desktop</Filename>
--              <Filename>gnome-abrt.desktop</Filename>
--              <Filename>fedora-abrt.desktop</Filename>
--              <Filename>gnome-orca.desktop</Filename>
--              <Filename>gnome-power-statistics.desktop</Filename>
--              <Filename>gnome-user-share-properties.desktop</Filename>
--              <Filename>ibus.desktop</Filename>
--              <Filename>ibus-daemon.desktop</Filename>
--              <Filename>ibus-setup-anthy.desktop</Filename>
--              <Filename>ibus-setup.desktop</Filename>
--              <Filename>ibus-setup-hangul.desktop</Filename>
--              <Filename>ibus-setup-libbopomofo.desktop</Filename>
--              <Filename>ibus-setup-libpinyin.desktop</Filename>
--              <Filename>ibus-setup-m17n.desktop</Filename>
--              <Filename>ibus-setup-typing-booster.desktop</Filename>
--              <Filename>im-chooser.desktop</Filename>
--              <Filename>itweb-settings.desktop</Filename>
--              <Filename>jhbuild.desktop</Filename>
--              <Filename>javaws.desktop</Filename>
--              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
--              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
--              <Filename>log4j-chainsaw.desktop</Filename>
--              <Filename>log4j-logfactor5.desktop</Filename>
--              <Filename>nm-connection-editor.desktop</Filename>
--              <Filename>orca.desktop</Filename>
--              <Filename>setroubleshoot.desktop</Filename>
--              <Filename>authconfig.desktop</Filename>
--              <Filename>system-config-date.desktop</Filename>
--              <Filename>system-config-firewall.desktop</Filename>
--              <Filename>system-config-keyboard.desktop</Filename>
--              <Filename>system-config-language.desktop</Filename>
--              <Filename>system-config-printer.desktop</Filename>
--              <Filename>system-config-users.desktop</Filename>
--              <Filename>vino-preferences.desktop</Filename>
--            </Or>
--          </Not>
-         </And>
-       </Include>
-     </Menu>
--- 
-2.10.0
-

Copied: gnome-flashback/repos/community-i686/0001-menus-Don-t-exclude-any-desktop-files.patch (from rev 225135, gnome-flashback/trunk/0001-menus-Don-t-exclude-any-desktop-files.patch)
===================================================================
--- community-i686/0001-menus-Don-t-exclude-any-desktop-files.patch	                        (rev 0)
+++ community-i686/0001-menus-Don-t-exclude-any-desktop-files.patch	2017-04-24 13:21:48 UTC (rev 225136)
@@ -0,0 +1,113 @@
+From 8854ba39819590abae21f726b5479e660df6f966 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Mon, 24 Apr 2017 15:14:39 +0200
+Subject: [PATCH] menus: Don't exclude any desktop files
+
+Otherwise these are listed in the "Other" section, which is not the proper place.
+---
+ data/menus/gnome-flashback-applications.menu | 82 ----------------------------
+ 1 file changed, 82 deletions(-)
+
+diff --git a/data/menus/gnome-flashback-applications.menu b/data/menus/gnome-flashback-applications.menu
+index a267f4f..4437bee 100644
+--- a/data/menus/gnome-flashback-applications.menu
++++ b/data/menus/gnome-flashback-applications.menu
+@@ -156,47 +156,6 @@
+               <Category>System</Category>
+               <Category>X-GNOME-Settings-Panel</Category>
+               <Category>X-Unity-Settings-Panel</Category>
+-              <Filename>alacarte.desktop</Filename>
+-              <Filename>caribou.desktop</Filename>
+-              <Filename>dconf-editor.desktop</Filename>
+-              <Filename>fedora-im-chooser.desktop</Filename>
+-              <Filename>fedora-release-notes.desktop</Filename>
+-              <Filename>firewall-config.desktop</Filename>
+-              <Filename>flash-player-properties.desktop</Filename>
+-              <Filename>gconf-editor.desktop</Filename>
+-              <Filename>gnome-abrt.desktop</Filename>
+-              <Filename>fedora-abrt.desktop</Filename>
+-              <Filename>gnome-orca.desktop</Filename>
+-              <Filename>gnome-power-statistics.desktop</Filename>
+-              <Filename>gnome-user-share-properties.desktop</Filename>
+-              <Filename>ibus.desktop</Filename>
+-              <Filename>ibus-daemon.desktop</Filename>
+-              <Filename>ibus-setup-anthy.desktop</Filename>
+-              <Filename>ibus-setup.desktop</Filename>
+-              <Filename>ibus-setup-hangul.desktop</Filename>
+-              <Filename>ibus-setup-libbopomofo.desktop</Filename>
+-              <Filename>ibus-setup-libpinyin.desktop</Filename>
+-              <Filename>ibus-setup-m17n.desktop</Filename>
+-              <Filename>ibus-setup-typing-booster.desktop</Filename>
+-              <Filename>im-chooser.desktop</Filename>
+-              <Filename>itweb-settings.desktop</Filename>
+-              <Filename>jhbuild.desktop</Filename>
+-              <Filename>javaws.desktop</Filename>
+-              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
+-              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
+-              <Filename>log4j-chainsaw.desktop</Filename>
+-              <Filename>log4j-logfactor5.desktop</Filename>
+-              <Filename>nm-connection-editor.desktop</Filename>
+-              <Filename>orca.desktop</Filename>
+-              <Filename>setroubleshoot.desktop</Filename>
+-              <Filename>authconfig.desktop</Filename>
+-              <Filename>system-config-date.desktop</Filename>
+-              <Filename>system-config-firewall.desktop</Filename>
+-              <Filename>system-config-keyboard.desktop</Filename>
+-              <Filename>system-config-language.desktop</Filename>
+-              <Filename>system-config-printer.desktop</Filename>
+-              <Filename>system-config-users.desktop</Filename>
+-              <Filename>vino-preferences.desktop</Filename>
+             </Or>
+           </Not>
+         </And>
+@@ -213,47 +172,6 @@
+             <Or>
+               <Category>X-GNOME-Settings-Panel</Category>
+               <Category>X-Unity-Settings-Panel</Category>
+-              <Filename>alacarte.desktop</Filename>
+-              <Filename>caribou.desktop</Filename>
+-              <Filename>dconf-editor.desktop</Filename>
+-              <Filename>fedora-im-chooser.desktop</Filename>
+-              <Filename>fedora-release-notes.desktop</Filename>
+-              <Filename>firewall-config.desktop</Filename>
+-              <Filename>flash-player-properties.desktop</Filename>
+-              <Filename>gconf-editor.desktop</Filename>
+-              <Filename>gnome-abrt.desktop</Filename>
+-              <Filename>fedora-abrt.desktop</Filename>
+-              <Filename>gnome-orca.desktop</Filename>
+-              <Filename>gnome-power-statistics.desktop</Filename>
+-              <Filename>gnome-user-share-properties.desktop</Filename>
+-              <Filename>ibus.desktop</Filename>
+-              <Filename>ibus-daemon.desktop</Filename>
+-              <Filename>ibus-setup-anthy.desktop</Filename>
+-              <Filename>ibus-setup.desktop</Filename>
+-              <Filename>ibus-setup-hangul.desktop</Filename>
+-              <Filename>ibus-setup-libbopomofo.desktop</Filename>
+-              <Filename>ibus-setup-libpinyin.desktop</Filename>
+-              <Filename>ibus-setup-m17n.desktop</Filename>
+-              <Filename>ibus-setup-typing-booster.desktop</Filename>
+-              <Filename>im-chooser.desktop</Filename>
+-              <Filename>itweb-settings.desktop</Filename>
+-              <Filename>jhbuild.desktop</Filename>
+-              <Filename>javaws.desktop</Filename>
+-              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
+-              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
+-              <Filename>log4j-chainsaw.desktop</Filename>
+-              <Filename>log4j-logfactor5.desktop</Filename>
+-              <Filename>nm-connection-editor.desktop</Filename>
+-              <Filename>orca.desktop</Filename>
+-              <Filename>setroubleshoot.desktop</Filename>
+-              <Filename>authconfig.desktop</Filename>
+-              <Filename>system-config-date.desktop</Filename>
+-              <Filename>system-config-firewall.desktop</Filename>
+-              <Filename>system-config-keyboard.desktop</Filename>
+-              <Filename>system-config-language.desktop</Filename>
+-              <Filename>system-config-printer.desktop</Filename>
+-              <Filename>system-config-users.desktop</Filename>
+-              <Filename>vino-preferences.desktop</Filename>
+             </Or>
+           </Not>
+         </And>
+-- 
+2.12.2
+

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-04-24 13:21:42 UTC (rev 225135)
+++ community-i686/PKGBUILD	2017-04-24 13:21:48 UTC (rev 225136)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gnome-flashback
-pkgver=3.22.0
-pkgrel=2
-pkgdesc="GNOME Flashback session"
-arch=('i686' 'x86_64')
-url="https://wiki.gnome.org/Projects/GnomeFlashback"
-license=('GPL')
-depends=('gnome-bluetooth' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' 'gnome-themes-standard' 'libibus' 'metacity' 'nautilus')
-makedepends=('intltool')
-optdepends=('gnome-backgrounds: Default background'
-            'gnome-control-center: System settings'
-            'gnome-screensaver: Lock screen'
-            'network-manager-applet: Network management')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        0001-end-session-dialog-ignore-invalid-inhibitor.patch
-        0001-menus-Don-t-exclude-any-desktop-files.patch)
-sha256sums=('b4a9e891879e99fb1b02854e7d01ff4f89c1917434de4adb5c7430a71b85a0ec'
-            '7cab34d50a30387327d6e6ce049692a886f5dbf6b6afa0791467c69c10916e44'
-            '0caa399bf9ccf4eb098202dd8e6cefa0b80f5001596d04031f5448b5c35da5de')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../0001-end-session-dialog-ignore-invalid-inhibitor.patch
-  patch -Np1 -i ../0001-menus-Don-t-exclude-any-desktop-files.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-flashback/repos/community-i686/PKGBUILD (from rev 225135, gnome-flashback/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-04-24 13:21:48 UTC (rev 225136)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=gnome-flashback
+pkgver=3.24.0
+pkgrel=1
+pkgdesc="GNOME Flashback session"
+arch=('i686' 'x86_64')
+url="https://wiki.gnome.org/Projects/GnomeFlashback"
+license=('GPL')
+depends=('gnome-bluetooth' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' 'gnome-themes-standard' 'libibus' 'metacity' 'nautilus')
+makedepends=('intltool')
+optdepends=('gnome-backgrounds: Default background'
+            'gnome-control-center: System settings'
+            'gnome-screensaver: Lock screen'
+            'network-manager-applet: Network management')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        0001-menus-Don-t-exclude-any-desktop-files.patch)
+sha256sums=('ebe0a5ce1f634a42332f872b5b4ebb504c2d5d7409b0822525359d62e54f7126'
+            '80f5f5d9e0593661920624c3d7b2aa47d1fa1dfe1dcdf9f5bfb83be59eb3c465')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../0001-menus-Don-t-exclude-any-desktop-files.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-x86_64/0001-end-session-dialog-ignore-invalid-inhibitor.patch
===================================================================
--- community-x86_64/0001-end-session-dialog-ignore-invalid-inhibitor.patch	2017-04-24 13:21:42 UTC (rev 225135)
+++ community-x86_64/0001-end-session-dialog-ignore-invalid-inhibitor.patch	2017-04-24 13:21:48 UTC (rev 225136)
@@ -1,27 +0,0 @@
-From 64f6806ec3942f6d2ac431c32883845200b37afc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels at gmail.com>
-Date: Fri, 18 Nov 2016 17:14:11 +0200
-Subject: end-session-dialog: ignore invalid inhibitor
-
-https://bugzilla.gnome.org/show_bug.cgi?id=771759
----
- gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c b/gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c
-index 50b2b36..b5f8fa2 100644
---- a/gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c
-+++ b/gnome-flashback/libend-session-dialog/gf-inhibit-dialog.c
-@@ -295,6 +295,9 @@ add_inhibitor (GfInhibitDialog *dialog,
-   name = NULL;
-   pixbuf = NULL;
- 
-+  if (app_id == NULL)
-+    return;
-+
-   if (!IS_STRING_EMPTY (app_id))
-     {
-       if (!g_str_has_suffix (app_id, ".desktop"))
--- 
-cgit v0.12
-

Deleted: community-x86_64/0001-menus-Don-t-exclude-any-desktop-files.patch
===================================================================
--- community-x86_64/0001-menus-Don-t-exclude-any-desktop-files.patch	2017-04-24 13:21:42 UTC (rev 225135)
+++ community-x86_64/0001-menus-Don-t-exclude-any-desktop-files.patch	2017-04-24 13:21:48 UTC (rev 225136)
@@ -1,127 +0,0 @@
-From caa6a3c9271b01b11ca1e80bdbf87e500bb0438f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sat, 15 Oct 2016 00:28:42 +0200
-Subject: [PATCH] menus: Don't exclude any desktop files
-
-Otherwise these are listed in the "Other" section, which is not the proper place.
----
- data/menus/gnome-flashback-applications.menu | 96 +---------------------------
- 1 file changed, 1 insertion(+), 95 deletions(-)
-
-diff --git a/data/menus/gnome-flashback-applications.menu b/data/menus/gnome-flashback-applications.menu
-index a267f4f..0372835 100644
---- a/data/menus/gnome-flashback-applications.menu
-+++ b/data/menus/gnome-flashback-applications.menu
-@@ -151,54 +151,7 @@
-       <Include>
-         <And>
-           <Category>Settings</Category>
--          <Not>
--            <Or>
--              <Category>System</Category>
--              <Category>X-GNOME-Settings-Panel</Category>
--              <Category>X-Unity-Settings-Panel</Category>
--              <Filename>alacarte.desktop</Filename>
--              <Filename>caribou.desktop</Filename>
--              <Filename>dconf-editor.desktop</Filename>
--              <Filename>fedora-im-chooser.desktop</Filename>
--              <Filename>fedora-release-notes.desktop</Filename>
--              <Filename>firewall-config.desktop</Filename>
--              <Filename>flash-player-properties.desktop</Filename>
--              <Filename>gconf-editor.desktop</Filename>
--              <Filename>gnome-abrt.desktop</Filename>
--              <Filename>fedora-abrt.desktop</Filename>
--              <Filename>gnome-orca.desktop</Filename>
--              <Filename>gnome-power-statistics.desktop</Filename>
--              <Filename>gnome-user-share-properties.desktop</Filename>
--              <Filename>ibus.desktop</Filename>
--              <Filename>ibus-daemon.desktop</Filename>
--              <Filename>ibus-setup-anthy.desktop</Filename>
--              <Filename>ibus-setup.desktop</Filename>
--              <Filename>ibus-setup-hangul.desktop</Filename>
--              <Filename>ibus-setup-libbopomofo.desktop</Filename>
--              <Filename>ibus-setup-libpinyin.desktop</Filename>
--              <Filename>ibus-setup-m17n.desktop</Filename>
--              <Filename>ibus-setup-typing-booster.desktop</Filename>
--              <Filename>im-chooser.desktop</Filename>
--              <Filename>itweb-settings.desktop</Filename>
--              <Filename>jhbuild.desktop</Filename>
--              <Filename>javaws.desktop</Filename>
--              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
--              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
--              <Filename>log4j-chainsaw.desktop</Filename>
--              <Filename>log4j-logfactor5.desktop</Filename>
--              <Filename>nm-connection-editor.desktop</Filename>
--              <Filename>orca.desktop</Filename>
--              <Filename>setroubleshoot.desktop</Filename>
--              <Filename>authconfig.desktop</Filename>
--              <Filename>system-config-date.desktop</Filename>
--              <Filename>system-config-firewall.desktop</Filename>
--              <Filename>system-config-keyboard.desktop</Filename>
--              <Filename>system-config-language.desktop</Filename>
--              <Filename>system-config-printer.desktop</Filename>
--              <Filename>system-config-users.desktop</Filename>
--              <Filename>vino-preferences.desktop</Filename>
--            </Or>
--          </Not>
-+          <Not><Category>System</Category></Not>
-         </And>
-       </Include>
-     </Menu>
-@@ -209,53 +162,6 @@
-         <And>
-           <Category>Settings</Category>
-           <Category>System</Category>
--          <Not>
--            <Or>
--              <Category>X-GNOME-Settings-Panel</Category>
--              <Category>X-Unity-Settings-Panel</Category>
--              <Filename>alacarte.desktop</Filename>
--              <Filename>caribou.desktop</Filename>
--              <Filename>dconf-editor.desktop</Filename>
--              <Filename>fedora-im-chooser.desktop</Filename>
--              <Filename>fedora-release-notes.desktop</Filename>
--              <Filename>firewall-config.desktop</Filename>
--              <Filename>flash-player-properties.desktop</Filename>
--              <Filename>gconf-editor.desktop</Filename>
--              <Filename>gnome-abrt.desktop</Filename>
--              <Filename>fedora-abrt.desktop</Filename>
--              <Filename>gnome-orca.desktop</Filename>
--              <Filename>gnome-power-statistics.desktop</Filename>
--              <Filename>gnome-user-share-properties.desktop</Filename>
--              <Filename>ibus.desktop</Filename>
--              <Filename>ibus-daemon.desktop</Filename>
--              <Filename>ibus-setup-anthy.desktop</Filename>
--              <Filename>ibus-setup.desktop</Filename>
--              <Filename>ibus-setup-hangul.desktop</Filename>
--              <Filename>ibus-setup-libbopomofo.desktop</Filename>
--              <Filename>ibus-setup-libpinyin.desktop</Filename>
--              <Filename>ibus-setup-m17n.desktop</Filename>
--              <Filename>ibus-setup-typing-booster.desktop</Filename>
--              <Filename>im-chooser.desktop</Filename>
--              <Filename>itweb-settings.desktop</Filename>
--              <Filename>jhbuild.desktop</Filename>
--              <Filename>javaws.desktop</Filename>
--              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
--              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
--              <Filename>log4j-chainsaw.desktop</Filename>
--              <Filename>log4j-logfactor5.desktop</Filename>
--              <Filename>nm-connection-editor.desktop</Filename>
--              <Filename>orca.desktop</Filename>
--              <Filename>setroubleshoot.desktop</Filename>
--              <Filename>authconfig.desktop</Filename>
--              <Filename>system-config-date.desktop</Filename>
--              <Filename>system-config-firewall.desktop</Filename>
--              <Filename>system-config-keyboard.desktop</Filename>
--              <Filename>system-config-language.desktop</Filename>
--              <Filename>system-config-printer.desktop</Filename>
--              <Filename>system-config-users.desktop</Filename>
--              <Filename>vino-preferences.desktop</Filename>
--            </Or>
--          </Not>
-         </And>
-       </Include>
-     </Menu>
--- 
-2.10.0
-

Copied: gnome-flashback/repos/community-x86_64/0001-menus-Don-t-exclude-any-desktop-files.patch (from rev 225135, gnome-flashback/trunk/0001-menus-Don-t-exclude-any-desktop-files.patch)
===================================================================
--- community-x86_64/0001-menus-Don-t-exclude-any-desktop-files.patch	                        (rev 0)
+++ community-x86_64/0001-menus-Don-t-exclude-any-desktop-files.patch	2017-04-24 13:21:48 UTC (rev 225136)
@@ -0,0 +1,113 @@
+From 8854ba39819590abae21f726b5479e660df6f966 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Mon, 24 Apr 2017 15:14:39 +0200
+Subject: [PATCH] menus: Don't exclude any desktop files
+
+Otherwise these are listed in the "Other" section, which is not the proper place.
+---
+ data/menus/gnome-flashback-applications.menu | 82 ----------------------------
+ 1 file changed, 82 deletions(-)
+
+diff --git a/data/menus/gnome-flashback-applications.menu b/data/menus/gnome-flashback-applications.menu
+index a267f4f..4437bee 100644
+--- a/data/menus/gnome-flashback-applications.menu
++++ b/data/menus/gnome-flashback-applications.menu
+@@ -156,47 +156,6 @@
+               <Category>System</Category>
+               <Category>X-GNOME-Settings-Panel</Category>
+               <Category>X-Unity-Settings-Panel</Category>
+-              <Filename>alacarte.desktop</Filename>
+-              <Filename>caribou.desktop</Filename>
+-              <Filename>dconf-editor.desktop</Filename>
+-              <Filename>fedora-im-chooser.desktop</Filename>
+-              <Filename>fedora-release-notes.desktop</Filename>
+-              <Filename>firewall-config.desktop</Filename>
+-              <Filename>flash-player-properties.desktop</Filename>
+-              <Filename>gconf-editor.desktop</Filename>
+-              <Filename>gnome-abrt.desktop</Filename>
+-              <Filename>fedora-abrt.desktop</Filename>
+-              <Filename>gnome-orca.desktop</Filename>
+-              <Filename>gnome-power-statistics.desktop</Filename>
+-              <Filename>gnome-user-share-properties.desktop</Filename>
+-              <Filename>ibus.desktop</Filename>
+-              <Filename>ibus-daemon.desktop</Filename>
+-              <Filename>ibus-setup-anthy.desktop</Filename>
+-              <Filename>ibus-setup.desktop</Filename>
+-              <Filename>ibus-setup-hangul.desktop</Filename>
+-              <Filename>ibus-setup-libbopomofo.desktop</Filename>
+-              <Filename>ibus-setup-libpinyin.desktop</Filename>
+-              <Filename>ibus-setup-m17n.desktop</Filename>
+-              <Filename>ibus-setup-typing-booster.desktop</Filename>
+-              <Filename>im-chooser.desktop</Filename>
+-              <Filename>itweb-settings.desktop</Filename>
+-              <Filename>jhbuild.desktop</Filename>
+-              <Filename>javaws.desktop</Filename>
+-              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
+-              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
+-              <Filename>log4j-chainsaw.desktop</Filename>
+-              <Filename>log4j-logfactor5.desktop</Filename>
+-              <Filename>nm-connection-editor.desktop</Filename>
+-              <Filename>orca.desktop</Filename>
+-              <Filename>setroubleshoot.desktop</Filename>
+-              <Filename>authconfig.desktop</Filename>
+-              <Filename>system-config-date.desktop</Filename>
+-              <Filename>system-config-firewall.desktop</Filename>
+-              <Filename>system-config-keyboard.desktop</Filename>
+-              <Filename>system-config-language.desktop</Filename>
+-              <Filename>system-config-printer.desktop</Filename>
+-              <Filename>system-config-users.desktop</Filename>
+-              <Filename>vino-preferences.desktop</Filename>
+             </Or>
+           </Not>
+         </And>
+@@ -213,47 +172,6 @@
+             <Or>
+               <Category>X-GNOME-Settings-Panel</Category>
+               <Category>X-Unity-Settings-Panel</Category>
+-              <Filename>alacarte.desktop</Filename>
+-              <Filename>caribou.desktop</Filename>
+-              <Filename>dconf-editor.desktop</Filename>
+-              <Filename>fedora-im-chooser.desktop</Filename>
+-              <Filename>fedora-release-notes.desktop</Filename>
+-              <Filename>firewall-config.desktop</Filename>
+-              <Filename>flash-player-properties.desktop</Filename>
+-              <Filename>gconf-editor.desktop</Filename>
+-              <Filename>gnome-abrt.desktop</Filename>
+-              <Filename>fedora-abrt.desktop</Filename>
+-              <Filename>gnome-orca.desktop</Filename>
+-              <Filename>gnome-power-statistics.desktop</Filename>
+-              <Filename>gnome-user-share-properties.desktop</Filename>
+-              <Filename>ibus.desktop</Filename>
+-              <Filename>ibus-daemon.desktop</Filename>
+-              <Filename>ibus-setup-anthy.desktop</Filename>
+-              <Filename>ibus-setup.desktop</Filename>
+-              <Filename>ibus-setup-hangul.desktop</Filename>
+-              <Filename>ibus-setup-libbopomofo.desktop</Filename>
+-              <Filename>ibus-setup-libpinyin.desktop</Filename>
+-              <Filename>ibus-setup-m17n.desktop</Filename>
+-              <Filename>ibus-setup-typing-booster.desktop</Filename>
+-              <Filename>im-chooser.desktop</Filename>
+-              <Filename>itweb-settings.desktop</Filename>
+-              <Filename>jhbuild.desktop</Filename>
+-              <Filename>javaws.desktop</Filename>
+-              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
+-              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
+-              <Filename>log4j-chainsaw.desktop</Filename>
+-              <Filename>log4j-logfactor5.desktop</Filename>
+-              <Filename>nm-connection-editor.desktop</Filename>
+-              <Filename>orca.desktop</Filename>
+-              <Filename>setroubleshoot.desktop</Filename>
+-              <Filename>authconfig.desktop</Filename>
+-              <Filename>system-config-date.desktop</Filename>
+-              <Filename>system-config-firewall.desktop</Filename>
+-              <Filename>system-config-keyboard.desktop</Filename>
+-              <Filename>system-config-language.desktop</Filename>
+-              <Filename>system-config-printer.desktop</Filename>
+-              <Filename>system-config-users.desktop</Filename>
+-              <Filename>vino-preferences.desktop</Filename>
+             </Or>
+           </Not>
+         </And>
+-- 
+2.12.2
+

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-04-24 13:21:42 UTC (rev 225135)
+++ community-x86_64/PKGBUILD	2017-04-24 13:21:48 UTC (rev 225136)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gnome-flashback
-pkgver=3.22.0
-pkgrel=2
-pkgdesc="GNOME Flashback session"
-arch=('i686' 'x86_64')
-url="https://wiki.gnome.org/Projects/GnomeFlashback"
-license=('GPL')
-depends=('gnome-bluetooth' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' 'gnome-themes-standard' 'libibus' 'metacity' 'nautilus')
-makedepends=('intltool')
-optdepends=('gnome-backgrounds: Default background'
-            'gnome-control-center: System settings'
-            'gnome-screensaver: Lock screen'
-            'network-manager-applet: Network management')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        0001-end-session-dialog-ignore-invalid-inhibitor.patch
-        0001-menus-Don-t-exclude-any-desktop-files.patch)
-sha256sums=('b4a9e891879e99fb1b02854e7d01ff4f89c1917434de4adb5c7430a71b85a0ec'
-            '7cab34d50a30387327d6e6ce049692a886f5dbf6b6afa0791467c69c10916e44'
-            '0caa399bf9ccf4eb098202dd8e6cefa0b80f5001596d04031f5448b5c35da5de')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../0001-end-session-dialog-ignore-invalid-inhibitor.patch
-  patch -Np1 -i ../0001-menus-Don-t-exclude-any-desktop-files.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-flashback/repos/community-x86_64/PKGBUILD (from rev 225135, gnome-flashback/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-04-24 13:21:48 UTC (rev 225136)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=gnome-flashback
+pkgver=3.24.0
+pkgrel=1
+pkgdesc="GNOME Flashback session"
+arch=('i686' 'x86_64')
+url="https://wiki.gnome.org/Projects/GnomeFlashback"
+license=('GPL')
+depends=('gnome-bluetooth' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' 'gnome-themes-standard' 'libibus' 'metacity' 'nautilus')
+makedepends=('intltool')
+optdepends=('gnome-backgrounds: Default background'
+            'gnome-control-center: System settings'
+            'gnome-screensaver: Lock screen'
+            'network-manager-applet: Network management')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        0001-menus-Don-t-exclude-any-desktop-files.patch)
+sha256sums=('ebe0a5ce1f634a42332f872b5b4ebb504c2d5d7409b0822525359d62e54f7126'
+            '80f5f5d9e0593661920624c3d7b2aa47d1fa1dfe1dcdf9f5bfb83be59eb3c465')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../0001-menus-Don-t-exclude-any-desktop-files.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}



More information about the arch-commits mailing list