Minor update to gnome-menus-2.30.3.

* Respect XDG_MENU_PREFIX when writing user menu file
This commit is contained in:
ajacoutot 2010-09-14 13:13:02 +00:00
parent b83825db7d
commit d2533131c1
6 changed files with 19 additions and 29 deletions

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.37 2010/08/30 21:53:59 sthen Exp $
# $OpenBSD: Makefile,v 1.38 2010/09/14 13:13:02 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= implementation of the FreeDesktop Desktop Menu Spec
GNOME_PROJECT= gnome-menus
GNOME_VERSION= 2.30.2
REVISION= 1
GNOME_VERSION= 2.30.3
SHARED_LIBS += gnome-menu 5.1 # .6.6

@ -1,5 +1,5 @@
MD5 (gnome/gnome-menus-2.30.2.tar.bz2) = XKmTX1DJOYgWicSPWTSEJg==
RMD160 (gnome/gnome-menus-2.30.2.tar.bz2) = y8L1qvUp44XINd6E1ihIAygElKk=
SHA1 (gnome/gnome-menus-2.30.2.tar.bz2) = 7bybn8Tob1zHcgEep2i6lIdiXWc=
SHA256 (gnome/gnome-menus-2.30.2.tar.bz2) = PPtBWGzaWJKuqSn/mzJ8urw3oVlx/cbG1DNNJIi7MjM=
SIZE (gnome/gnome-menus-2.30.2.tar.bz2) = 464086
MD5 (gnome/gnome-menus-2.30.3.tar.bz2) = e1d4RdCS24cKaGy+ryANwA==
RMD160 (gnome/gnome-menus-2.30.3.tar.bz2) = OvwcJbuOmJNDqOou1mCXcF1uiqg=
SHA1 (gnome/gnome-menus-2.30.3.tar.bz2) = uYEsAizjUWO4n6BWUIkY3jpJEMQ=
SHA256 (gnome/gnome-menus-2.30.3.tar.bz2) = OoI6IpSZlsydfoFOjEYOpEfBjd9erhE/wM/iD8iHQVA=
SIZE (gnome/gnome-menus-2.30.3.tar.bz2) = 469400

@ -1,12 +0,0 @@
$OpenBSD: patch-simple-editor_GMenuSimpleEditor_menutreemodel_py,v 1.1 2009/11/15 15:20:50 ajacoutot Exp $
--- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig Sun Nov 15 16:08:56 2009
+++ simple-editor/GMenuSimpleEditor/menutreemodel.py Sun Nov 15 16:10:04 2009
@@ -104,7 +104,7 @@ class MenuTreeModel (gtk.TreeStore):
self.icon_theme = gtk.icon_theme_get_default ()
if (len (menu_files) < 1):
- menu_files = ["applications.menu", "settings.menu"]
+ menu_files = [os.environ.get('XDG_MENU_PREFIX', '') + "applications.menu", "settings.menu"]
for menu_file in menu_files:
tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)

@ -1,7 +1,7 @@
$OpenBSD: patch-util-Makefile_in,v 1.8 2010/06/22 17:35:01 ajacoutot Exp $
--- util/Makefile.in.orig Tue Jun 22 03:56:28 2010
+++ util/Makefile.in Tue Jun 22 19:30:03 2010
@@ -304,6 +304,7 @@ gnome_menu_spec_test_SOURCES = \
$OpenBSD: patch-util-Makefile_in,v 1.9 2010/09/14 13:13:02 ajacoutot Exp $
--- util/Makefile.in.orig Tue Sep 14 14:39:06 2010
+++ util/Makefile.in Tue Sep 14 15:03:19 2010
@@ -306,6 +306,7 @@ gnome_menu_spec_test_SOURCES = \
gnome_menu_spec_test_LDADD = \
../libmenu/libgnome-menu.la \
$(GLIB_LIBS) \

@ -1,8 +1,5 @@
This package is free software and is part of the
GNOME project.
The package contains an implementation of the draft "Desktop
Menu Specification" from freedesktop.org:
Menu Specification" from freedesktop.org for GNOME:
http://www.freedesktop.org/Standards/menu-spec

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.17 2010/06/22 17:35:01 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.18 2010/09/14 13:13:02 ajacoutot Exp $
bin/gmenu-simple-editor
include/gnome-menus/
include/gnome-menus/gmenu-tree.h
@ -103,12 +103,18 @@ share/locale/fr/LC_MESSAGES/gnome-menus.mo
share/locale/fur/
share/locale/fur/LC_MESSAGES/
share/locale/fur/LC_MESSAGES/gnome-menus.mo
share/locale/fy/
share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/gnome-menus.mo
share/locale/ga/LC_MESSAGES/gnome-menus.mo
share/locale/gl/LC_MESSAGES/gnome-menus.mo
share/locale/gn/
share/locale/gn/LC_MESSAGES/
share/locale/gn/LC_MESSAGES/gnome-menus.mo
share/locale/gu/LC_MESSAGES/gnome-menus.mo
share/locale/gv/
share/locale/gv/LC_MESSAGES/
share/locale/gv/LC_MESSAGES/gnome-menus.mo
share/locale/ha/
share/locale/ha/LC_MESSAGES/
share/locale/ha/LC_MESSAGES/gnome-menus.mo