r54785 - in /packages/unstable/gnome-tweak-tool/debian: ./ patches/
jbicha at users.alioth.debian.org
jbicha at users.alioth.debian.org
Wed Nov 8 20:25:48 UTC 2017
Author: jbicha
Date: Wed Nov 8 20:25:47 2017
New Revision: 54785
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54785
Log:
Cherry-pick patches from gnome-3-26 branch to improve Theme tweaks
Added:
packages/unstable/gnome-tweak-tool/debian/patches/0001-appearance-Stop-requiring-gtk2-version-of-theme.patch
packages/unstable/gnome-tweak-tool/debian/patches/0002-appearance-Don-t-duplicate-the-theme-name.patch
packages/unstable/gnome-tweak-tool/debian/patches/0003-appearance-Always-offer-Adwaita-and-High-Contrast-GT.patch
packages/unstable/gnome-tweak-tool/debian/patches/0004-appearance-Don-t-duplicate-the-GNOME-Shell-theme-nam.patch
packages/unstable/gnome-tweak-tool/debian/patches/0005-appearance-Always-offer-HighContrastInverse.patch
Modified:
packages/unstable/gnome-tweak-tool/debian/changelog
packages/unstable/gnome-tweak-tool/debian/patches/series
Modified: packages/unstable/gnome-tweak-tool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-tweak-tool/debian/changelog?rev=54785&op=diff
==============================================================================
--- packages/unstable/gnome-tweak-tool/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-tweak-tool/debian/changelog [utf-8] Wed Nov 8 20:25:47 2017
@@ -1,6 +1,15 @@
gnome-tweak-tool (3.26.3-1) UNRELEASED; urgency=medium
- * New upstream release
+ [ Michael Biebl ]
+ * New upstream release (LP: #1728755)
+
+ [ Jeremy Bicha ]
+ * Cherry-pick patches from gnome-3-26 branch to improve Theme tweaks:
+ - 0001-appearance-Stop-requiring-gtk2-version-of-theme.patch
+ - 0002-appearance-Don-t-duplicate-the-theme-name.patch
+ - 0003-appearance-Always-offer-Adwaita-and-High-Contrast-GT.patch
+ - 0004-appearance-Don-t-duplicate-the-GNOME-Shell-theme-nam.patch
+ - 0005-appearance-Always-offer-HighContrastInverse.patch
-- Michael Biebl <biebl at debian.org> Tue, 31 Oct 2017 13:19:45 +0100
Added: packages/unstable/gnome-tweak-tool/debian/patches/0001-appearance-Stop-requiring-gtk2-version-of-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-tweak-tool/debian/patches/0001-appearance-Stop-requiring-gtk2-version-of-theme.patch?rev=54785&op=file
==============================================================================
--- packages/unstable/gnome-tweak-tool/debian/patches/0001-appearance-Stop-requiring-gtk2-version-of-theme.patch (added)
+++ packages/unstable/gnome-tweak-tool/debian/patches/0001-appearance-Stop-requiring-gtk2-version-of-theme.patch [utf-8] Wed Nov 8 20:25:47 2017
@@ -0,0 +1,38 @@
+From b94dcd8f7827be56670ad343bde80aba3b5afee3 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Fri, 3 Nov 2017 14:39:49 -0400
+Subject: [PATCH 1/5] appearance: Stop requiring gtk2 version of theme
+
+Since it's easily possible to not use gtk2 apps any more
+---
+ gtweak/tweaks/tweak_group_appearance.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
+index ccadefc..67bada6 100644
+--- a/gtweak/tweaks/tweak_group_appearance.py
++++ b/gtweak/tweaks/tweak_group_appearance.py
+@@ -45,7 +45,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
+ **options)
+
+ def _get_valid_themes(self):
+- """ Only shows themes that have variations for gtk+-3 and gtk+-2 """
++ """ Only shows themes that have variations for gtk3"""
+ gtk_ver = Gtk.MINOR_VERSION
+ if gtk_ver % 2: # Want even number
+ gtk_ver += 1
+@@ -54,9 +54,8 @@ class GtkThemeSwitcher(GSettingsComboTweak):
+ os.path.join(GLib.get_user_data_dir(), "themes"),
+ os.path.join(os.path.expanduser("~"), ".themes"))
+ valid = walk_directories(dirs, lambda d:
+- os.path.exists(os.path.join(d, "gtk-2.0")) and \
+- (os.path.exists(os.path.join(d, "gtk-3.0")) or \
+- os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
++ os.path.exists(os.path.join(d, "gtk-3.0", "gtk.css")) or \
++ os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))
+ return valid
+
+ class IconThemeSwitcher(GSettingsComboTweak):
+--
+2.14.1
+
Added: packages/unstable/gnome-tweak-tool/debian/patches/0002-appearance-Don-t-duplicate-the-theme-name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-tweak-tool/debian/patches/0002-appearance-Don-t-duplicate-the-theme-name.patch?rev=54785&op=file
==============================================================================
--- packages/unstable/gnome-tweak-tool/debian/patches/0002-appearance-Don-t-duplicate-the-theme-name.patch (added)
+++ packages/unstable/gnome-tweak-tool/debian/patches/0002-appearance-Don-t-duplicate-the-theme-name.patch [utf-8] Wed Nov 8 20:25:47 2017
@@ -0,0 +1,37 @@
+From 9349e9b3a3b9410ebb60edf9f2e5beccabb40275 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Fri, 3 Nov 2017 14:41:30 -0400
+Subject: [PATCH 2/5] appearance: Don't duplicate the theme name
+
+A theme name should not be listed more than once
+
+https://bugzilla.gnome.org/show_bug.cgi?id=762789
+---
+ gtweak/tweaks/tweak_group_appearance.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
+index 67bada6..483d028 100644
+--- a/gtweak/tweaks/tweak_group_appearance.py
++++ b/gtweak/tweaks/tweak_group_appearance.py
+@@ -56,7 +56,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
+ valid = walk_directories(dirs, lambda d:
+ os.path.exists(os.path.join(d, "gtk-3.0", "gtk.css")) or \
+ os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))
+- return valid
++ return set(valid)
+
+ class IconThemeSwitcher(GSettingsComboTweak):
+ def __init__(self, **options):
+@@ -74,7 +74,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
+ valid = walk_directories(dirs, lambda d:
+ os.path.isdir(d) and \
+ os.path.exists(os.path.join(d, "index.theme")))
+- return valid
++ return set(valid)
+
+ class CursorThemeSwitcher(GSettingsComboTweak):
+ def __init__(self, **options):
+--
+2.14.1
+
Added: packages/unstable/gnome-tweak-tool/debian/patches/0003-appearance-Always-offer-Adwaita-and-High-Contrast-GT.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-tweak-tool/debian/patches/0003-appearance-Always-offer-Adwaita-and-High-Contrast-GT.patch?rev=54785&op=file
==============================================================================
--- packages/unstable/gnome-tweak-tool/debian/patches/0003-appearance-Always-offer-Adwaita-and-High-Contrast-GT.patch (added)
+++ packages/unstable/gnome-tweak-tool/debian/patches/0003-appearance-Always-offer-Adwaita-and-High-Contrast-GT.patch [utf-8] Wed Nov 8 20:25:47 2017
@@ -0,0 +1,28 @@
+From 8a6bfd64a6c5c1ee7ef2bb847e9e5d6804662267 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Fri, 3 Nov 2017 14:42:13 -0400
+Subject: [PATCH 3/5] appearance: Always offer Adwaita and High Contrast GTK+
+ themes
+
+since they're built into GTK+ 3
+---
+ gtweak/tweaks/tweak_group_appearance.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
+index 483d028..84dd120 100644
+--- a/gtweak/tweaks/tweak_group_appearance.py
++++ b/gtweak/tweaks/tweak_group_appearance.py
+@@ -53,7 +53,8 @@ class GtkThemeSwitcher(GSettingsComboTweak):
+ dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
+ os.path.join(GLib.get_user_data_dir(), "themes"),
+ os.path.join(os.path.expanduser("~"), ".themes"))
+- valid = walk_directories(dirs, lambda d:
++ valid = ['Adwaita', 'HighContrast']
++ valid += walk_directories(dirs, lambda d:
+ os.path.exists(os.path.join(d, "gtk-3.0", "gtk.css")) or \
+ os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))
+ return set(valid)
+--
+2.14.1
+
Added: packages/unstable/gnome-tweak-tool/debian/patches/0004-appearance-Don-t-duplicate-the-GNOME-Shell-theme-nam.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-tweak-tool/debian/patches/0004-appearance-Don-t-duplicate-the-GNOME-Shell-theme-nam.patch?rev=54785&op=file
==============================================================================
--- packages/unstable/gnome-tweak-tool/debian/patches/0004-appearance-Don-t-duplicate-the-GNOME-Shell-theme-nam.patch (added)
+++ packages/unstable/gnome-tweak-tool/debian/patches/0004-appearance-Don-t-duplicate-the-GNOME-Shell-theme-nam.patch [utf-8] Wed Nov 8 20:25:47 2017
@@ -0,0 +1,25 @@
+From e6bb8b8ab07e2b627db9f9c8fc15c3f32ee244a9 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Sat, 4 Nov 2017 12:31:59 -0400
+Subject: [PATCH 4/5] appearance: Don't duplicate the GNOME Shell theme name
+
+https://bugzilla.gnome.org/show_bug.cgi?id=762789
+---
+ gtweak/tweaks/tweak_group_appearance.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
+index 84dd120..4358f37 100644
+--- a/gtweak/tweaks/tweak_group_appearance.py
++++ b/gtweak/tweaks/tweak_group_appearance.py
+@@ -164,6 +164,7 @@ class ShellThemeTweak(Gtk.Box, Tweak):
+ os.path.exists(os.path.join(d, "gnome-shell", "gnome-shell.css")))
+ #the default value to reset the shell is an empty string
+ valid.extend( ("",) )
++ valid = set(valid)
+
+ #build a combo box with all the valid theme options
+ #manually add Adwaita to represent the default
+--
+2.14.1
+
Added: packages/unstable/gnome-tweak-tool/debian/patches/0005-appearance-Always-offer-HighContrastInverse.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-tweak-tool/debian/patches/0005-appearance-Always-offer-HighContrastInverse.patch?rev=54785&op=file
==============================================================================
--- packages/unstable/gnome-tweak-tool/debian/patches/0005-appearance-Always-offer-HighContrastInverse.patch (added)
+++ packages/unstable/gnome-tweak-tool/debian/patches/0005-appearance-Always-offer-HighContrastInverse.patch [utf-8] Wed Nov 8 20:25:47 2017
@@ -0,0 +1,30 @@
+From a0ebb77c60f0237589a669df087101a3476b304a Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Sun, 5 Nov 2017 07:47:38 -0500
+Subject: [PATCH 5/5] appearance: Always offer HighContrastInverse
+
+since it's also built into GTK+ 3.
+
+Note that there is no longer a GTK+ 2 version of this theme!
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788690
+---
+ gtweak/tweaks/tweak_group_appearance.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
+index 4358f37..05d13e9 100644
+--- a/gtweak/tweaks/tweak_group_appearance.py
++++ b/gtweak/tweaks/tweak_group_appearance.py
+@@ -53,7 +53,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
+ dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
+ os.path.join(GLib.get_user_data_dir(), "themes"),
+ os.path.join(os.path.expanduser("~"), ".themes"))
+- valid = ['Adwaita', 'HighContrast']
++ valid = ['Adwaita', 'HighContrast', 'HighContrastInverse']
+ valid += walk_directories(dirs, lambda d:
+ os.path.exists(os.path.join(d, "gtk-3.0", "gtk.css")) or \
+ os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))
+--
+2.14.1
+
Modified: packages/unstable/gnome-tweak-tool/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-tweak-tool/debian/patches/series?rev=54785&op=diff
==============================================================================
--- packages/unstable/gnome-tweak-tool/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-tweak-tool/debian/patches/series [utf-8] Wed Nov 8 20:25:47 2017
@@ -1,2 +1,7 @@
01_menu_category.patch
fix-defs.patch
+0001-appearance-Stop-requiring-gtk2-version-of-theme.patch
+0002-appearance-Don-t-duplicate-the-theme-name.patch
+0003-appearance-Always-offer-Adwaita-and-High-Contrast-GT.patch
+0004-appearance-Don-t-duplicate-the-GNOME-Shell-theme-nam.patch
+0005-appearance-Always-offer-HighContrastInverse.patch
More information about the pkg-gnome-commits
mailing list