diff --git a/debian/changelog b/debian/changelog index 96c8dc90e6..1f4b955413 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +gtk+3.0 (3.20.0-1) experimental; urgency=medium + + * New upstream release. + * Make testsuite fatal again. + * Add debian/patches/git_a11y_GTK_CSD_distcheck.patch + - cherry-pick commit from upstream to use client-side decorations + for a11y tests when running under distcheck. + * Drop debian/patches/reftest-known-fail.patch + * Stop tagging reftests as known fail since they should be fixed now: + - style-properties-nth-child.ui + - label-text-shadow-changes-modify-clip.ui + * Add debian/patches/no-accessibility-dump.patch + - skip this test until someone figures out how to reliably run it + always with CSD enabled, to match testsuite expected data. + + -- Andreas Henriksson Wed, 23 Mar 2016 14:10:27 +0100 + gtk+3.0 (3.19.12-1) experimental; urgency=medium * New upstream development release+snapshot. diff --git a/debian/control b/debian/control index 696770ffaa..36068dfa32 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gtk+3.0 Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Iain Lane , Michael Biebl +Uploaders: Andreas Henriksson , Iain Lane , Michael Biebl Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93), gnome-pkg-tools (>= 0.11), @@ -23,7 +23,10 @@ Build-Depends: debhelper (>= 8.1.3), libatk-bridge2.0-dev, libegl1-mesa-dev [linux-any], libepoxy-dev, - libwayland-dev (>= 1.5.91) [linux-any], + libharfbuzz-dev (>= 0.9), + libpango1.0-dev, + libwayland-dev (>= 1.9.91) [linux-any], + wayland-protocols (>= 1.1) [linux-any], libxkbcommon-dev (>= 0.2.0), libx11-dev (>= 2:1.3.3-2), libxext-dev (>= 2:1.1.1-3), @@ -148,6 +151,8 @@ Depends: libgtk-3-0 (= ${binary:Version}), libatk-bridge2.0-dev, libcairo2-dev (>= 1.14.0), libepoxy-dev (>= 1.0), + libharfbuzz-dev (>= 0.9), + libpango1.0-dev, libx11-dev, libxext-dev, libxinerama-dev, @@ -159,7 +164,8 @@ Depends: libgtk-3-0 (= ${binary:Version}), libxdamage-dev, pkg-config, libegl1-mesa-dev [linux-any], - libwayland-dev (>= 1.5.91) [linux-any], + libwayland-dev (>= 1.9.91) [linux-any], + wayland-protocols (>= 1.1) [linux-any], libxkbcommon-dev Suggests: libgtk-3-doc Description: development files for the GTK+ library diff --git a/debian/patches/git_a11y_GTK_CSD_distcheck.patch b/debian/patches/git_a11y_GTK_CSD_distcheck.patch new file mode 100644 index 0000000000..c533506d2e --- /dev/null +++ b/debian/patches/git_a11y_GTK_CSD_distcheck.patch @@ -0,0 +1,26 @@ +From d6ca66b712bcd2810498aec560cd01e42880f647 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Tue, 22 Mar 2016 14:55:55 -0400 +Subject: Run a11y tests with csd for make check + +I've made this change for installed tests a while ago. It doesn't +make sense for distcheck to do it differently. +--- + testsuite/a11y/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am +index 1d9fc05..9fd1fc0 100644 +--- a/testsuite/a11y/Makefile.am ++++ b/testsuite/a11y/Makefile.am +@@ -25,6 +25,7 @@ LDADD = \ + TESTS_ENVIRONMENT = \ + GIO_USE_VOLUME_MONITOR=unix \ + GSETTINGS_BACKEND=memory \ ++ GTK_CSD=1 \ + G_ENABLE_DIAGNOSTIC=0 + + TEST_PROGS += accessibility-dump +-- +cgit v0.12 + diff --git a/debian/patches/no-accessibility-dump.patch b/debian/patches/no-accessibility-dump.patch new file mode 100644 index 0000000000..9bdc4e58b2 --- /dev/null +++ b/debian/patches/no-accessibility-dump.patch @@ -0,0 +1,19 @@ +From: Andreas Henriksson +Subject: disable a11y test accessibility-dump + +Temporarily disable this test until someone figures out how +to make it run with GTK_CSD=1 properly so it gives output +matching the expected test data in all cases, not just +for installed-tests. + +--- a/testsuite/a11y/Makefile.am ++++ b/testsuite/a11y/Makefile.am +@@ -28,7 +28,7 @@ + GTK_CSD=1 \ + G_ENABLE_DIAGNOSTIC=0 + +-TEST_PROGS += accessibility-dump ++#TEST_PROGS += accessibility-dump + + TEST_PROGS += tree-performance + diff --git a/debian/patches/reftest-known-fail.patch b/debian/patches/reftest-known-fail.patch deleted file mode 100644 index c0245a2126..0000000000 --- a/debian/patches/reftest-known-fail.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/testsuite/reftests/gtk-reftest.c -+++ b/testsuite/reftests/gtk-reftest.c -@@ -247,6 +247,20 @@ - g_free (filename); - } - -+static gboolean -+known_fail(const char *test_name) -+{ -+ char *filename = get_test_file (test_name, ".ui.known_fail", TRUE); -+ -+ if (filename) -+ { -+ g_free (filename); -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ - static void - test_ui_file (GFile *file) - { -@@ -279,7 +293,13 @@ - if (diff_image) - { - save_image (diff_image, ui_file, ".diff.png"); -- g_test_fail (); -+ if (known_fail(ui_file)) -+ { -+ printf("KNOWN FAILURE - %s\n", ui_file); -+ g_test_message ("KNOWN FAIL: %s", ui_file); -+ } -+ else -+ g_test_fail (); - } - - remove_extra_css (provider); diff --git a/debian/patches/series b/debian/patches/series index 0d085ed9fb..ad41ac6c06 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,5 @@ 032_mips_treeview_row_separator_height.patch 060_ignore-random-icons.patch 071_fix-installation-of-HTML-images.patch -reftest-known-fail.patch +git_a11y_GTK_CSD_distcheck.patch +no-accessibility-dump.patch diff --git a/debian/rules b/debian/rules index 52f3e81330..93827a503a 100644 --- a/debian/rules +++ b/debian/rules @@ -111,7 +111,7 @@ export XDG_DATA_DIRS=/usr/share:$(CURDIR)/debian/build # Get failing tests' stdout/err so we have some information when a build fails export VERBOSE=1 -DEB_MAKE_CHECK_TARGET = -k check || true +DEB_MAKE_CHECK_TARGET = -k check DEB_INSTALL_DOCS_ALL = AUTHORS DEB_INSTALL_DOCS_$(COMMON_PKG) = README NEWS DEB_INSTALL_DOCS_$(DOC_PKG) += -X.in @@ -155,13 +155,9 @@ clean:: debian/control # gross kludge to force control generation with the %.in target touch debian/control.in rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES)) - rm -f testsuite/reftests/*.ui.known_fail rm -rf debian/build debian/install pre-build:: - # Mark reftests with known failures as non-fatal - touch testsuite/reftests/style-properties-nth-child.ui.known_fail - touch testsuite/reftests/label-text-shadow-changes-modify-clip.ui.known_fail # So that gsettings can find the (uninstalled) gtk schemas mkdir -p debian/build/glib-2.0/schemas/ cp gtk/org.gtk.* debian/build/glib-2.0/schemas/