From 216aa1890bf47b602642a889e57411c0e5de9c90 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 23 Dec 2021 11:07:06 +0000 Subject: [PATCH] Do not install reftests --- gtk3-3.24.31-meson-reftest.patch | 53 ++++++++++++++++++++++++++++++++ gtk3.spec | 7 ++++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 gtk3-3.24.31-meson-reftest.patch diff --git a/gtk3-3.24.31-meson-reftest.patch b/gtk3-3.24.31-meson-reftest.patch new file mode 100644 index 0000000..16873e2 --- /dev/null +++ b/gtk3-3.24.31-meson-reftest.patch @@ -0,0 +1,53 @@ +From 7f295eeb324c3d793bdf302fa7ea9ebdd8a52bcf Mon Sep 17 00:00:00 2001 +From: David King +Date: Thu, 23 Dec 2021 10:53:57 +0000 +Subject: [PATCH] meson: Do not install reftests + +Match the testsuite in the main branch. +--- + testsuite/reftests/meson.build | 25 +------------------------ + 1 file changed, 1 insertion(+), 24 deletions(-) + +diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build +index b4bf6784cc..2135ebb434 100644 +--- a/testsuite/reftests/meson.build ++++ b/testsuite/reftests/meson.build +@@ -22,9 +22,7 @@ libreftest = shared_library('reftest', + + gtk_reftest = executable('gtk-reftest', 'gtk-reftest.c', + link_with : [libgtkreftestprivate, libreftest], +- dependencies : libgtk_dep, +- install: get_option('installed_tests'), +- install_dir: installed_test_bindir) ++ dependencies : libgtk_dep) + + test_data = [ + '721800-0px-dotted-border.css', +@@ -457,24 +455,3 @@ foreach testname : test_data + is_parallel: false) + endif + endforeach +- +-reftests_installed_tests = [ +- 'reftests-dark.test', +- 'reftests-hc.test', +- 'reftests-hci.test', +- 'reftests.test', +-] +- +-if get_option('installed_tests') +- test_cdata = configuration_data() +- test_cdata.set('libexecdir', gtk_libexecdir) +- +- foreach t: reftests_installed_tests +- configure_file(input: '@0@.in'.format(t), +- output: t, +- configuration: test_cdata, +- install_dir: installed_test_datadir) +- endforeach +- +- install_data(test_data, install_dir: testexecdir) +-endif +-- +2.33.1 + diff --git a/gtk3.spec b/gtk3.spec index 1fdd7ba..27c4709 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -19,7 +19,7 @@ Name: gtk3 Version: 3.24.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ graphical user interface library License: LGPLv2+ @@ -27,6 +27,8 @@ URL: https://gtk.org Source0: https://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4273 Patch0: gtk3-3.24.31-meson.patch +# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4280 +Patch1: gtk3-3.24.31-meson-reftest.patch BuildRequires: pkgconfig(atk) >= %{atk_version} BuildRequires: pkgconfig(atk-bridge-2.0) @@ -297,6 +299,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || : %{_datadir}/installed-tests/ %changelog +* Thu Dec 23 2021 David King - 3.24.31-2 +- Do not install reftests + * Tue Dec 21 2021 David King - 3.24.31-1 - Update to 3.24.31 - Switch to meson