summaryrefslogtreecommitdiff
path: root/gnome-base/gnome-settings-daemon
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-02-29 18:01:47 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-02-29 18:01:47 +0000
commitceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree9f47ee47c31a0f13f9496879cd88a1042550aa81 /gnome-base/gnome-settings-daemon
parent53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'gnome-base/gnome-settings-daemon')
-rw-r--r--gnome-base/gnome-settings-daemon/Manifest3
-rw-r--r--gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch25
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild1
3 files changed, 28 insertions, 1 deletions
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 1cb6f2c6de14..a1d0d8fab514 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,6 +1,7 @@
+AUX 3.32.1-fix-wacom-no-wayland.patch 811 BLAKE2B c817a6080438468d72c3633b878ba886c80aa1b4ffbb7890f661c517cd7a705648c38e4a6ad092b965654bb5d17c71417ec64c995fa65471efc06730d471db70 SHA512 d53df8ca76e272815fd077d902cef24ccb6b5d20aa3b515d2e06476003b43b4109b55dee6c1004e5a60b3bb35bf197f3bb76c2bbe7730e0f2361e2935301fd9d
AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
DIST gnome-settings-daemon-3.32.1-patchset.tar.xz 9840 BLAKE2B 0b0249b6335fc64c111cfd4c221b408460105bd544527ca29a32b2ceb82d39c1ca8c9813916cde9afdac1cf146c1286ed937dadb07eb0263b5ab3ada2a95e0aa SHA512 175f4d0200b88b696b73fc7e7b10065b3e6f046e48955408cc438499fdc6464483420b4801dbb77b5ae819cb52a131e2594a628b9731eaa167b802b5b2cbe855
DIST gnome-settings-daemon-3.32.1.tar.xz 1372968 BLAKE2B ba0596d9f2019f2ecff32b70c03d962dd7966c282d1fb0ea94c38fc895b7ef788d9dd179a037b74a319ca520811e985465578a725bf14d1eff92846f188445ea SHA512 8d6aca1041cbd50d7dda67dc711269a51c4a5148d55dc63969f47c21bf309126f5d5cb13c1e6fa9e6498fbb30dc70fa7a049fead7d32c6a20d550da0ce8828c3
-EBUILD gnome-settings-daemon-3.32.1-r1.ebuild 3947 BLAKE2B 69de41ed91223f040b9fb23eb6db0b4e1240f33dd217928f3e7d58aa4409c21faf1bc72f71969229874487ce320df82b8bb4df873c45169bf8b4d0a9c30eb445 SHA512 aa9d2c30d4c371e65a179df79082f0b3ee41773d4af4741954640defedb19424d6bab964b7567351db6a4b5175bb1abc38a7b231dde79609c2df6b8ca331fe5d
+EBUILD gnome-settings-daemon-3.32.1-r1.ebuild 4018 BLAKE2B 10afa9b5cb92b5fdef7d72741af5e64ca5e7e7a68d6d07a0b0524e4cbaca22421b45cf55d130df5c460167a4310a70160396e674eb8d7685f2438f229d2993bf SHA512 4ee4cd2f31279d371fc0b164338c56f5f979947250964c15ad5d1a369f9d8b0adfe849305a7675b612eb42d179aa950b754cc23221d8fb586acbaabfc43e4738
EBUILD gnome-settings-daemon-3.32.1.ebuild 3834 BLAKE2B ac651b86c70636b0e182ec7d611e89e3f7e264ebac267f9027b3e14ca1781318cc584177b7b21ae8028f9198837974ba78ca25ef3202f834032af089646508a0 SHA512 620470bff1ddfa0360d7e7111e69583c32fa6e3d28ed7cfc5306d2aed99cf6fc7bb5be8da57a2d248878413e2a25dd7af6d6294ac028392105bb1c574c4a7e70
MISC metadata.xml 454 BLAKE2B 271588e1f1a6a9799ba121f1da6f69ea1b5ba4c006f11c3a997833eac097143ba19bfe445759f17b7269414892af5efeb04eaaa752c0c330e1238c66004f30ed SHA512 ada9cf6a61a63bd96807bd1c4840a19ed2e59b7889d54af7796ec07af6b8250ce03953d907545c92aa75c59d2bee3ecb4120c571f1830a5c2b06e4ebf7005eee
diff --git a/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
new file mode 100644
index 000000000000..ea343c44b6f7
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
@@ -0,0 +1,25 @@
+From ec6982cc8b3fccc35dbd5df3c4e22ab94709c66d Mon Sep 17 00:00:00 2001
+From: Vlad Banea <vlb@xiphos.ca>
+Date: Tue, 31 Dec 2019 15:35:41 -0500
+Subject: [PATCH] plugins/wacom: Fix build without WAYLAND
+
+---
+ plugins/wacom/gsd-wacom-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
+index e1c8eaa7..92fd96c3 100644
+--- a/plugins/wacom/gsd-wacom-manager.c
++++ b/plugins/wacom/gsd-wacom-manager.c
+@@ -190,7 +190,7 @@ gsd_wacom_manager_class_init (GsdWacomManagerClass *klass)
+ static gchar *
+ get_device_path (GdkDevice *device)
+ {
+-#ifdef HAVE_WAYLAND
++#if HAVE_WAYLAND
+ if (gnome_settings_is_wayland ())
+ return g_strdup (gdk_wayland_device_get_node_path (device));
+ else
+--
+2.20.1
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild
index ae8ba7216b15..10a45fa6a23c 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild
@@ -85,6 +85,7 @@ PATCHES=(
# Allow disabling udev and networkmanager on Linux
# Make colord and wacom optional
"${WORKDIR}"/patches/
+ "${FILESDIR}"/${PV}-fix-wacom-no-wayland.patch #677494, fixed in 3.36
)
python_check_deps() {