commit alacarte for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
From d7084b4a32102a3900d3b28469d7a5da3ba84b90 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger
Date: Sat, 12 Jan 2013 13:33:03 +0100 Subject: [PATCH] Enforce the use of Gtk 3.0; Gtk 2.0 is no introspecatble and
Hello community, here is the log from the commit of package alacarte for openSUSE:Factory checked in at 2013-01-13 14:05:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alacarte (Old) and /work/SRC/openSUSE:Factory/.alacarte.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alacarte", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/alacarte/alacarte.changes 2012-10-18 14:54:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alacarte.new/alacarte.changes 2013-01-13 14:05:16.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 12 12:37:14 UTC 2013 - dimstar@opensuse.org + +- Add alacarte-force-Gtk3.patch: Force the use of Gtk 3. Gtk2 was + not designed for use with introspection and some interfaces fail + (bnc#798181, bgo#691599). + +------------------------------------------------------------------- New: ---- alacarte-force-Gtk3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alacarte.spec ++++++ --- /var/tmp/diff_new_pack.4xj9Fl/_old 2013-01-13 14:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.4xj9Fl/_new 2013-01-13 14:05:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package alacarte # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,8 @@ Patch2: alacarte-support-exo-desktop-item-edit.patch # PATCH-FIX-UPSTREAM alacarte-nohelp.patch bnc#779062 bgo#677332 dimstar@opensuse.org -- Do not show help button, as there is no help in alacarte Patch3: alacarte-nohelp.patch +# PATCH-FIX-UPSTREAM alacarte-force-Gtk3.patch bnc#798181 bgo#691599 dimstar@opensuse.org -- Force the usage of Gtk3, as Gtk2 does not really work with gobject-introspection. +Patch4: alacarte-force-Gtk3.patch BuildRequires: fdupes BuildRequires: glib2-devel # Needed for the typelib() dependency parser @@ -61,6 +63,7 @@ # %patch1 -p0 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # Patch is disabled ++++++ alacarte-force-Gtk3.patch ++++++ thus does not serve us anyway. Fixes bug 691599. --- Alacarte/ItemEditor.py | 2 ++ Alacarte/MainWindow.py | 2 ++ Alacarte/util.py | 3 +++ 3 files changed, 7 insertions(+) Index: alacarte-3.6.1/Alacarte/MainWindow.py =================================================================== --- alacarte-3.6.1.orig/Alacarte/MainWindow.py +++ alacarte-3.6.1/Alacarte/MainWindow.py @@ -17,6 +17,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GObject, Gio, GdkPixbuf, Gdk, GMenu, GLib import cgi import os Index: alacarte-3.6.1/Alacarte/util.py =================================================================== --- alacarte-3.6.1.orig/Alacarte/util.py +++ alacarte-3.6.1/Alacarte/util.py @@ -19,6 +19,9 @@ import os import xml.dom.minidom from collections import Sequence + +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GdkPixbuf, GMenu, GLib # XXX: look into pygobject error marshalling -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de