Upstream patch for #291279

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 124 insertions, 1 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 06c1698e366a..5908b848a96b 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.145 2010/06/23 14:55:34 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.146 2010/07/05 12:02:44 pacho Exp $
+
+*gnome-menus-2.30.2-r1 (05 Jul 2010)
+
+  05 Jul 2010; Pacho Ramos <pacho@gentoo.org> +gnome-menus-2.30.2-r1.ebuild,
+  +files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch:
+  Revision bump to respect XDG_MENU_PREFIX when writing user menu file, bug
+  #291279 (thanks to netfab for notifying upstream fix).
 
   23 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gnome-menus-2.20.3.ebuild, gnome-menus-2.24.2.ebuild,
diff --git a/gnome-base/gnome-menus/files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch b/gnome-base/gnome-menus/files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch
new file mode 100644
index 000000000000..01e5a48219de
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch
@@ -0,0 +1,27 @@
+From 2054996af842e6df1726e58d81a569f03e30d75f Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Wed, 30 Jun 2010 10:36:26 +0000
+Subject: [editor] Better fix for XDG_MENU_PREFIX support in editor
+
+The previous fix was partly wrong, because the menu file referenced in
+the created user menu file was not using the prefix.
+
+So instead of letting the library handle XDG_MENU_PREFIX, we handle it
+ourselves everywhere.
+---
+diff --git a/simple-editor/GMenuSimpleEditor/menutreemodel.py b/simple-editor/GMenuSimpleEditor/menutreemodel.py
+index 5856d56..214319e 100644
+--- a/simple-editor/GMenuSimpleEditor/menutreemodel.py
++++ b/simple-editor/GMenuSimpleEditor/menutreemodel.py
+@@ -107,6 +107,9 @@ class MenuTreeModel (gtk.TreeStore):
+             menu_files = ["applications.menu", "settings.menu"]
+ 
+         for menu_file in menu_files:
++            if menu_file == "applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):
++                menu_file = os.environ["XDG_MENU_PREFIX"] + menu_file
++
+             tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
+             tree.sort_key = gmenu.SORT_DISPLAY_NAME
+             self.__append_directory (tree.root, None, False, menu_file)
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild
new file mode 100644
index 000000000000..71f80ccd3213
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild,v 1.1 2010/07/05 12:02:44 pacho Exp $
+
+EAPI="2"
+inherit eutils gnome2 python
+
+DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug python"
+
+RDEPEND=">=dev-libs/glib-2.18.0
+	python? (
+		>=virtual/python-2.4.4-r5
+		dev-python/pygtk )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	# Do NOT compile with --disable-debug/--enable-debug=no
+	# It disables api usage checks
+	if ! use debug ; then
+		G2CONF="${G2CONF} --enable-debug=minimum"
+	fi
+
+	G2CONF="${G2CONF} \
+		$(use_enable python) \
+		--disable-static \
+		--disable-introspection"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Don't show KDE standalone settings desktop files in GNOME others menu
+	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
+
+	# Respect XDG_MENU_PREFIX when writing user menu file, bug #291279
+	epatch "${FILESDIR}/${P}-XDG_MENU_PREFIX-fix.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+
+	# disable pyc compiling
+	mv py-compile py-compile-disabled
+	ln -s $(type -P true) py-compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+
+	# Prefix menu, bug #256614
+	mv "${D}"/etc/xdg/menus/applications.menu \
+		"${D}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
+	fi
+
+	ewarn "Due to bug #256614, you might lose icons in applications menus."
+	ewarn "If you use a login manager, please re-select your session."
+	ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome."
+	ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-."
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	if use python; then
+		python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
+	fi
+}