diff options
Diffstat (limited to 'gnome-extra/gnome-tweak-tool')
| -rw-r--r-- | gnome-extra/gnome-tweak-tool/ChangeLog | 13 | ||||
| -rw-r--r-- | gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-missing-schemas.patch | 174 | ||||
| -rw-r--r-- | gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-shell-theme-schema.patch | 77 | ||||
| -rw-r--r-- | gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-static-workspaces.patch | 72 | ||||
| -rw-r--r-- | gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch | 61 | ||||
| -rw-r--r-- | gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2.ebuild | 69 | ||||
| -rw-r--r-- | gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.3.4-r1.ebuild (renamed from gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r1.ebuild) | 19 |
7 files changed, 406 insertions, 79 deletions
diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog index c30eb4c2b12d..1aa5c405df3a 100644 --- a/gnome-extra/gnome-tweak-tool/ChangeLog +++ b/gnome-extra/gnome-tweak-tool/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for gnome-extra/gnome-tweak-tool # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.6 2012/05/05 06:25:17 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.7 2012/05/14 00:07:40 tetromino Exp $ + +*gnome-tweak-tool-3.3.4-r1 (14 May 2012) + + 14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -gnome-tweak-tool-3.2.2.ebuild, -gnome-tweak-tool-3.2.2-r1.ebuild, + +gnome-tweak-tool-3.3.4-r1.ebuild, + +files/gnome-tweak-tool-3.3.4-missing-schemas.patch, + +files/gnome-tweak-tool-3.3.4-shell-theme-schema.patch, + +files/gnome-tweak-tool-3.3.4-static-workspaces.patch, + +files/gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch: + Version bump for gnome-3.4 support. Drop old. 05 May 2012; Jeff Horelick <jdhore@gentoo.org> gnome-tweak-tool-3.2.2.ebuild, gnome-tweak-tool-3.2.2-r1.ebuild, gnome-tweak-tool-3.2.2-r2.ebuild: diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-missing-schemas.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-missing-schemas.patch new file mode 100644 index 000000000000..33ea00ab4453 --- /dev/null +++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-missing-schemas.patch @@ -0,0 +1,174 @@ +From 81ee17f1b0352347b1bf5f2bdad25e0fc2c7c3eb Mon Sep 17 00:00:00 2001 +From: John Stowers <john.stowers@gmail.com> +Date: Wed, 18 Jan 2012 21:10:45 +1300 +Subject: [PATCH] Dont crash on missing schemas + +--- + gtweak/gsettings.py | 23 ++++++++++++++++++++++- + gtweak/tweakmodel.py | 3 +++ + gtweak/widgets.py | 32 ++++++++++++++++++++------------ + 3 files changed, 45 insertions(+), 13 deletions(-) + +diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py +index 9ab8749..e334637 100644 +--- a/gtweak/gsettings.py ++++ b/gtweak/gsettings.py +@@ -23,6 +23,12 @@ import gtweak + + from gi.repository import Gio, GLib + ++_SCHEMA_CACHE = {} ++_GSETTINGS_SCHEMAS = set(Gio.Settings.list_schemas()) ++ ++class GSettingsMissingError(Exception): ++ pass ++ + class _GSettingsSchema: + def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): + if not schema_dir: +@@ -64,10 +70,25 @@ class _GSettingsSchema: + def __repr__(self): + return "<gtweak.gsettings._GSettingsSchema: %s>" % self._schema_name + +-_SCHEMA_CACHE = {} ++class GSettingsFakeSetting: ++ def __init__(self): ++ pass ++ ++ def get_range(self, *args, **kwargs): ++ return False, [] ++ ++ def get_string(self, *args, **kwargs): ++ return "" ++ ++ def __getattr__(self, name): ++ def noop(*args, **kwargs): ++ pass ++ return noop + + class GSettingsSetting(Gio.Settings): + def __init__(self, schema_name, **options): ++ if schema_name not in _GSETTINGS_SCHEMAS: ++ raise GSettingsMissingError(schema_name) + Gio.Settings.__init__(self, schema_name) + if schema_name not in _SCHEMA_CACHE: + _SCHEMA_CACHE[schema_name] = _GSettingsSchema(schema_name, **options) +diff --git a/gtweak/tweakmodel.py b/gtweak/tweakmodel.py +index d67ce5a..558a329 100644 +--- a/gtweak/tweakmodel.py ++++ b/gtweak/tweakmodel.py +@@ -35,6 +35,7 @@ class Tweak: + self.name = name + self.description = description + self.group_name = options.get("group_name",_("Miscellaneous")) ++ self.loaded = True + + self._search_cache = None + +@@ -148,6 +149,8 @@ class TweakModel(Gtk.ListStore): + self._tweak_group_names[tweakgroup.name] = tweakgroup + + def add_tweak_auto_to_group(self, tweak): ++ if not tweak.loaded: ++ return + name = tweak.group_name + try: + group = self._tweak_group_names[name] +diff --git a/gtweak/widgets.py b/gtweak/widgets.py +index 4a7646f..c915a17 100644 +--- a/gtweak/widgets.py ++++ b/gtweak/widgets.py +@@ -15,10 +15,12 @@ + # You should have received a copy of the GNU General Public License + # along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>. + ++import logging ++ + from gi.repository import Gtk, Gdk, Gio, Pango + + from gtweak.tweakmodel import Tweak +-from gtweak.gsettings import GSettingsSetting ++from gtweak.gsettings import GSettingsSetting, GSettingsFakeSetting, GSettingsMissingError + from gtweak.gconf import GConfSetting + + def build_label_beside_widget(txt, *widget, **kwargs): +@@ -97,11 +99,17 @@ class _GSettingsTweak(Tweak): + def __init__(self, schema_name, key_name, **options): + self.schema_name = schema_name + self.key_name = key_name +- self.settings = GSettingsSetting(schema_name, **options) +- Tweak.__init__(self, +- options.get("summary",self.settings.schema_get_summary(key_name)), +- options.get("description",self.settings.schema_get_description(key_name)), +- **options) ++ try: ++ self.settings = GSettingsSetting(schema_name, **options) ++ Tweak.__init__(self, ++ options.get("summary",self.settings.schema_get_summary(key_name)), ++ options.get("description",self.settings.schema_get_description(key_name)), ++ **options) ++ except GSettingsMissingError, e: ++ self.settings = GSettingsFakeSetting() ++ Tweak.__init__(self,"","") ++ self.loaded = False ++ logging.info("Missing gsettings %s (key %s)" % (e.message, key_name)) + + class GSettingsSwitchTweak(_GSettingsTweak): + def __init__(self, schema_name, key_name, **options): +@@ -109,7 +117,7 @@ class GSettingsSwitchTweak(_GSettingsTweak): + + w = Gtk.Switch() + self.settings.bind(key_name, w, "active", Gio.SettingsBindFlags.DEFAULT) +- self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w) ++ self.widget = build_label_beside_widget(self.name, w) + # never change the size of a switch + self.widget_for_size_group = None + +@@ -119,7 +127,7 @@ class GSettingsFontButtonTweak(_GSettingsTweak): + + w = Gtk.FontButton() + self.settings.bind(key_name, w, "font-name", Gio.SettingsBindFlags.DEFAULT) +- self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w) ++ self.widget = build_label_beside_widget(self.name, w) + self.widget_for_size_group = w + + class GSettingsRangeTweak(_GSettingsTweak): +@@ -131,7 +139,7 @@ class GSettingsRangeTweak(_GSettingsTweak): + + w = Gtk.HScale.new_with_range(_min, _max, options.get('adjustment_step', 1)) + self.settings.bind(key_name, w.get_adjustment(), "value", Gio.SettingsBindFlags.DEFAULT) +- self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w) ++ self.widget = build_label_beside_widget(self.name, w) + self.widget_for_size_group = w + + class GSettingsSpinButtonTweak(_GSettingsTweak): +@@ -146,7 +154,7 @@ class GSettingsSpinButtonTweak(_GSettingsTweak): + w.set_adjustment(adjustment) + w.set_digits(options.get('digits', 0)) + self.settings.bind(key_name, adjustment, "value", Gio.SettingsBindFlags.DEFAULT) +- self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w) ++ self.widget = build_label_beside_widget(self.name, w) + self.widget_for_size_group = w + + class GSettingsComboEnumTweak(_GSettingsTweak): +@@ -161,7 +169,7 @@ class GSettingsComboEnumTweak(_GSettingsTweak): + w.connect('changed', self._on_combo_changed) + self.combo = w + +- self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w) ++ self.widget = build_label_beside_widget(self.name, w) + self.widget_for_size_group = w + + +@@ -246,7 +254,7 @@ class GConfFontButtonTweak(_GConfTweak): + w = Gtk.FontButton() + w.props.font_name = self.gconf.get_value() + w.connect("notify::font-name", self._on_fontbutton_changed) +- self.widget = build_label_beside_widget(self.gconf.schema_get_summary(), w) ++ self.widget = build_label_beside_widget(self.name, w) + self.widget_for_size_group = w + + def _on_fontbutton_changed(self, btn, param): +-- +1.7.8.6 + diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-shell-theme-schema.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-shell-theme-schema.patch new file mode 100644 index 000000000000..eb9fd14c0a93 --- /dev/null +++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-shell-theme-schema.patch @@ -0,0 +1,77 @@ +From 6fbecd5f847fceff3942dc6b1370fb5514e7c293 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna@src.gnome.org> +Date: Sun, 29 Apr 2012 23:58:20 +0200 +Subject: [PATCH] Shell Theme: load settings schema from user directory + +Recent versions of the user-theme extension install the GSettings +schema in the extension directory, to comply with extensions.gnome.org +rules. + +https://bugzilla.gnome.org/show_bug.cgi?id=675106 +--- + gtweak/gsettings.py | 20 ++++++++++++++++---- + gtweak/tweaks/tweak_shell.py | 8 +++++++- + 2 files changed, 23 insertions(+), 5 deletions(-) + +diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py +index e334637..2739d6a 100644 +--- a/gtweak/gsettings.py ++++ b/gtweak/gsettings.py +@@ -86,12 +86,24 @@ class GSettingsFakeSetting: + return noop + + class GSettingsSetting(Gio.Settings): +- def __init__(self, schema_name, **options): +- if schema_name not in _GSETTINGS_SCHEMAS: ++ def __init__(self, schema_name, schema_dir=None, **options): ++ if schema_dir is None and schema_name not in _GSETTINGS_SCHEMAS: + raise GSettingsMissingError(schema_name) +- Gio.Settings.__init__(self, schema_name) ++ if schema_dir is None: ++ Gio.Settings.__init__(self, schema_name) ++ else: ++ GioSSS = Gio.SettingsSchemaSource ++ schema_source = GioSSS.new_from_directory(schema_dir, ++ GioSSS.get_default(), ++ False) ++ schema_obj = schema_source.lookup(schema_name, True) ++ if not schema_obj: ++ raise GSettingsMissingError(schema_name) ++ ++ Gio.Settings.__init__(self, None, settings_schema=schema_obj) ++ + if schema_name not in _SCHEMA_CACHE: +- _SCHEMA_CACHE[schema_name] = _GSettingsSchema(schema_name, **options) ++ _SCHEMA_CACHE[schema_name] = _GSettingsSchema(schema_name, schema_dir=schema_dir, **options) + logging.debug("Caching gsettings: %s" % _SCHEMA_CACHE[schema_name]) + + self._schema = _SCHEMA_CACHE[schema_name] +diff --git a/gtweak/tweaks/tweak_shell.py b/gtweak/tweaks/tweak_shell.py +index 1d5a91d..5bb664f 100644 +--- a/gtweak/tweaks/tweak_shell.py ++++ b/gtweak/tweaks/tweak_shell.py +@@ -46,6 +46,8 @@ class ShellThemeTweak(Tweak): + THEME_EXT_NAME = "user-theme@gnome-shell-extensions.gcampax.github.com" + THEME_GSETTINGS_SCHEMA = "org.gnome.shell.extensions.user-theme" + THEME_GSETTINGS_NAME = "name" ++ THEME_GSETTINGS_DIR = os.path.join(GLib.get_user_data_dir(), "gnome-shell", "extensions", ++ THEME_EXT_NAME, "schemas") + THEME_DIR = os.path.join(GLib.get_home_dir(), ".themes") + + def __init__(self, **options): +@@ -63,7 +65,11 @@ class ShellThemeTweak(Tweak): + if ShellThemeTweak.THEME_EXT_NAME in extensions and extensions[ShellThemeTweak.THEME_EXT_NAME]["state"] == 1: + #check the correct gsettings key is present + try: +- self._settings = GSettingsSetting(ShellThemeTweak.THEME_GSETTINGS_SCHEMA) ++ if os.path.exists(ShellThemeTweak.THEME_GSETTINGS_DIR): ++ self._settings = GSettingsSetting(ShellThemeTweak.THEME_GSETTINGS_SCHEMA, ++ schema_dir=ShellThemeTweak.THEME_GSETTINGS_DIR) ++ else: ++ self._settings = GSettingsSetting(ShellThemeTweak.THEME_GSETTINGS_SCHEMA) + name = self._settings.get_string(ShellThemeTweak.THEME_GSETTINGS_NAME) + + ext = extensions[ShellThemeTweak.THEME_EXT_NAME] +-- +1.7.8.6 + diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-static-workspaces.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-static-workspaces.patch new file mode 100644 index 000000000000..757d77c2281e --- /dev/null +++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-static-workspaces.patch @@ -0,0 +1,72 @@ +From c8410742023ff973c05bd1e30f65e4e1574a0367 Mon Sep 17 00:00:00 2001 +From: John Stowers <john.stowers@gmail.com> +Date: Wed, 9 May 2012 13:38:22 +0200 +Subject: [PATCH] Support dynamic/static workspaces + +--- + gtweak/tweaks/tweak_shell.py | 37 ++++++++++++++++++++++++++++++++++--- + 1 files changed, 34 insertions(+), 3 deletions(-) + +diff --git a/gtweak/tweaks/tweak_shell.py b/gtweak/tweaks/tweak_shell.py +index b4552ea..8c21de5 100644 +--- a/gtweak/tweaks/tweak_shell.py ++++ b/gtweak/tweaks/tweak_shell.py +@@ -22,8 +22,7 @@ import logging + import json + import pprint + +-from gi.repository import Gtk +-from gi.repository import GLib ++from gi.repository import Gtk, GLib, GObject, Gio + + from gtweak.utils import walk_directories, extract_zip_file, make_combo_list_with_default + from gtweak.gsettings import GSettingsSetting +@@ -184,6 +183,37 @@ class ShellThemeTweak(Tweak): + val = combo.get_model().get_value(combo.get_active_iter(), 0) + self._settings.set_string(ShellThemeTweak.THEME_GSETTINGS_NAME, val) + ++class StaticWorkspaceTweak(Tweak): ++ ++ NUM_WORKSPACES_SCHEMA = "org.gnome.desktop.wm.preferences" ++ NUM_WORKSPACES_KEY = "num-workspaces" ++ ++ DYNAMIC_SCHEMA = "org.gnome.shell.overrides" ++ DYNAMIC_KEY = "dynamic-workspaces" ++ ++ def __init__(self, **options): ++ Tweak.__init__(self, "Dynamic workspaces", "Disable gnome-shell dynamic workspace management, use static workspaces", **options) ++ ++ settings = GSettingsSetting(self.NUM_WORKSPACES_SCHEMA, **options) ++ adj = Gtk.Adjustment(1, 1, 99, 1) ++ sb = Gtk.SpinButton(adjustment=adj, digits=0) ++ settings.bind(self.NUM_WORKSPACES_KEY, adj, "value", Gio.SettingsBindFlags.DEFAULT) ++ ++ settings = GSettingsSetting(self.DYNAMIC_SCHEMA, **options) ++ sw = Gtk.Switch() ++ settings.bind(self.DYNAMIC_KEY, sw, "active", Gio.SettingsBindFlags.DEFAULT) ++ ++ #sw.bind_property ("active", sb, "sensitive", GObject.BindingFlags.SYNC_CREATE) ++ sb.set_sensitive(not settings[self.DYNAMIC_KEY]) ++ sw.connect('notify::active', lambda _sw,_param,_sb: _sb.set_sensitive(not _sw.get_active()), sb) ++ ++ hb = Gtk.HBox(spacing = 4) ++ hb.pack_start(sw, False, False, 0) ++ hb.pack_start(sb, True, True, 0) ++ ++ self.widget = build_label_beside_widget(self.name, hb) ++ self.widget_for_size_group = hb ++ + sg = build_horizontal_sizegroup() + + TWEAKS = ( +@@ -198,5 +228,6 @@ TWEAK_GROUPS = ( + GSettingsSwitchTweak("org.gnome.shell.calendar", "show-weekdate", schema_filename="org.gnome.shell.gschema.xml"), + ShowWindowButtons(schema_filename="org.gnome.shell.gschema.xml", size_group=sg), + GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-battery-action", size_group=sg), +- GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-ac-action", size_group=sg)), ++ GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-ac-action", size_group=sg), ++ StaticWorkspaceTweak(size_group=sg)), + ) +-- +1.7.8.6 + diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch new file mode 100644 index 000000000000..61a01833871f --- /dev/null +++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.3.4-text-scaling-factor-button.patch @@ -0,0 +1,61 @@ +From 89c320bbb9ec6cf1542c75e5c35c79e6604301b6 Mon Sep 17 00:00:00 2001 +From: Robin Stocker <robin@nibor.org> +Date: Tue, 17 Jan 2012 13:24:04 +0100 +Subject: [PATCH] Change widget for text-scaling-factor to SpinButton + +https://bugzilla.gnome.org/show_bug.cgi?id=650660 + +Conflicts: + + gtweak/tweaks/tweak_font.py +--- + gtweak/tweaks/tweak_font.py | 4 ++-- + gtweak/widgets.py | 15 +++++++++++++++ + 2 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/gtweak/tweaks/tweak_font.py b/gtweak/tweaks/tweak_font.py +index 7f4b92a..1ace035 100644 +--- a/gtweak/tweaks/tweak_font.py ++++ b/gtweak/tweaks/tweak_font.py +@@ -18,10 +18,10 @@ + from gi.repository import Gtk + + from gtweak.tweakmodel import Tweak, TWEAK_GROUP_FONTS +-from gtweak.widgets import GSettingsRangeTweak, GSettingsFontButtonTweak, GSettingsComboTweak ++from gtweak.widgets import GSettingsSpinButtonTweak, GSettingsFontButtonTweak, GSettingsComboTweak + + TWEAKS = ( +- GSettingsRangeTweak("org.gnome.desktop.interface", "text-scaling-factor", adjustment_step=0.1, group_name=TWEAK_GROUP_FONTS), ++ GSettingsSpinButtonTweak("org.gnome.desktop.interface", "text-scaling-factor", adjustment_step=0.1, digits=1, group_name=TWEAK_GROUP_FONTS), + GSettingsFontButtonTweak("org.gnome.desktop.interface", "font-name", group_name=TWEAK_GROUP_FONTS), + GSettingsFontButtonTweak("org.gnome.desktop.interface", "document-font-name", group_name=TWEAK_GROUP_FONTS), + GSettingsFontButtonTweak("org.gnome.desktop.interface", "monospace-font-name", group_name=TWEAK_GROUP_FONTS), +diff --git a/gtweak/widgets.py b/gtweak/widgets.py +index 9aa0cd2..4a7646f 100644 +--- a/gtweak/widgets.py ++++ b/gtweak/widgets.py +@@ -134,6 +134,21 @@ class GSettingsRangeTweak(_GSettingsTweak): + self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w) + self.widget_for_size_group = w + ++class GSettingsSpinButtonTweak(_GSettingsTweak): ++ def __init__(self, schema_name, key_name, **options): ++ _GSettingsTweak.__init__(self, schema_name, key_name, **options) ++ ++ #returned variant is range:(min, max) ++ _min, _max = self.settings.get_range(key_name)[1] ++ ++ adjustment = Gtk.Adjustment(0, _min, _max, options.get('adjustment_step', 1)) ++ w = Gtk.SpinButton() ++ w.set_adjustment(adjustment) ++ w.set_digits(options.get('digits', 0)) ++ self.settings.bind(key_name, adjustment, "value", Gio.SettingsBindFlags.DEFAULT) ++ self.widget = build_label_beside_widget(self.settings.schema_get_summary(key_name), w) ++ self.widget_for_size_group = w ++ + class GSettingsComboEnumTweak(_GSettingsTweak): + def __init__(self, schema_name, key_name, **options): + _GSettingsTweak.__init__(self, schema_name, key_name, **options) +-- +1.7.8.6 + diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2.ebuild deleted file mode 100644 index b66194a7e4f5..000000000000 --- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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.2.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $ - -EAPI="4" -GNOME2_LA_PUNT="yes" -GCONF_DEBUG="no" -PYTHON_DEPEND="2:2.6" - -inherit eutils gnome2 python - -DESCRIPTION="Tool to customize GNOME 3 options" -HOMEPAGE="http://live.gnome.org/GnomeTweakTool" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~x86" - -COMMON_DEPEND=" - >=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 -RDEPEND="${COMMON_DEPEND} - gnome-base/gconf:2[introspection] - x11-libs/gtk+:3[introspection] - - >=gnome-base/gnome-settings-daemon-3 - gnome-base/gnome-shell - >=gnome-base/nautilus-3 - x11-wm/metacity" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40.0 - virtual/pkgconfig - >=sys-devel/gettext-0.17" - -pkg_setup() { - DOCS="AUTHORS NEWS README" - G2CONF="${G2CONF} --disable-schemas-compile" - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # Add contents of Gentoo's cursor theme directory to cursor theme list - epatch "${FILESDIR}/${PN}-3.0.4-gentoo-cursor-themes.patch" - - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - python_convert_shebangs 2 "${ED}"/usr/bin/gnome-tweak-tool -} - -pkg_postinst() { - gnome2_pkg_postinst - python_mod_optimize gtweak -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup gtweak -} diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.3.4-r1.ebuild index 4b8ed925bde0..4fa0e7bbc9ce 100644 --- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r1.ebuild +++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.3.4-r1.ebuild @@ -1,6 +1,6 @@ # 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.2-r1.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.3.4-r1.ebuild,v 1.1 2012/05/14 00:07:40 tetromino Exp $ EAPI="4" GNOME2_LA_PUNT="yes" @@ -18,7 +18,7 @@ IUSE="" KEYWORDS="~amd64 ~x86" COMMON_DEPEND=" - >=gnome-base/gsettings-desktop-schemas-3 + >=gnome-base/gsettings-desktop-schemas-3.3.2 >=dev-python/pygobject-2.90.0:3 gnome-base/gconf:2" # g-s-d, gnome-shell etc. needed at runtime for the gsettings schemas @@ -32,8 +32,8 @@ RDEPEND="${COMMON_DEPEND} x11-wm/metacity" DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40.0 - virtual/pkgconfig - >=sys-devel/gettext-0.17" + >=sys-devel/gettext-0.17 + virtual/pkgconfig" pkg_setup() { DOCS="AUTHORS NEWS README" @@ -46,12 +46,13 @@ 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" + # Useful upstream patches + epatch "${FILESDIR}/${P}-text-scaling-factor-button.patch" + epatch "${FILESDIR}/${P}-missing-schemas.patch" + epatch "${FILESDIR}/${P}-static-workspaces.patch" + epatch "${FILESDIR}/${P}-shell-theme-schema.patch" - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile + python_clean_py-compile_files gnome2_src_prepare } |