[gnome-shell/f20] Fix wayland support
Florian Müllner
fmuellner at fedoraproject.org
Thu Nov 14 14:04:24 UTC 2013
commit de3828617e2ca536888a8c58371f38153d948cef
Author: Florian Müllner <fmuellner at gnome.org>
Date: Thu Nov 14 13:50:46 2013 +0000
Fix wayland support
We don't have a 3.10.2 release for mutter-wayland, so the configure
check will always fail; to fix, lower the mutter requrirement to the
last stable version (which is fully API/ABI compatible anyway).
0001-build-Lower-mutter-requirement.patch | 27 +++++++++++++++++++++++++++
gnome-shell.spec | 5 +++++
2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/0001-build-Lower-mutter-requirement.patch b/0001-build-Lower-mutter-requirement.patch
new file mode 100644
index 0000000..c72ff7e
--- /dev/null
+++ b/0001-build-Lower-mutter-requirement.patch
@@ -0,0 +1,27 @@
+From beeb42925e94f6976d4f04dd4c54fe8a61f564ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Thu, 14 Nov 2013 13:48:18 +0000
+Subject: [PATCH] build: Lower mutter requirement
+
+We don't have a mutter-wayland release for 3.10, so lower the
+requirement to not end up without wayland support.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c451c46..b4379ed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,7 +60,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
+ CLUTTER_MIN_VERSION=1.13.4
+ GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
+ GJS_MIN_VERSION=1.38.1
+-MUTTER_MIN_VERSION=3.10.2
++MUTTER_MIN_VERSION=3.10.1
+ GTK_MIN_VERSION=3.7.9
+ GIO_MIN_VERSION=2.37.0
+ LIBECAL_MIN_VERSION=3.5.3
+--
+1.8.4.2
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index ddef5be..27629c3 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -13,6 +13,8 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.10/%{name}-%{ver
# Replace Epiphany with Firefox in the default favourite apps list
Patch1: gnome-shell-favourite-apps-firefox.patch
+Patch10: 0001-build-Lower-mutter-requirement.patch
+
%define clutter_version 1.13.4
%define gnome_bluetooth_version 1:3.9.0
%define gobject_introspection_version 0.10.1
@@ -116,6 +118,8 @@ easy to use experience.
%setup -q
%patch1 -p1 -b .firefox
+%patch10 -p1 -b .fix-wayland-build
+
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
%configure --disable-static --disable-compile-warnings)
@@ -176,6 +180,7 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
%changelog
* Thu Nov 14 2013 Florian Müllner <fmuellner at redhat.com> - 3.10.2-1
- Update to 3.10.2
+- Include downstream patch to fix wayland build
* Wed Oct 30 2013 Florian Müllner <fmuellner at redhat.com> - 3.10.1-2
- Backport upstream patch to fix user list overflow on login screen
More information about the scm-commits
mailing list