This commit is contained in:
Andrea Azzarone
2018-08-09 13:56:31 +03:00
parent 33060c57bc
commit a3ad153e95
3 changed files with 8 additions and 51 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
gtk+3.0 (3.23.2-1) UNRELEASED; urgency=medium
* New upstream release
* debian/patches/0008-defaultvalue-Ignore-more-style-properties-that-Adwai.patch:
Drop, included in this release.
-- Andrea Azzarone <andrea.azzarone@canonical.com> Thu, 09 Aug 2018 13:53:21 +0300
gtk+3.0 (3.23.1-1) experimental; urgency=medium
* debian/{control{,.in},gbp.conf,watch}: Update for experimental

View File

@ -1,50 +0,0 @@
From: Iain Lane <iainl@gnome.org>
Date: Thu, 19 Jul 2018 15:45:48 +0100
Subject: defaultvalue: Ignore more style properties that Adwaita overrides
These broke once we switched away from Raleigh
Forwarded: https://gitlab.gnome.org/GNOME/gtk/merge_requests/253
---
testsuite/gtk/defaultvalue.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c
index b2a624f..d3afbb3 100644
--- a/testsuite/gtk/defaultvalue.c
+++ b/testsuite/gtk/defaultvalue.c
@@ -398,6 +398,34 @@ G_GNUC_END_IGNORE_DEPRECATIONS
strcmp (pspec->name, "button-spacing") == 0))
continue;
+ if (g_type_is_a (type, GTK_TYPE_SCROLLBAR) &&
+ (strcmp (pspec->name, "has-backward-stepper") == 0 ||
+ strcmp (pspec->name, "has-forward-stepper") == 0))
+ continue;
+
+ if (g_type_is_a (type, GTK_TYPE_SCROLLED_WINDOW) &&
+ strcmp (pspec->name, "scrollbar-spacing") == 0)
+ continue;
+
+ if (g_type_is_a (type, GTK_TYPE_TEXT_VIEW) &&
+ strcmp (pspec->name, "error-underline-color") == 0)
+ continue;
+
+ if (g_type_is_a (type, GTK_TYPE_TOOL_BUTTON) &&
+ strcmp (pspec->name, "icon-spacing") == 0)
+ continue;
+
+ if (g_type_is_a (type, GTK_TYPE_TOOL_ITEM_GROUP) &&
+ strcmp (pspec->name, "expander-size") == 0)
+ continue;
+
+ if (g_type_is_a (type, GTK_TYPE_TREE_VIEW) &&
+ (strcmp (pspec->name, "expander-size") == 0 ||
+ strcmp (pspec->name, "grid-line-pattern") == 0 ||
+ strcmp (pspec->name, "horizontal-separator") == 0 ||
+ strcmp (pspec->name, "tree-line-pattern") == 0))
+ continue;
+
/* This is desktop-dependent */
if (g_type_is_a (type, GTK_TYPE_WINDOW) &&
strcmp (pspec->name, "decoration-button-layout") == 0)

View File

@ -5,4 +5,3 @@
060_ignore-random-icons.patch
no-accessibility-dump.patch
reftest-known-fail.patch
0008-defaultvalue-Ignore-more-style-properties-that-Adwai.patch