- update to 3.2.0.1 (only fixes the menu editor, for which we already had the patches)
This commit is contained in:
jasper
parent
0cfd4d7fb8
commit
0db1c59401
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.53 2011/09/27 10:22:26 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.54 2011/09/28 08:21:01 jasper Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= implementation of the FreeDesktop Desktop Menu Spec
|
||||
|
||||
GNOME_PROJECT= gnome-menus
|
||||
GNOME_VERSION= 3.2.0
|
||||
REVISION= 1
|
||||
GNOME_VERSION= 3.2.0.1
|
||||
|
||||
SHARED_LIBS += gnome-menu-3 0.0 # 0.0
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (gnome/gnome-menus-3.2.0.tar.xz) = 3WOYLy8T74o3HIxCj5rjMQ==
|
||||
RMD160 (gnome/gnome-menus-3.2.0.tar.xz) = JBN1/g4kh6M+f2lSj+bKvUGFK10=
|
||||
SHA1 (gnome/gnome-menus-3.2.0.tar.xz) = OYq3AmM2H9/zK+5m7wzQh4dvHLo=
|
||||
SHA256 (gnome/gnome-menus-3.2.0.tar.xz) = 3lkkqiTyCpBYwUw6SN32eF5Hr6TdpjbXfLz0r+Y6eXs=
|
||||
SIZE (gnome/gnome-menus-3.2.0.tar.xz) = 401980
|
||||
MD5 (gnome/gnome-menus-3.2.0.1.tar.xz) = dM4p47MFhEmMwpKHrgSQaA==
|
||||
RMD160 (gnome/gnome-menus-3.2.0.1.tar.xz) = mM20g8DxoWoapvWJotEwSEyXCkI=
|
||||
SHA1 (gnome/gnome-menus-3.2.0.1.tar.xz) = i0u6Lxu12FM/fNJBAWcZ70LLDr8=
|
||||
SHA256 (gnome/gnome-menus-3.2.0.1.tar.xz) = F+LqdFsegPuk9uwDxLrFYapufKJ1/MeaPfPTGMtklys=
|
||||
SIZE (gnome/gnome-menus-3.2.0.1.tar.xz) = 402080
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
$OpenBSD: patch-simple-editor_GMenuSimpleEditor_main_py,v 1.1 2011/09/27 10:22:26 jasper Exp $
|
||||
|
||||
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
|
||||
|
||||
--- simple-editor/GMenuSimpleEditor/main.py.orig Tue Mar 22 19:25:58 2011
|
||||
+++ simple-editor/GMenuSimpleEditor/main.py Tue Sep 27 12:14:29 2011
|
||||
@@ -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)
|
||||
+ parser = optparse.OptionParser()
|
||||
+ parser.add_option('--version', dest='version',
|
||||
+ action='store_true', default=False,
|
||||
+ help=config.VERSION)
|
||||
|
||||
- if parser.values.version:
|
||||
+ (options, args) = parser.parse_args()
|
||||
+
|
||||
+ if options.version:
|
||||
# Translators: %s is the version number
|
||||
print _("Simple Menu Editor %s") % (config.VERSION)
|
||||
else:
|
||||
@ -1,36 +0,0 @@
|
||||
$OpenBSD: patch-simple-editor_GMenuSimpleEditor_menufilewriter_py,v 1.1 2011/09/27 10:22:26 jasper Exp $
|
||||
|
||||
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
|
||||
|
||||
--- simple-editor/GMenuSimpleEditor/menufilewriter.py.orig Tue Mar 22 19:25:58 2011
|
||||
+++ simple-editor/GMenuSimpleEditor/menufilewriter.py Tue Sep 27 12:14:29 2011
|
||||
@@ -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
|
||||
@ -1,37 +0,0 @@
|
||||
$OpenBSD: patch-simple-editor_GMenuSimpleEditor_menutreemodel_py,v 1.3 2011/09/27 10:22:26 jasper Exp $
|
||||
|
||||
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
|
||||
|
||||
--- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig Mon Aug 1 19:38:29 2011
|
||||
+++ simple-editor/GMenuSimpleEditor/menutreemodel.py Tue Sep 27 12:14:29 2011
|
||||
@@ -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)
|
||||
Loading…
Reference in New Issue
Block a user