Drop obsolete downstream patch
This commit is contained in:
parent
aa0d64459d
commit
bb107265ef
@ -1,40 +0,0 @@
|
|||||||
From 103f2129530c1c4d4a1a99419005dcdd08d38748 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Williamson <awilliam@redhat.com>
|
|
||||||
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 <awilliam@redhat.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
@ -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
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1936991
|
||||||
Patch2: mutter-42.alpha-disable-tegra.patch
|
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(gobject-introspection-1.0) >= 1.41.0
|
||||||
BuildRequires: pkgconfig(sm)
|
BuildRequires: pkgconfig(sm)
|
||||||
BuildRequires: pkgconfig(libwacom)
|
BuildRequires: pkgconfig(libwacom)
|
||||||
|
Loading…
Reference in New Issue
Block a user