From 54b4e6a296e1e043fd8427e111c061d242fe70c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 17 Nov 2020 14:37:56 +0100 Subject: [PATCH] Make s390x builds pass --- ...not-provide-built-sources-as-libmutt.patch | 26 +++++++++++++++++++ mutter.spec | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch diff --git a/0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch b/0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch new file mode 100644 index 0000000..bd18e8a --- /dev/null +++ b/0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch @@ -0,0 +1,26 @@ +From 3899a01cd6cb00ca686946d3065d58f59f5c2099 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Tue, 17 Nov 2020 14:00:02 +0100 +Subject: [PATCH] Revert "build: Do not provide built sources as libmutter_dep + sources" + +This reverts commit 4e9a2e479969973bf3063c740ceff149036b3af4. +--- + src/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meson.build b/src/meson.build +index e7c99caee..8fe484ec2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -955,6 +955,7 @@ libmutter = shared_library(libmutter_name, + libmutter_dep = declare_dependency( + link_with: libmutter, + include_directories: mutter_includes, ++ sources: mutter_built_sources, + dependencies: [ + libmutter_cogl_dep, + libmutter_clutter_dep, +-- +2.28.0 + diff --git a/mutter.spec b/mutter.spec index 8d77751..8589637 100644 --- a/mutter.spec +++ b/mutter.spec @@ -19,6 +19,9 @@ Source0: http://download.gnome.org/sources/%{name}/40/%{name}-40.beta.tar. # Work-around for OpenJDK's compliance test Patch0: 0001-window-actor-Special-case-shaped-Java-windows.patch +# To make s390x build pass +Patch1: 0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch + BuildRequires: chrpath BuildRequires: pango-devel BuildRequires: startup-notification-devel