From bb107265ef1c81fc5bfd53c8be92b8e314bf3fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 7 Mar 2022 17:06:57 +0100 Subject: [PATCH] Drop obsolete downstream patch --- ...p-CI-test-setup-that-needs-catchsegv.patch | 40 ------------------- mutter.spec | 5 --- 2 files changed, 45 deletions(-) delete mode 100644 0002-Drop-CI-test-setup-that-needs-catchsegv.patch diff --git a/0002-Drop-CI-test-setup-that-needs-catchsegv.patch b/0002-Drop-CI-test-setup-that-needs-catchsegv.patch deleted file mode 100644 index 4bc6a4d..0000000 --- a/0002-Drop-CI-test-setup-that-needs-catchsegv.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 103f2129530c1c4d4a1a99419005dcdd08d38748 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 26 Jan 2022 15:44:31 -0800 -Subject: [PATCH 2/2] Drop "CI" test setup that needs catchsegv - -glibc has dropped catchsegv: -https://sourceware.org/bugzilla/show_bug.cgi?id=14913 -so mutter no longer builds with recent glibc. - -Signed-off-by: Adam Williamson ---- - meson.build | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/meson.build b/meson.build -index 4f7f023043..2a963b3b37 100644 ---- a/meson.build -+++ b/meson.build -@@ -327,18 +327,6 @@ if have_tests - ) - - add_test_setup('plain') -- -- 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') --- -2.35.0.rc1 - diff --git a/mutter.spec b/mutter.spec index f76c2bc..3e9c59f 100644 --- a/mutter.spec +++ b/mutter.spec @@ -26,11 +26,6 @@ Patch1: 0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1936991 Patch2: mutter-42.alpha-disable-tegra.patch -# https://gitlab.gnome.org/GNOME/mutter/-/issues/2120 -# Fixes build with recent glibc. Upstream may not do exactly this but -# it's good enough for a package build -Patch3: 0002-Drop-CI-test-setup-that-needs-catchsegv.patch - BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.41.0 BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(libwacom)