Accepting request 85287 from home:vuntz:branches:GNOME:Factory
Update to 3.2.0.1 OBS-URL: https://build.opensuse.org/request/show/85287 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-menus?expand=0&rev=84
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
7b3bdf91b4
commit
4a02aed1fd
3
gnome-menus-3.2.0.1.tar.bz2
Normal file
3
gnome-menus-3.2.0.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:14832dcbee37b71eca1f170b2ed5132ac134e19519c99798c9a5bbac6f464d67
|
||||||
|
size 465272
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:95fb4d67fc2ce93638b95db047cdb90acaa3bbd00e3edf9aaa0141b9856fbf63
|
|
||||||
size 464994
|
|
||||||
@ -1,113 +0,0 @@
|
|||||||
commit f1c76629d33a616089a15bd034708d21e8bd9a87
|
|
||||||
Author: Vincent Untz <vuntz@gnome.org>
|
|
||||||
Date: Tue Sep 27 12:09:35 2011 +0200
|
|
||||||
|
|
||||||
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)
|
|
||||||
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 28 09:01:59 UTC 2011 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.2.0.1:
|
||||||
|
+ Menu Editor
|
||||||
|
- Work with latest pygobject
|
||||||
|
- Drop gnome-menus-fix-editor.patch: fixed upstream.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Sep 27 10:11:02 UTC 2011 - vuntz@opensuse.org
|
Tue Sep 27 10:11:02 UTC 2011 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: gnome-menus
|
Name: gnome-menus
|
||||||
Version: 3.2.0
|
Version: 3.2.0.1
|
||||||
Release: 1
|
Release: 1
|
||||||
License: LGPLv2.1+
|
License: LGPLv2.1+
|
||||||
Summary: The GNOME Desktop Menu
|
Summary: The GNOME Desktop Menu
|
||||||
@ -26,8 +26,6 @@ Url: http://www.gnome.org
|
|||||||
Group: System/GUI/GNOME
|
Group: System/GUI/GNOME
|
||||||
Source: http://download.gnome.org/sources/gnome-menus/3.2/%{name}-%{version}.tar.bz2
|
Source: http://download.gnome.org/sources/gnome-menus/3.2/%{name}-%{version}.tar.bz2
|
||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
# PATCH-FIX-UPSTREAM gnome-menus-fix-editor.patch vuntz@opensuse.org -- Fix editor to work, taken from git
|
|
||||||
Patch0: gnome-menus-fix-editor.patch
|
|
||||||
# PATCH-NEEDS-REBASE
|
# PATCH-NEEDS-REBASE
|
||||||
Patch3: gnome-menus-x-suse-unimportant.patch
|
Patch3: gnome-menus-x-suse-unimportant.patch
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -122,7 +120,6 @@ http://www.freedesktop.org/Standards/menu-spec
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
translation-update-upstream
|
translation-update-upstream
|
||||||
%patch0 -p1
|
|
||||||
# NEEDS REBASE
|
# NEEDS REBASE
|
||||||
#patch3
|
#patch3
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user