[arch-commits] Commit in gnome-flashback/trunk (3 files)

Balló György bgyorgy at archlinux.org
Sat Feb 18 00:55:25 UTC 2017


    Date: Saturday, February 18, 2017 @ 00:55:24
  Author: bgyorgy
Revision: 212995

upgpkg: gnome-flashback 3.22.0-2

Apply some fixes

Added:
  gnome-flashback/trunk/0001-end-session-dialog-ignore-invalid-inhibitor.patch
  gnome-flashback/trunk/0001-menus-Don-t-exclude-any-desktop-files.patch
Modified:
  gnome-flashback/trunk/PKGBUILD

--------------------------------------------------------+
 0001-end-session-dialog-ignore-invalid-inhibitor.patch |   27 +++
 0001-menus-Don-t-exclude-any-desktop-files.patch       |  127 +++++++++++++++
 PKGBUILD                                               |   16 +
 3 files changed, 167 insertions(+), 3 deletions(-)

Added: 0001-end-session-dialog-ignore-invalid-inhibitor.patch
===================================================================
--- 0001-end-session-dialog-ignore-invalid-inhibitor.patch	                        (rev 0)
+++ 0001-end-session-dialog-ignore-invalid-inhibitor.patch	2017-02-18 00:55:24 UTC (rev 212995)
@@ -0,0 +1,27 @@
+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
+

Added: 0001-menus-Don-t-exclude-any-desktop-files.patch
===================================================================
--- 0001-menus-Don-t-exclude-any-desktop-files.patch	                        (rev 0)
+++ 0001-menus-Don-t-exclude-any-desktop-files.patch	2017-02-18 00:55:24 UTC (rev 212995)
@@ -0,0 +1,127 @@
+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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-18 00:46:37 UTC (rev 212994)
+++ PKGBUILD	2017-02-18 00:55:24 UTC (rev 212995)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-flashback
 pkgver=3.22.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Flashback session"
 arch=('i686' 'x86_64')
 url="https://wiki.gnome.org/Projects/GnomeFlashback"
@@ -14,9 +14,19 @@
             '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)
-sha256sums=('b4a9e891879e99fb1b02854e7d01ff4f89c1917434de4adb5c7430a71b85a0ec')
+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 \



More information about the arch-commits mailing list