diff --git a/0002-Drop-CI-test-setup-that-needs-catchsegv.patch b/0002-Drop-CI-test-setup-that-needs-catchsegv.patch new file mode 100644 index 0000000..fde5e29 --- /dev/null +++ b/0002-Drop-CI-test-setup-that-needs-catchsegv.patch @@ -0,0 +1,21 @@ +diff -Nur orig-mutter-41.3/meson.build mutter-41.3/meson.build +--- orig-mutter-41.3/meson.build 2022-02-08 10:46:01.196708089 +0100 ++++ mutter-41.3/meson.build 2022-02-08 10:46:22.448982100 +0100 +@@ -305,17 +305,6 @@ + exe_wrapper: default_test_wrappers, + ) + +- add_test_setup('CI', +- env: [ +- 'MUTTER_DEBUG_DUMMY_MODE_SPECS=800x600@10.0', +- ], +- exe_wrapper: [ +- default_test_wrappers, +- find_program('catchsegv'), +- find_program('xvfb-run'), '-a', '-s', '+iglx -noreset', +- ], +- timeout_multiplier: 10, +- ) + endif + + have_profiler = get_option('profiler') diff --git a/mutter.changes b/mutter.changes index e387639..e31fe7b 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 8 09:35:57 UTC 2022 - Bjørn Lie + +- Add 0002-Drop-CI-test-setup-that-needs-catchsegv.patch: Fix build + with glibc 2.35 and newer. + ------------------------------------------------------------------- Tue Jan 11 17:28:52 UTC 2022 - Bjørn Lie diff --git a/mutter.spec b/mutter.spec index 005b038..0c84317 100644 --- a/mutter.spec +++ b/mutter.spec @@ -39,6 +39,8 @@ Patch0: mutter-Lower-HIDPI_LIMIT-to-144.patch Patch1: mutter-disable-cvt-s390x.patch # PATCH-FIX-OPENSUSE mutter-window-actor-Special-case-shaped-Java-windows.patch -- window-actor: Special-case shaped Java windows Patch2: mutter-window-actor-Special-case-shaped-Java-windows.patch +# PATCH-FIX-OPENSUSE 0002-Drop-CI-test-setup-that-needs-catchsegv.patch -- Fix build with glibc 2.35 and newer +Patch3: 0002-Drop-CI-test-setup-that-needs-catchsegv.patch ## SLE-only patches start at 1000 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box. @@ -146,6 +148,7 @@ applications that want to make use of the mutter library. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # SLE-only patches and translations. %if 0%{?sle_version}