Gentoo Archives: gentoo-commits

From: Nirbheek Chauhan <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-tweak-tool/, gnome-extra/gnome-tweak-tool/files/
Date: Tue, 03 May 2011 06:13:04
Message-Id: a8d8f4b93d31c6e28d4720da6aabfebc91d78b00.nirbheek@gentoo
1 commit: a8d8f4b93d31c6e28d4720da6aabfebc91d78b00
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 3 06:12:12 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 06:12:14 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a8d8f4b9
7
8 gnome-extra/gnome-tweak-tool: fix gnome bug 649003
9
10 * There's a Gentoo bug for this too, but bugzie is down, so I can't find it or
11 close it.
12
13 ---
14 .../files/gnome-tweak-tool-no-cursor-themes.patch | 28 ++++++++++++++++++++
15 ...0.3.ebuild => gnome-tweak-tool-3.0.3-r1.ebuild} | 10 +++++++
16 2 files changed, 38 insertions(+), 0 deletions(-)
17
18 diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-no-cursor-themes.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-no-cursor-themes.patch
19 new file mode 100644
20 index 0000000..a2ff5f4
21 --- /dev/null
22 +++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-no-cursor-themes.patch
23 @@ -0,0 +1,28 @@
24 +From 5097c671f199cb108d999fed80156b8a9a506b55 Mon Sep 17 00:00:00 2001
25 +From: Nirbheek Chauhan <nirbheek@g.o>
26 +Date: Tue, 3 May 2011 11:35:01 +0530
27 +Subject: [PATCH] Don't error out if no cursor themes were found
28 +
29 +---
30 + gtweak/widgets.py | 5 +++--
31 + 1 files changed, 3 insertions(+), 2 deletions(-)
32 +
33 +diff --git a/gtweak/widgets.py b/gtweak/widgets.py
34 +index f50ae29..7414836 100644
35 +--- a/gtweak/widgets.py
36 ++++ b/gtweak/widgets.py
37 +@@ -137,8 +137,9 @@ class GSettingsComboTweak(_GSettingsTweak):
38 + def __init__(self, schema_name, key_name, key_options, **options):
39 + _GSettingsTweak.__init__(self, schema_name, key_name, **options)
40 +
41 +- assert len(key_options) > 0
42 +- assert len(key_options[0]) == 2
43 ++ # Don't error out if no cursor themes were found
44 ++ #assert len(key_options) > 0
45 ++ #assert len(key_options[0]) == 2
46 +
47 + combo = build_combo_box_text(
48 + self.settings.get_value(self.key_name),
49 +--
50 +1.7.3.4
51 +
52
53 diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.0.3.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.0.3-r1.ebuild
54 similarity index 74%
55 rename from gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.0.3.ebuild
56 rename to gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.0.3-r1.ebuild
57 index 94fd0d5..10eff08 100644
58 --- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.0.3.ebuild
59 +++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.0.3-r1.ebuild
60 @@ -37,6 +37,16 @@ pkg_setup() {
61 gnome2-python_pkg_setup
62 }
63
64 +src_prepare() {
65 + # https://bugzilla.gnome.org/show_bug.cgi?id=649003
66 + # Cursor themes are not installed in the usual place in Gentoo
67 + # In addition, due to some weird setup issue, changing "cursor-theme" in
68 + # org.gnome.desktop.interface doesn't change the cursor at all.
69 + # This is a temporary workaround till we can figure this out properly.
70 + epatch "${FILESDIR}/${PN}-no-cursor-themes.patch"
71 + gnome2-python_src_prepare
72 +}
73 +
74 src_install() {
75 gnome2-python_src_install
76 python_convert_shebangs 2 "${ED}"/usr/bin/gnome-tweak-tool