* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/
@ 2011-10-04 4:04 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-10-04 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 0e66442d6fd6662508fe1b7fee64c36718239c3d
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 4 03:35:55 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 4 03:59:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0e66442d
gnome-base/gnome-menus: 3.2.0 → 3.2.0.1
Patch applied upstream.
---
| 114 --------------------
| 3 -
2 files changed, 0 insertions(+), 117 deletions(-)
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.2.0-pygobject-3.patch b/gnome-base/gnome-menus/files/gnome-menus-3.2.0-pygobject-3.patch
deleted file mode 100644
index f697f5c..0000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.2.0-pygobject-3.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From f1c76629d33a616089a15bd034708d21e8bd9a87 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Tue, 27 Sep 2011 10:09:35 +0000
-Subject: editor: Fix to work with latest pygi
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660112
----
-diff --git a/simple-editor/GMenuSimpleEditor/main.py b/simple-editor/GMenuSimpleEditor/main.py
-index a107818..7af8ae0 100644
---- a/simple-editor/GMenuSimpleEditor/main.py
-+++ b/simple-editor/GMenuSimpleEditor/main.py
-@@ -17,11 +17,12 @@
- #
-
- def main (args):
-+ import optparse
-+
- import locale
- import gettext
-
-- import gobject
-- from gobject.option import OptionParser, make_option
-+ from gi.repository import GObject
-
- from gi.repository import Gtk
-
-@@ -31,18 +32,14 @@ def main (args):
- locale.setlocale (locale.LC_ALL, "")
- gettext.install (config.PACKAGE, config.LOCALEDIR)
-
-- parser = OptionParser (
-- option_list = [
-- # FIXME: remove this when we can get all the default
-- # options
-- make_option ("--version",
-- action="store_true",
-- dest="version",
-- help=config.VERSION),
-- ])
-- parser.parse_args (args)
--
-- if parser.values.version:
-+ parser = optparse.OptionParser()
-+ parser.add_option('--version', dest='version',
-+ action='store_true', default=False,
-+ help=config.VERSION)
-+
-+ (options, args) = parser.parse_args()
-+
-+ if options.version:
- # Translators: %s is the version number
- print _("Simple Menu Editor %s") % (config.VERSION)
- else:
-diff --git a/simple-editor/GMenuSimpleEditor/menufilewriter.py b/simple-editor/GMenuSimpleEditor/menufilewriter.py
-index c31fade..aa6c42e 100644
---- a/simple-editor/GMenuSimpleEditor/menufilewriter.py
-+++ b/simple-editor/GMenuSimpleEditor/menufilewriter.py
-@@ -19,7 +19,7 @@
- import os
- import errno
- import pwd
--import gobject
-+from gi.repository import GObject
- from gi.repository import Gtk
-
- import menutreemodel
-@@ -86,7 +86,7 @@ class MenuFileWriter:
-
- def __del__ (self):
- for (path, id) in self.sync_idle_handlers.items():
-- gobject.source_remove (id)
-+ GObject.source_remove (id)
-
- def __append_menu (self, contents, indent, iter, system_menu_file = None):
- has_changes = False
-@@ -192,5 +192,5 @@ class MenuFileWriter:
- if self.sync_idle_handlers.has_key (menu_file_path):
- return
-
-- id = gobject.idle_add (self.__sync_idle_handler_func, menu_file_path)
-+ id = GObject.idle_add (self.__sync_idle_handler_func, menu_file_path)
- self.sync_idle_handlers[menu_file_path] = id
-diff --git a/simple-editor/GMenuSimpleEditor/menutreemodel.py b/simple-editor/GMenuSimpleEditor/menutreemodel.py
-index 9930c4f..2eded47 100644
---- a/simple-editor/GMenuSimpleEditor/menutreemodel.py
-+++ b/simple-editor/GMenuSimpleEditor/menutreemodel.py
-@@ -18,7 +18,7 @@
-
- import os
- import os.path
--import gobject
-+from gi.repository import GObject
- from gi.repository import Gio
- from gi.repository import Gtk
- from gi.repository import GdkPixbuf
-@@ -61,14 +61,14 @@ class MenuTreeModel (Gtk.TreeStore):
- if menu_file == "applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):
- menu_file = os.environ["XDG_MENU_PREFIX"] + menu_file
-
-- tree = gobject.new (GMenu.Tree, menu_basename = menu_file, flags = GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.SORT_DISPLAY_NAME)
-+ tree = GObject.new (GMenu.Tree, menu_basename = menu_file, flags = GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.SORT_DISPLAY_NAME)
- tree.load_sync ()
-
- self.__append_directory (tree.get_root_directory (), None, False, menu_file)
-
- system_file = lookup_system_menu_file (menu_file)
- if system_file:
-- system_tree = gobject.new (GMenu.Tree, menu_path = system_file, flags = GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.SORT_DISPLAY_NAME)
-+ system_tree = GObject.new (GMenu.Tree, menu_path = system_file, flags = GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.SORT_DISPLAY_NAME)
- system_tree.load_sync ()
-
- self.__append_directory (system_tree.get_root_directory (), None, True, menu_file)
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
similarity index 95%
rename from gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild
rename to gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
index 0b72acb..cddf2dc 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
@@ -60,9 +60,6 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
- # Upstream patch to fix pygobject-3 compatibility, will be in next release
- epatch "${FILESDIR}/${P}-pygobject-3.patch"
-
# Don't show KDE standalone settings desktop files in GNOME others menu
epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/
@ 2011-10-29 19:56 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-10-29 19:56 UTC (permalink / raw
To: gentoo-commits
commit: f7d956110cb24da280c6bdfe3656247e26b67581
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:52:12 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 19:52:12 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f7d95611
gnome-base/gnome-menus: moved to gx86
---
| 6 -
.../gnome-menus-3.0.0-ignore_kde_standalone.patch | 22 ----
| 26 -----
| 84 ---------------
| 110 --------------------
5 files changed, 0 insertions(+), 248 deletions(-)
diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome b/gnome-base/gnome-menus/files/10-xdg-menu-gnome
deleted file mode 100644
index b12a712..0000000
--- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "gnome" ]
-then
- export XDG_MENU_PREFIX=gnome-
-fi
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
deleted file mode 100644
index 5f5f8b2..0000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- layout/applications.menu.orig 2007-09-21 17:51:43.000000000 +0300
-+++ layout/applications.menu 2007-09-21 17:55:38.000000000 +0300
-@@ -146,6 +146,19 @@
- <Not><Category>Core</Category></Not>
- <Not><Category>Screensaver</Category></Not>
- <Not><Category>X-GNOME-Settings-Panel</Category></Not>
-+ <Not><Category>X-KDE-settings-accessibility</Category></Not>
-+ <Not><Category>X-KDE-settings-components</Category></Not>
-+ <Not><Category>X-KDE-settings-desktop</Category></Not>
-+ <Not><Category>X-KDE-settings-looknfeel</Category></Not>
-+ <Not><Category>X-KDE-settings-network</Category></Not>
-+ <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
-+ <Not><Category>X-KDE-settings-peripherals</Category></Not>
-+ <Not><Category>X-KDE-settings-hardware</Category></Not>
-+ <Not><Category>X-KDE-settings-power</Category></Not>
-+ <Not><Category>X-KDE-settings-security</Category></Not>
-+ <Not><Category>X-KDE-settings-sound</Category></Not>
-+ <Not><Category>X-KDE-settings-system</Category></Not>
-+ <Not><Category>X-KDE-information</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Other -->
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
deleted file mode 100644
index b55ed7e..0000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f2ad7820b3a6b197f8cfec9e2bec877e51671ec9 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Thu, 18 Aug 2011 20:05:56 -0400
-Subject: [PATCH 2/2] Do not install anything other than the library
-
----
- Makefile.am | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 565ab87..65c059a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
--SUBDIRS = libmenu desktop-directories layout util po
-+SUBDIRS = libmenu util po
-
- if HAVE_PYTHON
--SUBDIRS += python simple-editor
-+SUBDIRS += python
- endif
-
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
---
-1.7.6
-
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r50.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r50.ebuild
deleted file mode 100644
index f644bda..0000000
--- a/gnome-base/gnome-menus/gnome-menus-3.0.1-r50.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 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.5.ebuild,v 1.4 2011/01/30 18:40:38 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_DEPEND="python? 2:2.4"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit autotools 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 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="debug python +introspection"
-
-RDEPEND=">=dev-libs/glib-2.18
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.40"
-# The actual menus are provided by slot 3
-PDEPEND="gnome-base/gnome-menus:3"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
- # 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}
- --disable-static
- $(use_enable python)
- $(use_enable introspection)"
-}
-
-src_prepare() {
- # Only build the library (everything else is coming from slot 3)
- epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch"
- eautoreconf
- gnome2_src_prepare
-
- # disable pyc compiling
- mv py-compile py-compile-disabled
- ln -s $(type -P true) py-compile
-
- python_copy_sources
-}
-
-src_configure() {
- python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
- python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
- python_execute_function -s -d
-}
-
-src_install() {
- python_execute_function -s gnome2_src_install
- python_clean_installation_image
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
deleted file mode 100644
index c2209e0..0000000
--- a/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2011 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.5.ebuild,v 1.4 2011/01/30 18:40:38 armin76 Exp $
-
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_DEPEND="2:2.4"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-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="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-# +python for gmenu-simple-editor
-IUSE="debug +introspection +python test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- python? (
- >=dev-libs/gobject-introspection-0.9.5
- dev-python/pygobject:3
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection] )"
-# Older versions of slot 0 install the menu editor and the desktop directories
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gnome-menus-3.0.1-r50:0"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.40
- test? ( dev-libs/gjs )"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
- # Do NOT compile with --disable-debug/--enable-debug=no
- # It disables api usage checks
- if ! use debug ; then
- G2CONF="${G2CONF} --enable-debug=minimum"
- fi
-
- if use python || use introspection; then
- use introspection || ewarn "Enabling introspection due to USE=python"
- G2CONF="${G2CONF} --enable-introspection"
- else
- G2CONF="${G2CONF} --disable-introspection"
- fi
-
- G2CONF="${G2CONF} --disable-static"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Don't show KDE standalone settings desktop files in GNOME others menu
- epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
-
- # disable pyc compiling
- mv py-compile py-compile-disabled
- ln -s $(type -P true) py-compile
-
- python_copy_sources
-}
-
-src_configure() {
- python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
- python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
- python_execute_function -s -d
-}
-
-src_install() {
- python_execute_function -s gnome2_src_install
- python_clean_installation_image
-
- # Prefix menu, bug #256614
- mv "${ED}"/etc/xdg/menus/applications.menu \
- "${ED}"/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_mod_optimize GMenuSimpleEditor
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- if use python; then
- python_mod_cleanup GMenuSimpleEditor
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/
@ 2012-08-18 12:09 Priit Laes
0 siblings, 0 replies; 6+ messages in thread
From: Priit Laes @ 2012-08-18 12:09 UTC (permalink / raw
To: gentoo-commits
commit: 62c68a200bc5fe9c87386477df8d16dba3e34ee0
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Aug 18 11:42:32 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Aug 18 11:42:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=62c68a20
gnome-base/gnome-menus: Add 3.5.5 to overlay
---
| 6 +
.../gnome-menus-3.0.0-ignore_kde_standalone.patch | 22 ++++
| 128 ++++++++++++++++++++
3 files changed, 156 insertions(+), 0 deletions(-)
--git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 b/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
new file mode 100644
index 0000000..4bbf863
--- /dev/null
+++ b/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -z "$XDG_MENU_PREFIX" ] && { [ "$DESKTOP_SESSION" = "gnome" ] || [ "$DESKTOP_SESSION" = "cinnamon" ]; }
+then
+ export XDG_MENU_PREFIX=gnome-
+fi
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
new file mode 100644
index 0000000..5f5f8b2
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
@@ -0,0 +1,22 @@
+--- layout/applications.menu.orig 2007-09-21 17:51:43.000000000 +0300
++++ layout/applications.menu 2007-09-21 17:55:38.000000000 +0300
+@@ -146,6 +146,19 @@
+ <Not><Category>Core</Category></Not>
+ <Not><Category>Screensaver</Category></Not>
+ <Not><Category>X-GNOME-Settings-Panel</Category></Not>
++ <Not><Category>X-KDE-settings-accessibility</Category></Not>
++ <Not><Category>X-KDE-settings-components</Category></Not>
++ <Not><Category>X-KDE-settings-desktop</Category></Not>
++ <Not><Category>X-KDE-settings-looknfeel</Category></Not>
++ <Not><Category>X-KDE-settings-network</Category></Not>
++ <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
++ <Not><Category>X-KDE-settings-peripherals</Category></Not>
++ <Not><Category>X-KDE-settings-hardware</Category></Not>
++ <Not><Category>X-KDE-settings-power</Category></Not>
++ <Not><Category>X-KDE-settings-security</Category></Not>
++ <Not><Category>X-KDE-settings-sound</Category></Not>
++ <Not><Category>X-KDE-settings-system</Category></Not>
++ <Not><Category>X-KDE-information</Category></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Other -->
--git a/gnome-base/gnome-menus/gnome-menus-3.5.5.ebuild b/gnome-base/gnome-menus/gnome-menus-3.5.5.ebuild
new file mode 100644
index 0000000..5761479
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.5.5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.2.ebuild,v 1.1 2012/05/20 09:47:16 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+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="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+# +python for gmenu-simple-editor
+IUSE="debug +introspection +python test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ python? (
+ >=dev-libs/gobject-introspection-0.9.5
+ dev-python/pygobject:3
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/gtk+:3[introspection] )"
+# Older versions of slot 0 install the menu editor and the desktop directories
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gnome-menus-3.0.1-r1:0"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40
+ test? ( dev-libs/gjs )"
+
+pkg_setup() {
+ use python && python_pkg_setup
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ # Do NOT compile with --disable-debug/--enable-debug=no
+ # It disables api usage checks
+ if ! use debug ; then
+ G2CONF="${G2CONF} --enable-debug=minimum"
+ fi
+
+ if use python || use introspection; then
+ use introspection || ewarn "Enabling introspection due to USE=python"
+ G2CONF="${G2CONF} --enable-introspection"
+ else
+ G2CONF="${G2CONF} --disable-introspection"
+ fi
+
+ G2CONF="${G2CONF} --disable-static"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Don't show KDE standalone settings desktop files in GNOME others menu
+ epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
+
+ if use python; then
+ python_clean_py-compile_files
+ python_copy_sources
+ else
+ sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
+ -i Makefile.* || die "sed failed"
+ fi
+}
+
+src_configure() {
+ if use python; then
+ python_execute_function -s gnome2_src_configure
+ else
+ gnome2_src_configure
+ fi
+}
+
+src_compile() {
+ if use python; then
+ python_execute_function -s gnome2_src_compile
+ else
+ gnome2_src_compile
+ fi
+}
+
+src_test() {
+ if use python; then
+ python_execute_function -s -d
+ else
+ default
+ fi
+}
+
+src_install() {
+ if use python; then
+ python_execute_function -s gnome2_src_install
+ python_clean_installation_image
+ else
+ gnome2_src_install
+ fi
+
+ # Prefix menu, bug #256614
+ mv "${ED}"/etc/xdg/menus/applications.menu \
+ "${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
+
+ exeinto /etc/X11/xinit/xinitrc.d/
+ newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ if use python; then
+ python_mod_optimize GMenuSimpleEditor
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+ if use python; then
+ python_mod_cleanup GMenuSimpleEditor
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/
@ 2012-11-24 23:17 Alexandre Rostovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Rostovtsev @ 2012-11-24 23:17 UTC (permalink / raw
To: gentoo-commits
commit: d83c36a408e0321d154e7b3d774c83b128ec6261
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 24 23:14:08 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Nov 24 23:16:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d83c36a4
gnome-base/gnome-menus: correctly load custom menus from "applications-merged"
See https://bugzilla.gnome.org/show_bug.cgi?id=688972
---
| 102 ++++++++++++++++++++
| 3 +
2 files changed, 105 insertions(+), 0 deletions(-)
--git a/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch b/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch
new file mode 100644
index 0000000..ada08df
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch
@@ -0,0 +1,102 @@
+From e047041a49ad9e857b97c534203a98aac80de8d8 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 24 Nov 2012 15:24:50 -0500
+Subject: [PATCH] libmenu: always call menu_layout_load() with
+ non_prefixed_name parameter
+
+We must ensure that when loading "${XDG_MENU_PREFIX}applications.menu",
+the root layout node's name is set to "applications", not
+"${XDG_MENU_PREFIX}applications", because the menu spec states that the
+default merge directory for "${XDG_MENU_PREFIX}applications.menu" is
+"applications-merged", not "${XDG_MENU_PREFIX}applications-merged".
+
+https://bugzilla.gnome.org/show_bug.cgi?id=688972
+---
+ libmenu/gmenu-tree.c | 31 +++++++++++++++++++++++++++++--
+ 1 file changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
+index 3e59c2c..dd6c670 100644
+--- a/libmenu/gmenu-tree.c
++++ b/libmenu/gmenu-tree.c
+@@ -60,6 +60,7 @@ struct _GMenuTree
+ GObject parent_instance;
+
+ char *basename;
++ char *non_prefixed_basename;
+ char *path;
+ char *canonical_path;
+
+@@ -524,6 +525,24 @@ gmenu_tree_constructor (GType type,
+ }
+
+ static void
++gmenu_tree_update_non_prefixed_basename (GMenuTree *tree,
++ const gchar *filename)
++{
++ gchar *s, *basename;
++
++ g_free (tree->non_prefixed_basename);
++ tree->non_prefixed_basename = NULL;
++ if (filename == NULL)
++ return;
++ s = g_strdup_printf ("%sapplications.menu", g_getenv ("XDG_MENU_PREFIX"));
++ basename = g_path_get_basename (filename);
++ if (!g_strcmp0 (basename, "applications.menu") || !g_strcmp0 (basename, s))
++ tree->non_prefixed_basename = g_strdup ("applications.menu");
++ g_free (s);
++ g_free (basename);
++}
++
++static void
+ gmenu_tree_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+@@ -534,10 +553,14 @@ gmenu_tree_set_property (GObject *object,
+ switch (prop_id)
+ {
+ case PROP_MENU_BASENAME:
++ if (g_strcmp0 (self->basename, g_value_get_string (value)))
++ gmenu_tree_update_non_prefixed_basename (self, g_value_get_string (value));
+ self->basename = g_value_dup_string (value);
+ break;
+
+ case PROP_MENU_PATH:
++ if (g_strcmp0 (self->path, g_value_get_string (value)))
++ gmenu_tree_update_non_prefixed_basename (self, g_value_get_string (value));
+ self->path = g_value_dup_string (value);
+ break;
+
+@@ -587,6 +610,9 @@ gmenu_tree_finalize (GObject *object)
+ g_free (tree->basename);
+ tree->basename = NULL;
+
++ g_free (tree->non_prefixed_basename);
++ tree->non_prefixed_basename = NULL;
++
+ if (tree->path != NULL)
+ g_free (tree->path);
+ tree->path = NULL;
+@@ -1896,7 +1922,7 @@ load_merge_file (GMenuTree *tree,
+
+ menu_verbose ("Merging file \"%s\"\n", canonical);
+
+- to_merge = menu_layout_load (canonical, NULL, NULL);
++ to_merge = menu_layout_load (canonical, tree->non_prefixed_basename, NULL);
+ if (to_merge == NULL)
+ {
+ menu_verbose ("No menu for file \"%s\" found when merging\n",
+@@ -3053,8 +3079,9 @@ gmenu_tree_load_layout (GMenuTree *tree,
+ tree->canonical_path);
+
+ error = NULL;
++
+ tree->layout = menu_layout_load (tree->canonical_path,
+- tree->path ? NULL : tree->basename,
++ tree->non_prefixed_basename,
+ error);
+ if (!tree->layout)
+ return FALSE;
+--
+1.8.0
+
diff --git a/gnome-base/gnome-menus/gnome-menus-3.6.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.6.1-r1.ebuild
similarity index 96%
rename from gnome-base/gnome-menus/gnome-menus-3.6.1.ebuild
rename to gnome-base/gnome-menus/gnome-menus-3.6.1-r1.ebuild
index fd88fb6..3eeb7fc 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.6.1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.6.1-r1.ebuild
@@ -69,6 +69,9 @@ src_prepare() {
# Don't show KDE standalone settings desktop files in GNOME others menu
epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=688972
+ epatch "${FILESDIR}/${PN}-3.6.1-applications-merged.patch"
+
if use python; then
python_clean_py-compile_files
python_copy_sources
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/
@ 2012-12-24 0:41 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-24 0:41 UTC (permalink / raw
To: gentoo-commits
commit: 8bc3c2b0e4fb42e04aadc064a334d7c31dd142e4
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 00:41:18 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 00:41:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8bc3c2b0
gnome-base/gnome-menus: moved to gx86
* Sync live ebuild with gx86 changes.
* Drop USE=introspection from metadata.xml, it is global now.
---
| 102 ---------------
| 136 --------------------
| 78 +++++-------
| 4 -
4 files changed, 31 insertions(+), 289 deletions(-)
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch b/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch
deleted file mode 100644
index ada08df..0000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.6.1-applications-merged.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From e047041a49ad9e857b97c534203a98aac80de8d8 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 24 Nov 2012 15:24:50 -0500
-Subject: [PATCH] libmenu: always call menu_layout_load() with
- non_prefixed_name parameter
-
-We must ensure that when loading "${XDG_MENU_PREFIX}applications.menu",
-the root layout node's name is set to "applications", not
-"${XDG_MENU_PREFIX}applications", because the menu spec states that the
-default merge directory for "${XDG_MENU_PREFIX}applications.menu" is
-"applications-merged", not "${XDG_MENU_PREFIX}applications-merged".
-
-https://bugzilla.gnome.org/show_bug.cgi?id=688972
----
- libmenu/gmenu-tree.c | 31 +++++++++++++++++++++++++++++--
- 1 file changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
-index 3e59c2c..dd6c670 100644
---- a/libmenu/gmenu-tree.c
-+++ b/libmenu/gmenu-tree.c
-@@ -60,6 +60,7 @@ struct _GMenuTree
- GObject parent_instance;
-
- char *basename;
-+ char *non_prefixed_basename;
- char *path;
- char *canonical_path;
-
-@@ -524,6 +525,24 @@ gmenu_tree_constructor (GType type,
- }
-
- static void
-+gmenu_tree_update_non_prefixed_basename (GMenuTree *tree,
-+ const gchar *filename)
-+{
-+ gchar *s, *basename;
-+
-+ g_free (tree->non_prefixed_basename);
-+ tree->non_prefixed_basename = NULL;
-+ if (filename == NULL)
-+ return;
-+ s = g_strdup_printf ("%sapplications.menu", g_getenv ("XDG_MENU_PREFIX"));
-+ basename = g_path_get_basename (filename);
-+ if (!g_strcmp0 (basename, "applications.menu") || !g_strcmp0 (basename, s))
-+ tree->non_prefixed_basename = g_strdup ("applications.menu");
-+ g_free (s);
-+ g_free (basename);
-+}
-+
-+static void
- gmenu_tree_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
-@@ -534,10 +553,14 @@ gmenu_tree_set_property (GObject *object,
- switch (prop_id)
- {
- case PROP_MENU_BASENAME:
-+ if (g_strcmp0 (self->basename, g_value_get_string (value)))
-+ gmenu_tree_update_non_prefixed_basename (self, g_value_get_string (value));
- self->basename = g_value_dup_string (value);
- break;
-
- case PROP_MENU_PATH:
-+ if (g_strcmp0 (self->path, g_value_get_string (value)))
-+ gmenu_tree_update_non_prefixed_basename (self, g_value_get_string (value));
- self->path = g_value_dup_string (value);
- break;
-
-@@ -587,6 +610,9 @@ gmenu_tree_finalize (GObject *object)
- g_free (tree->basename);
- tree->basename = NULL;
-
-+ g_free (tree->non_prefixed_basename);
-+ tree->non_prefixed_basename = NULL;
-+
- if (tree->path != NULL)
- g_free (tree->path);
- tree->path = NULL;
-@@ -1896,7 +1922,7 @@ load_merge_file (GMenuTree *tree,
-
- menu_verbose ("Merging file \"%s\"\n", canonical);
-
-- to_merge = menu_layout_load (canonical, NULL, NULL);
-+ to_merge = menu_layout_load (canonical, tree->non_prefixed_basename, NULL);
- if (to_merge == NULL)
- {
- menu_verbose ("No menu for file \"%s\" found when merging\n",
-@@ -3053,8 +3079,9 @@ gmenu_tree_load_layout (GMenuTree *tree,
- tree->canonical_path);
-
- error = NULL;
-+
- tree->layout = menu_layout_load (tree->canonical_path,
-- tree->path ? NULL : tree->basename,
-+ tree->non_prefixed_basename,
- error);
- if (!tree->layout)
- return FALSE;
---
-1.8.0
-
diff --git a/gnome-base/gnome-menus/gnome-menus-3.6.1-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.6.1-r1.ebuild
deleted file mode 100644
index 3eeb7fc..0000000
--- a/gnome-base/gnome-menus/gnome-menus-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils gnome2 python
-[[ ${PV} = 9999 ]] && inherit gnome2-live
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="3"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-# +python for gmenu-simple-editor
-IUSE="debug +introspection +python test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- python? (
- >=dev-libs/gobject-introspection-0.9.5
- dev-python/pygobject:3
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection] )"
-# Older versions of slot 0 install the menu editor and the desktop directories
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gnome-menus-3.0.1-r1:0"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
- virtual/pkgconfig
- >=dev-util/intltool-0.40
- test? ( dev-libs/gjs )"
-
-pkg_setup() {
- use python && python_pkg_setup
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
- # Do NOT compile with --disable-debug/--enable-debug=no
- # It disables api usage checks
- if ! use debug ; then
- G2CONF="${G2CONF} --enable-debug=minimum"
- fi
-
- if use python || use introspection; then
- use introspection || ewarn "Enabling introspection due to USE=python"
- G2CONF="${G2CONF} --enable-introspection"
- else
- G2CONF="${G2CONF} --disable-introspection"
- fi
-
- G2CONF="${G2CONF} --disable-static"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Don't show KDE standalone settings desktop files in GNOME others menu
- epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=688972
- epatch "${FILESDIR}/${PN}-3.6.1-applications-merged.patch"
-
- if use python; then
- python_clean_py-compile_files
- python_copy_sources
- else
- sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
- -i Makefile.* || die "sed failed"
- fi
-}
-
-src_configure() {
- if use python; then
- python_execute_function -s gnome2_src_configure
- else
- gnome2_src_configure
- fi
-}
-
-src_compile() {
- if use python; then
- python_execute_function -s gnome2_src_compile
- else
- gnome2_src_compile
- fi
-}
-
-src_test() {
- if use python; then
- python_execute_function -s -d
- else
- default
- fi
-}
-
-src_install() {
- if use python; then
- python_execute_function -s gnome2_src_install
- python_clean_installation_image
- else
- gnome2_src_install
- fi
-
- # Prefix menu, bug #256614
- mv "${ED}"/etc/xdg/menus/applications.menu \
- "${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
-
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if use python; then
- python_mod_optimize GMenuSimpleEditor
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- if use python; then
- python_mod_cleanup GMenuSimpleEditor
- fi
-}
--git a/gnome-base/gnome-menus/gnome-menus-9999.ebuild b/gnome-base/gnome-menus/gnome-menus-9999.ebuild
index fd88fb6..43e5ef2 100644
--- a/gnome-base/gnome-menus/gnome-menus-9999.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-9999.ebuild
@@ -2,15 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils gnome2 python
+inherit eutils gnome2 python-r1
[[ ${PV} = 9999 ]] && inherit gnome2-live
DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
@@ -26,43 +23,24 @@ fi
# +python for gmenu-simple-editor
IUSE="debug +introspection +python test"
+REQUIRED_USE="python? ( introspection )"
COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
python? (
- >=dev-libs/gobject-introspection-0.9.5
- dev-python/pygobject:3
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
x11-libs/gdk-pixbuf:2[introspection]
x11-libs/gtk+:3[introspection] )"
# Older versions of slot 0 install the menu editor and the desktop directories
RDEPEND="${COMMON_DEPEND}
!<gnome-base/gnome-menus-3.0.1-r1:0"
DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40
sys-devel/gettext
virtual/pkgconfig
- >=dev-util/intltool-0.40
test? ( dev-libs/gjs )"
-pkg_setup() {
- use python && python_pkg_setup
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
- # Do NOT compile with --disable-debug/--enable-debug=no
- # It disables api usage checks
- if ! use debug ; then
- G2CONF="${G2CONF} --enable-debug=minimum"
- fi
-
- if use python || use introspection; then
- use introspection || ewarn "Enabling introspection due to USE=python"
- G2CONF="${G2CONF} --enable-introspection"
- else
- G2CONF="${G2CONF} --disable-introspection"
- fi
-
- G2CONF="${G2CONF} --disable-static"
-}
-
src_prepare() {
gnome2_src_prepare
@@ -70,7 +48,6 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
if use python; then
- python_clean_py-compile_files
python_copy_sources
else
sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
@@ -79,8 +56,17 @@ src_prepare() {
}
src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ # Do NOT compile with --disable-debug/--enable-debug=no
+ # It disables api usage checks
+ G2CONF="${G2CONF}
+ $(usex debug --enable-debug=yes --enable-debug=minimum)
+ $(use_enable introspection)
+ --disable-static"
+
if use python; then
- python_execute_function -s gnome2_src_configure
+ python_foreach_impl run_in_build_dir gnome2_src_configure
else
gnome2_src_configure
fi
@@ -88,7 +74,7 @@ src_configure() {
src_compile() {
if use python; then
- python_execute_function -s gnome2_src_compile
+ python_foreach_impl run_in_build_dir gnome2_src_compile
else
gnome2_src_compile
fi
@@ -96,7 +82,7 @@ src_compile() {
src_test() {
if use python; then
- python_execute_function -s -d
+ python_foreach_impl run_in_build_dir default
else
default
fi
@@ -104,8 +90,14 @@ src_test() {
src_install() {
if use python; then
- python_execute_function -s gnome2_src_install
- python_clean_installation_image
+ installing() {
+ gnome2_src_install
+ # Massage shebang to make python_doscript happy
+ sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
+ -i simple-editor/gmenu-simple-editor || die
+ python_doscript simple-editor/gmenu-simple-editor
+ }
+ python_foreach_impl run_in_build_dir installing
else
gnome2_src_install
fi
@@ -118,16 +110,8 @@ src_install() {
newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
}
-pkg_postinst() {
- gnome2_pkg_postinst
- if use python; then
- python_mod_optimize GMenuSimpleEditor
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- if use python; then
- python_mod_cleanup GMenuSimpleEditor
- fi
+run_in_build_dir() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ "$@"
+ popd > /dev/null
}
--git a/gnome-base/gnome-menus/metadata.xml b/gnome-base/gnome-menus/metadata.xml
index 99b3795..6e0e2ec 100644
--- a/gnome-base/gnome-menus/metadata.xml
+++ b/gnome-base/gnome-menus/metadata.xml
@@ -2,8 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>gnome</herd>
- <use>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
- for introspection</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/
@ 2013-12-12 8:18 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-12 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 84abbb01baa19f2935ee46b2bd063e80e9238e94
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 08:01:35 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 08:17:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=84abbb01
gnome-base/gnome-menus: 3.8.1 → 3.10.1
---
| 6 --
... gnome-menus-3.8.0-ignore_kde_standalone.patch} | 29 ++++--
| 51 ++++++++++
| 103 +++++----------------
4 files changed, 95 insertions(+), 94 deletions(-)
diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 b/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
deleted file mode 100644
index 4bbf863..0000000
--- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && { [ "$DESKTOP_SESSION" = "gnome" ] || [ "$DESKTOP_SESSION" = "cinnamon" ]; }
-then
- export XDG_MENU_PREFIX=gnome-
-fi
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch
similarity index 56%
rename from gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
rename to gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch
index 5f5f8b2..ab6cb92 100644
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch
@@ -1,9 +1,21 @@
---- layout/applications.menu.orig 2007-09-21 17:51:43.000000000 +0300
-+++ layout/applications.menu 2007-09-21 17:55:38.000000000 +0300
-@@ -146,6 +146,19 @@
+From bf91222f05076f32c0a21aa22f8629dc6ce19eb4 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Mon, 25 Feb 2013 16:36:44 +0330
+Subject: [PATCH] gnome-menus-3.7.90-ignore_kde_standalone
+
+---
+ layout/gnome-applications.menu | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
+index 9242eff..94ea6d4 100644
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -277,7 +277,19 @@
+ <And>
<Not><Category>Core</Category></Not>
<Not><Category>Screensaver</Category></Not>
- <Not><Category>X-GNOME-Settings-Panel</Category></Not>
+-
+ <Not><Category>X-KDE-settings-accessibility</Category></Not>
+ <Not><Category>X-KDE-settings-components</Category></Not>
+ <Not><Category>X-KDE-settings-desktop</Category></Not>
@@ -17,6 +29,9 @@
+ <Not><Category>X-KDE-settings-sound</Category></Not>
+ <Not><Category>X-KDE-settings-system</Category></Not>
+ <Not><Category>X-KDE-information</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Other -->
+ <!-- Really Fedora ??? -->
+ <Not><Filename>gnome-eog.desktop</Filename></Not>
+ <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+--
+1.8.1.2
+
--git a/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild
new file mode 100644
index 0000000..805f71c
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Library for the Desktop Menu fd.o specification"
+HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="debug +introspection test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.29.15:2
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
+# Older versions of slot 0 install the menu editor and the desktop directories
+
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gnome-menus-3.0.1-r1:0
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( dev-libs/gjs )
+"
+
+src_prepare() {
+ # Don't show KDE standalone settings desktop files in GNOME others menu
+ epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ # Do NOT compile with --disable-debug/--enable-debug=no
+ # It disables api usage checks
+ gnome2_src_configure \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
+ $(use_enable introspection) \
+ --disable-static
+}
--git a/gnome-base/gnome-menus/gnome-menus-9999.ebuild b/gnome-base/gnome-menus/gnome-menus-9999.ebuild
index 43e5ef2..f14607f 100644
--- a/gnome-base/gnome-menus/gnome-menus-9999.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils gnome2 python-r1
-[[ ${PV} = 9999 ]] && inherit gnome2-live
+inherit gnome2
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
+DESCRIPTION="Library for the Desktop Menu fd.o specification"
+HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
LICENSE="GPL-2+ LGPL-2+"
SLOT="3"
@@ -21,38 +21,29 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
fi
-# +python for gmenu-simple-editor
-IUSE="debug +introspection +python test"
-REQUIRED_USE="python? ( introspection )"
+IUSE="debug +introspection test"
-COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
+COMMON_DEPEND="
+ >=dev-libs/glib-2.29.15:2
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- python? (
- ${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection] )"
+"
# Older versions of slot 0 install the menu editor and the desktop directories
+
RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gnome-menus-3.0.1-r1:0"
+ !<gnome-base/gnome-menus-3.0.1-r1:0
+"
DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.40
sys-devel/gettext
virtual/pkgconfig
- test? ( dev-libs/gjs )"
+ test? ( dev-libs/gjs )
+"
src_prepare() {
- gnome2_src_prepare
-
# Don't show KDE standalone settings desktop files in GNOME others menu
- epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
+ epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
- if use python; then
- python_copy_sources
- else
- sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
- -i Makefile.* || die "sed failed"
- fi
+ gnome2_src_prepare
}
src_configure() {
@@ -60,58 +51,8 @@ src_configure() {
# Do NOT compile with --disable-debug/--enable-debug=no
# It disables api usage checks
- G2CONF="${G2CONF}
- $(usex debug --enable-debug=yes --enable-debug=minimum)
- $(use_enable introspection)
- --disable-static"
-
- if use python; then
- python_foreach_impl run_in_build_dir gnome2_src_configure
- else
- gnome2_src_configure
- fi
-}
-
-src_compile() {
- if use python; then
- python_foreach_impl run_in_build_dir gnome2_src_compile
- else
- gnome2_src_compile
- fi
-}
-
-src_test() {
- if use python; then
- python_foreach_impl run_in_build_dir default
- else
- default
- fi
-}
-
-src_install() {
- if use python; then
- installing() {
- gnome2_src_install
- # Massage shebang to make python_doscript happy
- sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
- -i simple-editor/gmenu-simple-editor || die
- python_doscript simple-editor/gmenu-simple-editor
- }
- python_foreach_impl run_in_build_dir installing
- else
- gnome2_src_install
- fi
-
- # Prefix menu, bug #256614
- mv "${ED}"/etc/xdg/menus/applications.menu \
- "${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
-
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
-}
-
-run_in_build_dir() {
- pushd "${BUILD_DIR}" > /dev/null || die
- "$@"
- popd > /dev/null
+ gnome2_src_configure \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
+ $(use_enable introspection) \
+ --disable-static
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-12 8:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-04 4:04 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-10-29 19:56 Alexandre Restovtsev
2012-08-18 12:09 Priit Laes
2012-11-24 23:17 Alexandre Rostovtsev
2012-12-24 0:41 Gilles Dartiguelongue
2013-12-12 8:18 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox