[arch-commits] Commit in gnome-tweak-tool/trunk (PKGBUILD schema-crash.patch)

2012-05-15 Thread Jan Steffens 
Date: Tuesday, May 15, 2012 @ 06:38:09
  Author: heftig
Revision: 159027

3.4.0.1

Modified:
  gnome-tweak-tool/trunk/PKGBUILD
Deleted:
  gnome-tweak-tool/trunk/schema-crash.patch

+
 PKGBUILD   |   14 +--
 schema-crash.patch |  225 ---
 2 files changed, 5 insertions(+), 234 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-15 10:34:53 UTC (rev 159026)
+++ PKGBUILD2012-05-15 10:38:09 UTC (rev 159027)
@@ -2,24 +2,20 @@
 # Maintainer: Ionut Biru ib...@archlinux.org
 
 pkgname=gnome-tweak-tool
-pkgver=3.3.4
-pkgrel=2
+pkgver=3.4.0.1
+pkgrel=1
 pkgdesc=A tool to customize advanced GNOME 3 options.
 arch=(any)
 url=https://live.gnome.org/GnomeTweakTool;
 license=('GPL')
-depends=('gnome-settings-daemon' 'python2-gobject')
+depends=('gnome-settings-daemon' 'python2-gobject' 'gconf')
 makedepends=('intltool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-schema-crash.patch)
-sha256sums=('de18bf67e44af1b6757cf8e3a78c480b84286658be3d5d9ba7c13f5c49763dc6'
-'32add78601b30a93a4bd753f6a3bb99927f5ae8a68c94c0f75a0f3497e7032df')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('b060840fdf1e97c943e20e390acd25186fa3ce4ec5cddf044d1944e148d4ebd6')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -p1 -i ../schema-crash.patch
-
   ./configure --prefix=/usr
   make
 }

Deleted: schema-crash.patch
===
--- schema-crash.patch  2012-05-15 10:34:53 UTC (rev 159026)
+++ schema-crash.patch  2012-05-15 10:38:09 UTC (rev 159027)
@@ -1,225 +0,0 @@
-From 89c320bbb9ec6cf1542c75e5c35c79e6604301b6 Mon Sep 17 00:00:00 2001
-From: Robin Stocker ro...@nibor.org
-Date: Tue, 17 Jan 2012 12:24:04 +
-Subject: Change widget for text-scaling-factor to SpinButton
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650660
-
-Conflicts:
-
-   gtweak/tweaks/tweak_font.py

-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)
---
-cgit v0.9.0.2
-
-From 81ee17f1b0352347b1bf5f2bdad25e0fc2c7c3eb Mon Sep 17 00:00:00 2001
-From: John Stowers john.stow...@gmail.com
-Date: Wed, 18 Jan 2012 08:10:45 +
-Subject: Dont crash on missing schemas
-

-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())
-+

[arch-commits] Commit in gnome-tweak-tool/trunk (PKGBUILD schema-crash.patch)

2012-03-14 Thread Jan Steffens 
Date: Wednesday, March 14, 2012 @ 10:09:19
  Author: heftig
Revision: 153447

add patch against crash when user-themes extension is installed

Added:
  gnome-tweak-tool/trunk/schema-crash.patch
Modified:
  gnome-tweak-tool/trunk/PKGBUILD

+
 PKGBUILD   |   10 +-
 schema-crash.patch |  225 +++
 2 files changed, 232 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-14 12:10:51 UTC (rev 153446)
+++ PKGBUILD2012-03-14 14:09:19 UTC (rev 153447)
@@ -3,19 +3,23 @@
 
 pkgname=gnome-tweak-tool
 pkgver=3.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc=A tool to customize advanced GNOME 3 options.
 arch=(any)
 url=https://live.gnome.org/GnomeTweakTool;
 license=('GPL')
 depends=('gnome-settings-daemon' 'python2-gobject')
 makedepends=('intltool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('de18bf67e44af1b6757cf8e3a78c480b84286658be3d5d9ba7c13f5c49763dc6')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+schema-crash.patch)
+sha256sums=('de18bf67e44af1b6757cf8e3a78c480b84286658be3d5d9ba7c13f5c49763dc6'
+'32add78601b30a93a4bd753f6a3bb99927f5ae8a68c94c0f75a0f3497e7032df')
 
 build() {
   cd $pkgname-$pkgver
 
+  patch -p1 -i ../schema-crash.patch
+
   ./configure --prefix=/usr
   make
 }

Added: schema-crash.patch
===
--- schema-crash.patch  (rev 0)
+++ schema-crash.patch  2012-03-14 14:09:19 UTC (rev 153447)
@@ -0,0 +1,225 @@
+From 89c320bbb9ec6cf1542c75e5c35c79e6604301b6 Mon Sep 17 00:00:00 2001
+From: Robin Stocker ro...@nibor.org
+Date: Tue, 17 Jan 2012 12:24:04 +
+Subject: Change widget for text-scaling-factor to SpinButton
+
+https://bugzilla.gnome.org/show_bug.cgi?id=650660
+
+Conflicts:
+
+   gtweak/tweaks/tweak_font.py
+---
+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)
+--
+cgit v0.9.0.2
+
+From 81ee17f1b0352347b1bf5f2bdad25e0fc2c7c3eb Mon Sep 17 00:00:00 2001
+From: John Stowers john.stow...@gmail.com
+Date: Wed, 18 Jan 2012 08:10:45 +
+Subject: Dont crash on missing schemas
+
+---
+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