From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RAwFM-0000mH-6x for garchives@archives.gentoo.org; Tue, 04 Oct 2011 04:04:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C42721C068; Tue, 4 Oct 2011 04:04:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E02AA21C068 for ; Tue, 4 Oct 2011 04:04:35 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F76C1B4017 for ; Tue, 4 Oct 2011 04:04:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 32A8C80052 for ; Tue, 4 Oct 2011 04:04:34 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <0e66442d6fd6662508fe1b7fee64c36718239c3d.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-menus/files/gnome-menus-3.2.0-pygobject-3.patch gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild X-VCS-Directories: gnome-base/gnome-menus/ gnome-base/gnome-menus/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 0e66442d6fd6662508fe1b7fee64c36718239c3d Date: Tue, 4 Oct 2011 04:04:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d046cb5aa7541411020844c04987456a commit: 0e66442d6fd6662508fe1b7fee64c36718239c3d Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Oct 4 03:35:55 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Oct 4 03:59:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D0e66442d gnome-base/gnome-menus: 3.2.0 =E2=86=92 3.2.0.1 Patch applied upstream. --- .../files/gnome-menus-3.2.0-pygobject-3.patch | 114 --------------= ------ ...nus-3.2.0.ebuild =3D> gnome-menus-3.2.0.1.ebuild} | 3 - 2 files changed, 0 insertions(+), 117 deletions(-) diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.2.0-pygobject-3.p= atch 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 -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=3D660112 ---- -diff --git a/simple-editor/GMenuSimpleEditor/main.py b/simple-editor/GMe= nuSimpleEditor/main.py -index a107818..7af8ae0 100644 ---- a/simple-editor/GMenuSimpleEditor/main.py -+++ b/simple-editor/GMenuSimpleEditor/main.py -@@ -17,11 +17,12 @@ - # -=20 - def main (args): -+ import optparse -+ - import locale - import gettext -=20 -- import gobject -- from gobject.option import OptionParser, make_option -+ from gi.repository import GObject -=20 - from gi.repository import Gtk -=20 -@@ -31,18 +32,14 @@ def main (args): - locale.setlocale (locale.LC_ALL, "") - gettext.install (config.PACKAGE, config.LOCALEDIR) -=20 -- parser =3D OptionParser ( -- option_list =3D [ -- # FIXME: remove this when we can get all the default -- # options -- make_option ("--version", -- action=3D"store_true", -- dest=3D"version", -- help=3Dconfig.VERSION), -- ]) -- parser.parse_args (args) -- -- if parser.values.version: -+ parser =3D optparse.OptionParser() -+ parser.add_option('--version', dest=3D'version', -+ action=3D'store_true', default=3DFalse, -+ help=3Dconfig.VERSION) -+ -+ (options, args) =3D parser.parse_args() -+ -+ if options.version: - # Translators: %s is the version number=20 - 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 -=20 - import menutreemodel -@@ -86,7 +86,7 @@ class MenuFileWriter: -=20 - def __del__ (self): - for (path, id) in self.sync_idle_handlers.items(): -- gobject.source_remove (id) -+ GObject.source_remove (id) -=20 - def __append_menu (self, contents, indent, iter, system_menu_file =3D= None): - has_changes =3D False -@@ -192,5 +192,5 @@ class MenuFileWriter: - if self.sync_idle_handlers.has_key (menu_file_path): - return -=20 -- id =3D gobject.idle_add (self.__sync_idle_handler_func, menu_fi= le_path) -+ id =3D GObject.idle_add (self.__sync_idle_handler_func, menu_fi= le_path) - self.sync_idle_handlers[menu_file_path] =3D id -diff --git a/simple-editor/GMenuSimpleEditor/menutreemodel.py b/simple-e= ditor/GMenuSimpleEditor/menutreemodel.py -index 9930c4f..2eded47 100644 ---- a/simple-editor/GMenuSimpleEditor/menutreemodel.py -+++ b/simple-editor/GMenuSimpleEditor/menutreemodel.py -@@ -18,7 +18,7 @@ -=20 - 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 =3D=3D "applications.menu" and os.environ.has_= key ("XDG_MENU_PREFIX"): - menu_file =3D os.environ["XDG_MENU_PREFIX"] + menu_file -=20 -- tree =3D gobject.new (GMenu.Tree, menu_basename =3D menu_fi= le, flags =3D GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.SORT_DISPL= AY_NAME) -+ tree =3D GObject.new (GMenu.Tree, menu_basename =3D menu_fi= le, flags =3D GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.SORT_DISPL= AY_NAME) - tree.load_sync () -=20 - self.__append_directory (tree.get_root_directory (), None, = False, menu_file) -=20 - system_file =3D lookup_system_menu_file (menu_file) - if system_file: -- system_tree =3D gobject.new (GMenu.Tree, menu_path =3D = system_file, flags =3D GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.S= ORT_DISPLAY_NAME) -+ system_tree =3D GObject.new (GMenu.Tree, menu_path =3D = system_file, flags =3D GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.S= ORT_DISPLAY_NAME) - system_tree.load_sync () -=20 - 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 =20 - # Upstream patch to fix pygobject-3 compatibility, will be in next rele= ase - 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" =20