diff options
Diffstat (limited to 'gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch')
| -rw-r--r-- | gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch new file mode 100644 index 000000000000..2c06408d1a33 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch @@ -0,0 +1,45 @@ +From 09d1f1a057268a6acdfb42e7dcb2843c0066f542 Mon Sep 17 00:00:00 2001 +From: Ole Reifschneider <tranquility@gentoo.org> +Date: Sat, 25 Apr 2015 22:22:09 +0200 +Subject: [PATCH 2/5] Make wayland support optional + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +--- + configure.ac | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 19096f5..140459c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -225,12 +225,21 @@ if test "x$have_udev" = xyes ; then + fi + AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"]) + +-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no) +-if test "x$have_wayland" = xyes ; then +- if test "x$have_udev" != xyes ; then +- AC_MSG_ERROR([udev is required for Wayland support]) +- fi +-fi ++AC_ARG_ENABLE( ++ [wayland], ++ AS_HELP_STRING([--disable-wayland], [disable wayland support]), ++ [], ++ enable_wayland=auto ++) ++ ++AS_IF([test "$enable_wayland" != "no"], ++ [ ++ AS_IF([test "x$have_udev" = xno], ++ [AC_MSG_ERROR([udev is required for Wayland support])], ++ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])]) ++ ++ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) ++]) + + PKG_CHECK_MODULES(NETWORK_MANAGER, + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION +-- +2.10.1 + |