[arch-commits] Commit in alacarte/trunk (PKGBUILD fix-crash.patch)

[Ionut Biru]

    Date: Saturday, November 3, 2012 @ 09:02:39
  Author: ibiru
Revision: 170136

fix crash and dependency FS#32313 FS#32386

Added:
  alacarte/trunk/fix-crash.patch
Modified:
  alacarte/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   14 ++++++++++----
 fix-crash.patch |   21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-03 12:57:39 UTC (rev 170135)
+++ PKGBUILD	2012-11-03 13:02:39 UTC (rev 170136)
@@ -4,21 +4,27 @@
 
 pkgname=alacarte
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Menu editor for gnome"
 arch=(any)
 license=('LGPL')
 url="http://www.gnome.org"
-depends=('gnome-menus' 'hicolor-icon-theme' 'python2-gobject' 'gtk3')
+depends=('gnome-menus' 'hicolor-icon-theme' 'python2-gobject' 'gtk3' 'gnome-panel')
 makedepends=('intltool')
 install=alacarte.install
 options=('!libtool')
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.6/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('7e17bd80e43130afea6372a957777d289c9b9b6d4893aa20ad3f45bbd48dd25e')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.6/${pkgname}-${pkgver}.tar.xz
+        fix-crash.patch)
+sha256sums=('7e17bd80e43130afea6372a957777d289c9b9b6d4893aa20ad3f45bbd48dd25e'
+            '20ba4fb152996879c76571c9e26f993882314ff5fd0074279c71644c9e72dc01')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix crash when $XDG_MENU_PREFIX is not defined
+  patch -Np1 -i "${srcdir}/fix-crash.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
   make DESTDIR="${pkgdir}" install

Added: fix-crash.patch
===================================================================
--- fix-crash.patch	                        (rev 0)
+++ fix-crash.patch	2012-11-03 13:02:39 UTC (rev 170136)
@@ -0,0 +1,21 @@
+From fe7211f2eb4c8bcf7cbddca75bf4e28ee7b98659 Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre at mecheye.net>
+Date: Tue, 23 Oct 2012 03:08:38 +0000
+Subject: MenuEditor: deal with the case of having no $XDG_MENU_PREFIX
+
+---
+diff --git a/Alacarte/MenuEditor.py b/Alacarte/MenuEditor.py
+index 386b382..8d992ca 100644
+--- a/Alacarte/MenuEditor.py
++++ b/Alacarte/MenuEditor.py
+@@ -23,7 +23,7 @@ from gi.repository import GMenu, GLib
+ from Alacarte import util
+ 
+ class MenuEditor(object):
+-    def __init__(self, name=os.environ['XDG_MENU_PREFIX'] + 'applications.menu'):
++    def __init__(self, name=os.environ.get('XDG_MENU_PREFIX', '') + 'applications.menu'):
+         self.name = name
+ 
+         self.tree = GMenu.Tree.new(name, GMenu.TreeFlags.SHOW_EMPTY|GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.INCLUDE_NODISPLAY|GMenu.TreeFlags.SHOW_ALL_SEPARATORS|GMenu.TreeFlags.SORT_DISPLAY_NAME)
+--
+cgit v0.9.0.2