| 1 |
commit: fdf76328d1eaed6f547d30159f8805a6234c120a |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 24 09:49:11 2019 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 24 09:49:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf76328 |
| 7 |
|
| 8 |
gnome-base/gnome-control-center: fix non-wayland build against gtk+[wayland] |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/674684 |
| 11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/3.26.2-without-wayland-fix.patch | 30 ++++++++++++++++++++++ |
| 15 |
.../gnome-control-center-3.26.2-r1.ebuild | 1 + |
| 16 |
.../gnome-control-center-3.26.2-r2.ebuild | 1 + |
| 17 |
3 files changed, 32 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..92f4d4bdaee |
| 22 |
--- /dev/null |
| 23 |
+++ b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch |
| 24 |
@@ -0,0 +1,30 @@ |
| 25 |
+From 62f07b2c6d8a28378e1f2c9f5d0c3241332ee8cf Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Georges Basile Stavracas Neto <georges.stavracas@×××××.com> |
| 27 |
+Date: Wed, 17 Jan 2018 20:05:03 -0200 |
| 28 |
+Subject: [PATCH] common: Don't unconditionally define HAVE_WAYLAND |
| 29 |
+ |
| 30 |
+This header unconditionally defines HAVE_WAYLAND when GTK |
| 31 |
+is built with Wayland support. This breaks the build when |
| 32 |
+building with Wayland disabled. |
| 33 |
+ |
| 34 |
+https://bugzilla.gnome.org/show_bug.cgi?id=785414 |
| 35 |
+--- |
| 36 |
+ panels/common/gnome-settings-bus.h | 2 -- |
| 37 |
+ 1 file changed, 2 deletions(-) |
| 38 |
+ |
| 39 |
+diff --git a/panels/common/gnome-settings-bus.h b/panels/common/gnome-settings-bus.h |
| 40 |
+index ce58f5805..763a9cca7 100644 |
| 41 |
+--- a/panels/common/gnome-settings-bus.h |
| 42 |
++++ b/panels/common/gnome-settings-bus.h |
| 43 |
+@@ -5,8 +5,6 @@ |
| 44 |
+ |
| 45 |
+ #ifdef GDK_WINDOWING_WAYLAND |
| 46 |
+ |
| 47 |
+-#define HAVE_WAYLAND 1 |
| 48 |
+- |
| 49 |
+ static inline gboolean |
| 50 |
+ gnome_settings_is_wayland (void) |
| 51 |
+ { |
| 52 |
+-- |
| 53 |
+2.17.0 |
| 54 |
+ |
| 55 |
|
| 56 |
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 |
| 57 |
index ff36d5d2a6b..5e554968fdb 100644 |
| 58 |
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild |
| 59 |
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild |
| 60 |
@@ -134,6 +134,7 @@ PATCHES=( |
| 61 |
# https://bugzilla.gnome.org/686840, 697478, 700145 |
| 62 |
# Fix some absolute paths to be appropriate for Gentoo |
| 63 |
"${WORKDIR}"/patches/ |
| 64 |
+ "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland] |
| 65 |
) |
| 66 |
|
| 67 |
src_configure() { |
| 68 |
|
| 69 |
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 |
| 70 |
index 148131fa7cc..edf0afe1e5e 100644 |
| 71 |
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild |
| 72 |
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild |
| 73 |
@@ -132,6 +132,7 @@ PATCHES=( |
| 74 |
# https://bugzilla.gnome.org/686840, 697478, 700145 |
| 75 |
# Fix some absolute paths to be appropriate for Gentoo |
| 76 |
"${WORKDIR}"/patches/ |
| 77 |
+ "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland] |
| 78 |
"${FILESDIR}"/${PV}-goa-lifecycle.patch # extra patch from gnome-3-26 |
| 79 |
"${FILESDIR}"/${PV}-gnome-desktop-3-28-compat.patch # backport of porting to gnome-desktop-3.28 API changes |
| 80 |
) |
Archives