Fix gnome-shell-3.2.1-r2 compatibility (bug #398385, thanks to Juergen Rose or report...

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog
index 696d867fe8bbbc8d7ea5c9e6a70434eb914dde44..1a9337517b85b19a9412564384e0138ecf671d14 100644 (file)
--- 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/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
index 4e8616326ba551133506a6bb475e3c883d45d0ae..da034b513f8ffb8e30e12d2e058cf49fa015de48 100644 (file)
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX gnome-tweak-tool-3.0.4-gentoo-cursor-themes.patch 1030 RMD160 cea6d3a71966ee6aaf8a85784c2cd1e979141e10 SHA1 c542ba80eec0369ad3566c6e4561218610964a0d SHA256 d6a9c50a41f5bb8ac6dcb97f646f9ce7be3f09ec6537cfbceef8bc91b0ac2fc5
+AUX gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch 1910 RMD160 da211ede6c8f614d204bb5eea0741506a531f139 SHA1 650bb4df2e33ae342281b9bef28ee21b23578719 SHA256 6ebeaad2fb388b661bb6f3db9fc1c7751758e0a3c187d5d0c69121249a00f920
+AUX gnome-tweak-tool-3.2.2-missing-schemas-error.patch 881 RMD160 ba1ad55a1780d33cfd8fb5efcfea47011710a26b SHA1 5971a7546576074690bdf1bd9aa7c61290b02037 SHA256 bc42caa2e89da1e8198165ab9cdf12a6a9a5d640d5dcff469d5334cc84195c32
 AUX gnome-tweak-tool-3.2.2-user-theme-ext-id.patch 1192 RMD160 cb82e49ad51747eb733762dd08bbec577b78bd3a SHA1 a74379378a7b0d017622877675096b76e2919e5b SHA256 11a4819917b46c6f8f13f49905e03a3477a00123ea7beb6a57b89e9d8c45626c
-DIST gnome-tweak-tool-3.2.1.tar.xz 198452 RMD160 1f2577628a62036477faae9beeeb4d422db51374 SHA1 07c1bdf5889066b98fdb15fef29871fa5051df7a SHA256 a91cd214e1c1638110e83745394ebd80937e3e4bcebe96cd3042ec99d7e4e044
 DIST gnome-tweak-tool-3.2.2.tar.xz 198904 RMD160 1354a1c0bfb355757cb67f7ca614df40eb907ad5 SHA1 dace7d9b4bc17a3574030215d34349a977808aed SHA256 57ad08b813ca2f5ea2e131b22cb365d33788d051b80f3f6decc04e3a5404f8f5
-EBUILD gnome-tweak-tool-3.2.1.ebuild 1623 RMD160 6baab9175720f8400e3418eb6a30e5d17414fe42 SHA1 8650b5ff778989e8a64dfe43eed4eec2894083d4 SHA256 a9538741fffc7b5b539cd5c380d708eb3a63a855f5561e2dd4eadef21f2e2480
 EBUILD gnome-tweak-tool-3.2.2-r1.ebuild 1757 RMD160 019714f9fd8d4629da878b9427fb8ac3bd50653c SHA1 07e990ea337d11a96c114e8e4f68d59e626cd91e SHA256 e7b4851209ebb2e39f1a3c62acf98e7dbaf4a2338acf2b722881ab3d0ac0b05a
+EBUILD gnome-tweak-tool-3.2.2-r2.ebuild 1977 RMD160 f90c11e23aee321e59befbe4c8e7a4019fdde29d SHA1 60066b8b53da5f38b95ffbf2b4bfda807abed821 SHA256 7666d16c0549057875473a59f0f4060bfd8820bf91297adbece492a47502f2d0
 EBUILD gnome-tweak-tool-3.2.2.ebuild 1613 RMD160 a20e205c9030324db4c3f5c62fdeb94564bf6763 SHA1 758c0e93cc2c95d2666c0ca72f76542ab504e039 SHA256 3443a276611e3c884bc210249ebd25bb28c7e625ab6c9d8b2b93204a6f1cb07e
-MISC ChangeLog 1010 RMD160 928ecd6f4f71d23c3cba327536f39fa11c1ea0a3 SHA1 7eb5201f1c8e255cc6df732a269edbca9ee5f4b8 SHA256 01d38affcf3311e99a4857dfa24e18cfecd9b143fb9c16364647a4282a605046
+MISC ChangeLog 1458 RMD160 53033bd118e987c963902f4ac3bd3f6ec52339f7 SHA1 e0f63c21db32398af9010afb7592347bd8382e12 SHA256 7a5120828b5648da12cb1d20ed50ece2fc39fe16bd143cb39206326daa8ed400
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk76kIsACgkQdjK8w9WeBnAx4gD7BiWx7Tu2kDkrLNPDffO3R8BP
-1HulTuCuOQxMEfCbDVkA/ipBYRFzxVZ+bjyouLATKjl1F3nETxB0Cl8e116MXWGF
-=Qmpa
+iF4EAREIAAYFAk8Md50ACgkQdjK8w9WeBnA4HwD/SLSZ9zpvqWq5guyn1bDnxwFr
+JAu3PbVo/Nup4If7zcUA/i4/V+1WVHL4MdTkOILeU3iwsUIeJ5ZtHqWyXGYoPWwo
+=tAED
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..21e3db0
--- /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 (file)
index 0000000..03bd049
--- /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
similarity index 70%
rename from gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.1.ebuild
rename to gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r2.ebuild
index 43f44e6b94b427b1b80864bd51be5b23c90ab90e..14cb58668216e3b7ab4e67329ac34fa8b7e856b7 100644 (file)
--- 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
 }