diff options
Diffstat (limited to 'desktop/mutter')
| -rw-r--r-- | desktop/mutter/2294.patch | 32 | ||||
| -rw-r--r-- | desktop/mutter/mutter.SlackBuild | 12 | ||||
| -rw-r--r-- | desktop/mutter/mutter.info | 2 |
3 files changed, 43 insertions, 3 deletions
diff --git a/desktop/mutter/2294.patch b/desktop/mutter/2294.patch new file mode 100644 index 0000000000..b69a8c329e --- /dev/null +++ b/desktop/mutter/2294.patch @@ -0,0 +1,32 @@ +From 4d94d5ec410714f51ffc4cd5e7c9ded0b2f66e16 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho <carlosg@gnome.org> +Date: Tue, 15 Feb 2022 15:47:19 +0100 +Subject: [PATCH] build: Drop catchsegv Meson dependency + +This is basically mostly desirable for CI. Since that still +runs under .gitlab-ci/run-test.sh which wraps execution on +catchsegv, we presumably still have the positive effects there, +or at least until we update CI to a world where catchsegv is +gone. + +Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2120 +Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2294> +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2f7e40c6bc..faa38a84fc 100644 +--- a/meson.build ++++ b/meson.build +@@ -338,7 +338,6 @@ if have_tests + ], + exe_wrapper: [ + default_test_wrappers, +- find_program('catchsegv'), + find_program('xvfb-run'), '-a', '-s', '+iglx -noreset', + ], + timeout_multiplier: 10, +-- +GitLab + diff --git a/desktop/mutter/mutter.SlackBuild b/desktop/mutter/mutter.SlackBuild index ac89da086a..1ec4f377d4 100644 --- a/desktop/mutter/mutter.SlackBuild +++ b/desktop/mutter/mutter.SlackBuild @@ -21,12 +21,15 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Modified May 9, 2024 - Disable building tests to drop the +# xvfb-run dependency. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mutter VERSION=${VERSION:-41.9} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,6 +79,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch to remove catchsegv dependency from meson.build, which has been +# removed in newer glibc releases (i.e. allows building on -current). +patch -Np1 -i $CWD/2294.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ @@ -90,7 +97,8 @@ cd build --sysconfdir=/etc \ -Dstrip=true \ -Dprofiler=false \ - -Dsystemd=false + -Dsystemd=false \ + -Dtests=false "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. diff --git a/desktop/mutter/mutter.info b/desktop/mutter/mutter.info index d804b8f983..2fbecac9dd 100644 --- a/desktop/mutter/mutter.info +++ b/desktop/mutter/mutter.info @@ -5,6 +5,6 @@ DOWNLOAD="https://download.gnome.org/sources/mutter/41/mutter-41.9.tar.xz" MD5SUM="450ca77637be962cb8bd35bd1c3dec98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gnome-settings-daemon xvfb-run" +REQUIRES="gnome-settings-daemon" MAINTAINER="Bob Funk" EMAIL="bobfunk11@gmail.com" |