[arch-commits] Commit in alacarte/repos/extra-any (5 files)

[Ionut Biru]

    Date: Saturday, November 3, 2012 @ 09:03:21
  Author: ibiru
Revision: 170137

archrelease: copy trunk to extra-any

Added:
  alacarte/repos/extra-any/PKGBUILD
    (from rev 170136, alacarte/trunk/PKGBUILD)
  alacarte/repos/extra-any/alacarte.install
    (from rev 170136, alacarte/trunk/alacarte.install)
  alacarte/repos/extra-any/fix-crash.patch
    (from rev 170136, alacarte/trunk/fix-crash.patch)
Deleted:
  alacarte/repos/extra-any/PKGBUILD
  alacarte/repos/extra-any/alacarte.install

------------------+
 PKGBUILD         |   56 +++++++++++++++++++++++++++++------------------------
 alacarte.install |   22 ++++++++++----------
 fix-crash.patch  |   21 +++++++++++++++++++
 3 files changed, 63 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-03 13:02:39 UTC (rev 170136)
+++ PKGBUILD	2012-11-03 13:03:21 UTC (rev 170137)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: pressh <pressh at gmail.com>
-
-pkgname=alacarte
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Menu editor for gnome"
-arch=(any)
-license=('LGPL')
-url="http://www.gnome.org"
-depends=('gnome-menus' 'hicolor-icon-theme' 'python2-gobject' 'gtk3')
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-  make DESTDIR="${pkgdir}" install
-}

Copied: alacarte/repos/extra-any/PKGBUILD (from rev 170136, alacarte/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2012-11-03 13:03:21 UTC (rev 170137)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: pressh <pressh at gmail.com>
+
+pkgname=alacarte
+pkgver=3.6.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' '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
+        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
+}

Deleted: alacarte.install
===================================================================
--- alacarte.install	2012-11-03 13:02:39 UTC (rev 170136)
+++ alacarte.install	2012-11-03 13:03:21 UTC (rev 170137)
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install 
-}

Copied: alacarte/repos/extra-any/alacarte.install (from rev 170136, alacarte/trunk/alacarte.install)
===================================================================
--- alacarte.install	                        (rev 0)
+++ alacarte.install	2012-11-03 13:03:21 UTC (rev 170137)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install 
+}

Copied: alacarte/repos/extra-any/fix-crash.patch (from rev 170136, alacarte/trunk/fix-crash.patch)
===================================================================
--- fix-crash.patch	                        (rev 0)
+++ fix-crash.patch	2012-11-03 13:03:21 UTC (rev 170137)
@@ -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