gnome-base/gnome-control-center: fix non-wayland build against gtk+[wayland]

Closes: https://bugs.gentoo.org/674684
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
new file mode 100644 (file)
index 0000000..92f4d4b
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
@@ -0,0 +1,30 @@
+From 62f07b2c6d8a28378e1f2c9f5d0c3241332ee8cf Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Wed, 17 Jan 2018 20:05:03 -0200
+Subject: [PATCH] common: Don't unconditionally define HAVE_WAYLAND
+
+This header unconditionally defines HAVE_WAYLAND when GTK
+is built with Wayland support. This breaks the build when
+building with Wayland disabled.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=785414
+---
+ panels/common/gnome-settings-bus.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/panels/common/gnome-settings-bus.h b/panels/common/gnome-settings-bus.h
+index ce58f5805..763a9cca7 100644
+--- a/panels/common/gnome-settings-bus.h
++++ b/panels/common/gnome-settings-bus.h
+@@ -5,8 +5,6 @@
+ 
+ #ifdef GDK_WINDOWING_WAYLAND
+ 
+-#define HAVE_WAYLAND 1
+-
+ static inline gboolean
+ gnome_settings_is_wayland (void)
+ {
+-- 
+2.17.0
+

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
index ff36d5d2a6b7898f3f34770d065185008ac29464..5e554968fdb1ae26bade07f074e0eee65223e9fe 100644 (file)
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
        # https://bugzilla.gnome.org/686840, 697478, 700145
        # Fix some absolute paths to be appropriate for Gentoo
        "${WORKDIR}"/patches/
+       "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]
 )
 
 src_configure() {

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild
index 148131fa7cc73a17cd40c1487bcb3b0bcd9495d2..edf0afe1e5e21989c4a5dc8006f8a92810525af3 100644 (file)
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild
@@ -132,6 +132,7 @@ PATCHES=(
        # https://bugzilla.gnome.org/686840, 697478, 700145
        # Fix some absolute paths to be appropriate for Gentoo
        "${WORKDIR}"/patches/
+       "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]
        "${FILESDIR}"/${PV}-goa-lifecycle.patch # extra patch from gnome-3-26
        "${FILESDIR}"/${PV}-gnome-desktop-3-28-compat.patch # backport of porting to gnome-desktop-3.28 API changes
 )