Fix gnome-shell-3.2.1-r2 compatibility (bug #398385, thanks to Juergen Rose or reporting) and report a more useful error on missing schemas. Drop old.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 100 insertions, 7 deletions

diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog
index 696d867fe8bb..1a9337517b85 100644
--- a/gnome-extra/gnome-tweak-tool/ChangeLog
+++ b/gnome-extra/gnome-tweak-tool/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/gnome-tweak-tool
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.4 2011/12/28 03:44:06 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.5 2012/01/10 17:38:32 tetromino Exp $
+
+*gnome-tweak-tool-3.2.2-r2 (10 Jan 2012)
+
+  10 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-tweak-tool-3.2.1.ebuild, +gnome-tweak-tool-3.2.2-r2.ebuild,
+  +files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch,
+  +files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch:
+  Fix gnome-shell-3.2.1-r2 compatibility (bug #398385, thanks to Juergen Rose
+  for reporting) and report a more useful error on missing schemas. Drop old.
 
 *gnome-tweak-tool-3.2.2-r1 (26 Dec 2011)
 
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch
new file mode 100644
index 000000000000..21e3db02534b
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch
@@ -0,0 +1,49 @@
+From 92b3fbafb7a4f43761dfc3469f20c7fad0cf99d0 Mon Sep 17 00:00:00 2001
+From: John Stowers <john.stowers@gmail.com>
+Date: Sun, 20 Nov 2011 22:54:58 +1300
+Subject: [PATCH] Fix compatibility with gnome-shell master
+
+---
+ gtweak/gshellwrapper.py                 |    4 +++-
+ gtweak/tweaks/tweak_shell_extensions.py |    6 +++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/gtweak/gshellwrapper.py b/gtweak/gshellwrapper.py
+index 4c4ef81..254d246 100644
+--- a/gtweak/gshellwrapper.py
++++ b/gtweak/gshellwrapper.py
+@@ -51,7 +51,9 @@ class GnomeShell:
+         "ENABLED"       :   1,
+         "DISABLED"      :   2,
+         "ERROR"         :   3,
+-        "OUT_OF_DATE"   :   4
++        "OUT_OF_DATE"   :   4,
++        "DOWNLOADING"   :   5,
++        "INITIALIZED"   :   6,
+     }
+ 
+     EXTENSION_TYPE = {
+diff --git a/gtweak/tweaks/tweak_shell_extensions.py b/gtweak/tweaks/tweak_shell_extensions.py
+index a453f33..7f883bc 100644
+--- a/gtweak/tweaks/tweak_shell_extensions.py
++++ b/gtweak/tweaks/tweak_shell_extensions.py
+@@ -24,11 +24,15 @@ class _ShellExtensionTweak(Tweak):
+         sw.set_active(self._shell.extension_is_active(state, ext["uuid"]))
+         sw.connect('notify::active', self._on_extension_toggled, ext["uuid"])
+ 
++        info = None
+         warning = None
+         sensitive = False
+         if state == GnomeShell.EXTENSION_STATE["ENABLED"] or \
+-           state == GnomeShell.EXTENSION_STATE["DISABLED"]:
++           state == GnomeShell.EXTENSION_STATE["DISABLED"] or \
++           state == GnomeShell.EXTENSION_STATE["INITIALIZED"]:
+             sensitive = True
++        elif state == GnomeShell.EXTENSION_STATE["DOWNLOADING"]:
++            info = _("Extension downloading")
+         elif state == GnomeShell.EXTENSION_STATE["ERROR"]:
+             warning = _("Error loading extension")
+         elif state == GnomeShell.EXTENSION_STATE["OUT_OF_DATE"]:
+-- 
+1.7.8.3
+
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch
new file mode 100644
index 000000000000..03bd049e4971
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.2.2-missing-schemas-error.patch
@@ -0,0 +1,27 @@
+From 96ca58e9034c0a4ae6d84ca53e37bc1d50ec0923 Mon Sep 17 00:00:00 2001
+From: John Stowers <john.stowers@gmail.com>
+Date: Thu, 24 Nov 2011 09:55:38 +1300
+Subject: [PATCH] Print more useful error for missing schemas
+
+---
+ gtweak/gsettings.py |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
+index ca7020f..9ab8749 100644
+--- a/gtweak/gsettings.py
++++ b/gtweak/gsettings.py
+@@ -31,7 +31,9 @@ class _GSettingsSchema:
+             schema_filename = schema_name + ".gschema.xml"
+ 
+         schema_path = os.path.join(schema_dir, schema_filename)
+-        assert(os.path.exists(schema_path))
++        if not os.path.exists(schema_path):
++            logging.critical("Could not find schema %s" % schema_path)
++            assert(False)
+ 
+         self._schema_name = schema_name
+         self._schema = {}
+-- 
+1.7.8.3
+
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r2.ebuild
index 43f44e6b94b4..14cb58668216 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.1.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.1.ebuild,v 1.1 2011/11/05 06:08:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r2.ebuild,v 1.1 2012/01/10 17:38:32 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -18,7 +18,7 @@ IUSE=""
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
-	>=gnome-base/gsettings-desktop-schemas-3.0.0
+	>=gnome-base/gsettings-desktop-schemas-3
 	>=dev-python/pygobject-2.90.0:3
 	gnome-base/gconf:2"
 # g-s-d, gnome-shell etc. needed at runtime for the gsettings schemas
@@ -46,9 +46,17 @@ src_prepare() {
 	# Add contents of Gentoo's cursor theme directory to cursor theme list
 	epatch "${FILESDIR}/${PN}-3.0.4-gentoo-cursor-themes.patch"
 
+	# Patch from upstream git master; user theme extension ID changed in 3.2.2
+	epatch "${FILESDIR}/${PN}-3.2.2-user-theme-ext-id.patch"
+
+	# From upstream git master; fix gnome-shell-3.2.1-r2 compat (bug #398385)
+	epatch "${FILESDIR}/${PN}-3.2.2-gnome-shell-3.2.1-r2.patch"
+
+	# From upstream git master; more useful error on missing schemas
+	epatch "${FILESDIR}/${PN}-3.2.2-missing-schemas-error.patch"
+
 	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	echo > py-compile
 
 	gnome2_src_prepare
 }