Cherry-pick test fix patch from upstream !253.

This commit is contained in:
Iain Lane
2018-07-19 16:35:22 +01:00
parent 5f584ffb95
commit 7754f69d31
3 changed files with 53 additions and 0 deletions

2
debian/changelog vendored
View File

@ -31,6 +31,8 @@ gtk+3.0 (3.23.1-1) UNRELEASED; urgency=medium
Drop - GTK now calls epoxy_has_glx() directly so this bypassed approach
isn't necessary.
* debian/libgail-3-0.symbols: New symbols for this release.
* debian/patches/0008-defaultvalue-Ignore-more-style-properties-that-Adwai.patch:
Cherry-pick test fix patch from upstream !253.
-- Iain Lane <laney@debian.org> Wed, 18 Jul 2018 14:08:52 +0100

View File

@ -0,0 +1,50 @@
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,3 +5,4 @@
060_ignore-random-icons.patch
no-accessibility-dump.patch
reftest-known-fail.patch
0008-defaultvalue-Ignore-more-style-properties-that-Adwai.patch