[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2024-08-07 Thread Pacho Ramos 
commit: d10ec547b9c45bf708142de86ff9c9c357f5e50d
Author: Guillermo Joandet  gmail  com>
AuthorDate: Sun Aug  4 22:37:03 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Aug  7 10:48:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d10ec547

gnome-base/gnome-settings-daemon: Fix elogind support

Closes: https://bugs.gentoo.org/937244
Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37960
Signed-off-by: Pacho Ramos  gentoo.org>

 ...-settings-daemon-46.0-add-elogind-support.patch |  98 ++
 .../gnome-settings-daemon-46.0-r1.ebuild   | 143 +
 2 files changed, 241 insertions(+)

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-46.0-add-elogind-support.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-46.0-add-elogind-support.patch
new file mode 100644
index ..6f6270234b9e
--- /dev/null
+++ 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-46.0-add-elogind-support.patch
@@ -0,0 +1,98 @@
+From 46f998d7308cb18832666bc34ee54b1d9c27739f Mon Sep 17 00:00:00 2001
+From: Nathaniel Russell 
+Date: Sat, 13 Jan 2024 00:29:49 +
+Subject: [PATCH] build: Add elogind support
+
+---
+ meson.build   | 17 -
+ meson_options.txt |  2 +-
+ plugins/sharing/gsd-sharing-manager.c |  5 -
+ plugins/sharing/meson.build   |  7 ++-
+ 4 files changed, 23 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index deecd3f1e..e07fa841b 100644
+--- a/meson.build
 b/meson.build
+@@ -111,13 +111,20 @@ x11_dep = dependency('x11')
+ xfixes_dep = dependency('xfixes', version: '>= 6.0')
+ 
+ enable_systemd = get_option('systemd')
+-systemd_dep = dependency('systemd', version: '>= 243', required: 
enable_systemd)
+-if systemd_dep.found()
+-  systemd_userunitdir = systemd_dep.get_variable(pkgconfig: 
'systemduserunitdir',
+- pkgconfig_define: ['prefix', 
gsd_prefix])
++enable_elogind = get_option('elogind')
++
++if enable_systemd and enable_elogind
++  error('Only systemd or elogind support should be activated')
++elif enable_systemd
++  systemd_dep = dependency('systemd', version: '>= 243', required: true)
++  libsystemd_dep = dependency('libsystemd', version: '>= 243', required: true)
++  systemd_userunitdir = 
systemd_dep.get_pkgconfig_variable('systemduserunitdir',
++   define_variable: 
['prefix', gsd_prefix])
++elif enable_elogind
++  elogind_dep = dependency('libelogind', version: '>= 209', required: true)
+ endif
+-libsystemd_dep = dependency('libsystemd', version: '>= 243', required: 
enable_systemd)
+ 
++config_h.set10('HAVE_SYSTEMD_LIB', enable_systemd or enable_elogind)
+ 
+ m_dep = cc.find_library('m')
+ 
+diff --git a/meson_options.txt b/meson_options.txt
+index 1d913b4d2..5e2cccab6 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,6 +1,6 @@
+ option('udev_dir', type: 'string', value: '', description: 'Absolute path of 
the udev base directory')
+ option('systemd', type: 'boolean', value: true, description: 'Enable systemd 
integration')
+-
++option('elogind', type: 'boolean', value: false, description: 'Use elogind')
+ option('alsa', type: 'boolean', value: true, description: 'build with ALSA 
support (not optional on Linux platforms)')
+ option('gudev', type: 'boolean', value: true, description: 'build with gudev 
device support (not optional on Linux platforms)')
+ option('cups', type: 'boolean', value: true, description: 'build with CUPS 
support')
+diff --git a/plugins/sharing/gsd-sharing-manager.c 
b/plugins/sharing/gsd-sharing-manager.c
+index 2ab2cb054..c669e7bde 100644
+--- a/plugins/sharing/gsd-sharing-manager.c
 b/plugins/sharing/gsd-sharing-manager.c
+@@ -20,12 +20,15 @@
+ #include "config.h"
+ 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+ #include 
+ 
++#if HAVE_SYSTEMD_LIB
++#include 
++#endif
++
+ #if HAVE_NETWORK_MANAGER
+ #include 
+ #endif /* HAVE_NETWORK_MANAGER */
+diff --git a/plugins/sharing/meson.build b/plugins/sharing/meson.build
+index bda21608a..c65c4f9a5 100644
+--- a/plugins/sharing/meson.build
 b/plugins/sharing/meson.build
+@@ -6,9 +6,14 @@ sources = files(
+ deps = plugins_deps + [
+   gio_unix_dep,
+   libnotify_dep,
+-  libsystemd_dep
+ ]
+ 
++if enable_systemd
++  deps += libsystemd_dep
++elif enable_elogind
++  deps += elogind_dep
++endif
++
+ if enable_network_manager
+   deps += libnm_dep
+ endif
+-- 
+GitLab
+

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-46.0-r1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-46.0-r1.ebuild
new file mode 100644
index ..91938d6297ed
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-46.0-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2022-01-18 Thread Sam James 
commit: 033c972e1840474b3e3aa3b734dbacda7e1e71c6
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 18 22:51:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 18 22:51:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033c972e

gnome-base/gnome-settings-daemon: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831431
Signed-off-by: Sam James  gentoo.org>

 ...ome-settings-daemon-41.0-meson-0.61-build.patch | 32 ++
 .../gnome-settings-daemon-41.0.ebuild  |  1 +
 2 files changed, 33 insertions(+)

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
new file mode 100644
index ..59aa0f433ae8
--- /dev/null
+++ 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
@@ -0,0 +1,32 @@
+https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281.patch
+https://bugs.gentoo.org/831431
+
+From d88484002b5a0c8d2adccb2a5886a7da0a247d27 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek 
+Date: Fri, 14 Jan 2022 23:55:06 +0100
+Subject: [PATCH] build: remove positional i18n.merge_file arguments
+
+otherwise building with meson 0.61+ fails:
+
+ERROR: Function does not take positional arguments.
+--- a/plugins/power/meson.build
 b/plugins/power/meson.build
+@@ -76,7 +76,6 @@ if host_is_linux
+   )
+ 
+   i18n.merge_file(
+-policy,
+ input: policy_in,
+ output: policy,
+ po_dir: po_dir,
+--- a/plugins/wacom/meson.build
 b/plugins/wacom/meson.build
+@@ -7,7 +7,6 @@ policy_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy_in,
+   output: policy,
+   po_dir: po_dir,
+GitLab

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
index b0e196bea8d6..f5bbb821b4c3 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
@@ -93,6 +93,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
"${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
"${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
+   "${FILESDIR}"/${P}-meson-0.61-build.patch
 )
 
 python_check_deps() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2020-11-10 Thread Matt Turner 
commit: b9c704ae1c532129a1e143502e0e7748432b9065
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Nov 11 03:41:07 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Nov 11 04:09:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c704ae

gnome-base/gnome-settings-daemon: Version bump to 3.38.1

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-settings-daemon/Manifest  |   1 +
 ...aemon-3.38.1-Allow-udev-optional-on-Linux.patch | 134 
 ...n-3.38.1-build-Allow-NM-optional-on-Linux.patch |  24 
 ...colord-and-wacom-optional-and-controllabl.patch |  76 
 .../gnome-settings-daemon-3.38.1.ebuild| 136 +
 5 files changed, 371 insertions(+)

diff --git a/gnome-base/gnome-settings-daemon/Manifest 
b/gnome-base/gnome-settings-daemon/Manifest
index ca2145d39f6..b4a95e33023 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-settings-daemon-3.36.1-patchset.tar.xz 79352 BLAKE2B 
6daf9528f5aa4c6597a017f25da41039dd2c09b4a1c29dca2d72f20195bb93c9003de39df89a669996e13050538553fbf6ed4f738b1c6fae29e8825ba252d26a
 SHA512 
fea4ecaadac102b0024c365ae2ba9e632ffeebab138bfc09b3f5bb0a7794c6efc779180023a73c6c884c7b64f7e8ac1ec40f1478231a5528c03829cd9273a58e
 DIST gnome-settings-daemon-3.36.1.tar.xz 1415080 BLAKE2B 
4026f3443b8dcab872ef54563b5fe8e89d6932373da0513d7d8c614616d396315f1e6a8d0be022aec82351b5cfe5868cbac5caeaa782d609885029fbbd1d91e3
 SHA512 
f2f43d9b772589b6b4212ee2b0afe8be79d50a2e0473a960c7a7b9d379222bbe84ca548114d0a247810a094b4b3bf41e40ca91173c6cf552517dc63eb3750c88
+DIST gnome-settings-daemon-3.38.1.tar.xz 1437096 BLAKE2B 
dddc4672585c23f1d0f1824303b503ec30d6fc4a2a88b9633e0256d34ca2badd067fa54a404de032f8b2e8dd5b7bfa3915464bc826d8bbea5d57431b7a2ac7fe
 SHA512 
b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
new file mode 100644
index 000..658f4a3f48e
--- /dev/null
+++ 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
@@ -0,0 +1,134 @@
+From 6a44d3a6741da48d769353023c8801d41c969663 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Sun, 12 Jul 2020 16:30:59 +0300
+Subject: [PATCH 3/3] Allow udev optional on Linux
+
+---
+ meson.build   |  4 
+ plugins/power/gsd-backlight.c | 14 +++---
+ plugins/power/meson.build |  6 +++---
+ 3 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 21d9341d..0a527513 100644
+--- a/meson.build
 b/meson.build
+@@ -138,9 +138,6 @@ if enable_gudev
+   gudev_dep = dependency('gudev-1.0')
+ endif
+ config_h.set10('HAVE_GUDEV', enable_gudev)
+-if host_is_linux
+-  assert(enable_gudev, 'GUdev is not optional on Linux platforms')
+-endif
+ 
+ # Check for colord
+ enable_colord = get_option('colord')
+@@ -203,7 +200,6 @@ endif
+ 
+ # Rfkill
+ enable_rfkill = get_option('rfkill')
+-assert(enable_rfkill or not host_is_linux, 'rfkill is not optional on Linux 
platforms')
+ if enable_rfkill
+   assert(cc.has_header('linux/rfkill.h'), 'rfkill support requested but 
RFKill headers not found')
+   assert(enable_gudev, 'GUdev is required for rfkill support')
+diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
+index ca5f2723..f58f5343 100644
+--- a/plugins/power/gsd-backlight.c
 b/plugins/power/gsd-backlight.c
+@@ -25,7 +25,7 @@
+ #include "gsd-power-constants.h"
+ #include "gsd-power-manager.h"
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+ #include 
+ #endif /* __linux__ */
+ 
+@@ -39,7 +39,7 @@ struct _GsdBacklight
+ gint brightness_target;
+ gint brightness_step;
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+ GDBusProxy *logind_proxy;
+ 
+ GUdevClient *udev;
+@@ -77,7 +77,7 @@ G_DEFINE_TYPE_EXTENDED (GsdBacklight, gsd_backlight, 
G_TYPE_OBJECT, 0,
+ G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+
gsd_backlight_initable_iface_init);)
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+ static GUdevDevice*
+ gsd_backlight_udev_get_type (GList *devices, const gchar *type)
+ {
+@@ -478,7 +478,7 @@ gsd_backlight_set_brightness_val_async (GsdBacklight 
*backlight,
+ 
+ task = g_task_new (backlight, cancellable, callback, user_data);
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+ if (backlight->udev_device != NULL) {
+ BacklightHelperData *task_data;
+ 
+@@ -831,7 +831,7 @@ gsd_backlight_initable_init (GInitable

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2019-05-18 Thread Mart Raudsepp 
commit: 9a850c8b63c470c4f9ba7bad895d682ed8fe2d18
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat May 18 20:26:05 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May 18 20:44:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a850c8b

gnome-base/gnome-settings-daemon: remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-settings-daemon/Manifest  |   2 -
 .../files/glib-2.58-compat.patch   |  33 -
 .../gnome-settings-daemon-3.24.4.ebuild| 155 -
 gnome-base/gnome-settings-daemon/metadata.xml  |   4 -
 4 files changed, 194 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/Manifest 
b/gnome-base/gnome-settings-daemon/Manifest
index 419a91fa4d5..a15f3b30aa5 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,4 +1,2 @@
-DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B 
f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973
 SHA512 
fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb
-DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 
616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8
 SHA512 
4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0
 DIST gnome-settings-daemon-3.30.2-patchset.tar.xz 20132 BLAKE2B 
b8f2573e806ee5aedcc1476de3550cdc39933c869d64c9d13e463cdf27fa7695e69e57612738fa5438988eda78ae998808508c94fbf841ec037eb1f103921458
 SHA512 
7318029f4145379b05f7a95686917b4ea7623fd0059559930072350db12170d6083d75c170578516bcede5282da677013086c343abe779b9d1696bd882b7e34d
 DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B 
a7cf276c5a802b7d9a6f738048b5bc34d97f79723c6f4cfb4f29ac3ed0f43e307cbdd6793e8d8115f51981ee576737d75c58531dcd5d0779d9f3670b68523a60
 SHA512 
517cb6bab3da10d5d47ab9c9690da3fa23e64d023d01b7cc101441f6b65639f3b6c8d0a0d19da80b22924b3dbe6430b2573fb861060f02fda248b24f00be5d84

diff --git a/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch 
b/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch
deleted file mode 100644
index 94e1cad666e..000
--- a/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3110457f72f70b2d283c1ad2f27b91b95d75d92f Mon Sep 17 00:00:00 2001
-From: Christian Hergert 
-Date: Wed, 18 Jul 2018 19:31:17 -0700
-Subject: [PATCH] housekeeping: fix improper notify_notification_close() usage
-
-notify_notification_close() expects that a parameter will be available for
-the error location, which could be a dangling pointer in a register or
-on the stack in the case of some architectures.
-
-This was caught by GNOME/glib#1425 which allows us to check proper type
-parameters.

- plugins/housekeeping/gsd-disk-space.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/housekeeping/gsd-disk-space.c 
b/plugins/housekeeping/gsd-disk-space.c
-index 0ae40193..0eee94ea 100644
 a/plugins/housekeeping/gsd-disk-space.c
-+++ b/plugins/housekeeping/gsd-disk-space.c
-@@ -1017,7 +1017,9 @@ gsd_ldsm_clean (void)
- g_clear_object (&ldsm_monitor);
- g_clear_object (&settings);
- g_clear_object (&privacy_settings);
--g_clear_pointer (¬ification, notify_notification_close);
-+/* NotifyNotification::closed callback will drop reference */
-+if (notification != NULL)
-+notify_notification_close (notification, NULL);
- g_slist_free_full (ignore_paths, g_free);
- ignore_paths = NULL;
- }
--- 
-2.17.0
-

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
deleted file mode 100644
index 20b059fb7b2..000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_5,3_6} ) # 
https://bugzilla.gnome.org/show_bug.cgi?id=783186
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon";
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager 
policykit smartcard test +udev wayland"
-REQUIRED_USE="
-   input_devices_wacom? ( udev )
-   smartcard? ( udev )
-

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2019-03-26 Thread Mart Raudsepp 
commit: f4f95aa8d56dbae6cd426b47df1be818e64c88ea
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Mar 26 14:41:10 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Mar 26 14:42:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f95aa8

gnome-base/gnome-settings-daemon: don't automatically suspend on AC power

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

 settings-daemon.plugins.power.gschema.override |   2 +
 .../gnome-settings-daemon-3.30.2-r1.ebuild | 137 +
 2 files changed, 139 insertions(+)

diff --git 
a/gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override
 
b/gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override
new file mode 100644
index 000..f04a3271c2a
--- /dev/null
+++ 
b/gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild
new file mode 100644
index 000..31e16ecdba5
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+
+inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon";
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard 
systemd test +udev wayland"
+REQUIRED_USE="
+   ^^ ( elogind systemd )
+   input_devices_wacom? ( udev )
+   wayland? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~x86-solaris"
+
+# >=polkit-0.114 for ITS translation rules of .policy files
+COMMON_DEPEND="
+   >=sci-geosciences/geocode-glib-3.10
+   >=dev-libs/glib-2.53.0:2
+   >=gnome-base/gnome-desktop-3.11.1:3=
+   >=gnome-base/gsettings-desktop-schemas-3.27.90
+   >=x11-libs/gtk+-3.15.3:3[X,wayland?]
+   >=dev-libs/libgweather-3.9.5:2=
+   colord? (
+   >=x11-misc/colord-1.0.2:=
+   >=media-libs/lcms-2.2:2 )
+   media-libs/libcanberra[gtk3]
+   >=app-misc/geoclue-2.3.1:2.0
+   >=x11-libs/libnotify-0.7.3
+   >=media-sound/pulseaudio-2[glib]
+   >=sys-auth/polkit-0.114
+   >=sys-power/upower-0.99:=
+   x11-libs/libX11
+   x11-libs/libXtst
+   udev? ( virtual/libgudev:= )
+   wayland? ( dev-libs/wayland )
+   input_devices_wacom? ( >=dev-libs/libwacom-0.7
+   >=x11-libs/pango-1.20.0
+   x11-libs/gdk-pixbuf:2 )
+   smartcard? ( >=dev-libs/nss-3.11.2 )
+   cups? ( >=net-print/cups-1.4[dbus] )
+   networkmanager? ( >=net-misc/networkmanager-1.0 )
+   media-libs/alsa-lib
+   x11-libs/libXi
+   x11-libs/libXext
+   media-libs/fontconfig
+"
+# logind needed for power and session management, bug #464944
+# gnome-session-3.27.90 and gdm-3.27.9 adapt to A11yKeyboard component removal 
(moved to shell dealing with it)
+RDEPEND="${COMMON_DEPEND}
+   gnome-base/dconf
+   elogind? ( sys-auth/elogind )
+   systemd? ( sys-apps/systemd )
+   !

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2019-03-03 Thread Mart Raudsepp 
commit: 96b8094548016d7e68aa6893416bba74103470c7
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Mar  3 18:49:47 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Mar  3 18:59:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b80945

gnome-base/gnome-settings-daemon: fix non-wayland builds

Bug: https://bugs.gentoo.org/677494
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/3.28.1-fix-non-wayland-build.patch   | 88 ++
 ...uild => gnome-settings-daemon-3.28.1-r1.ebuild} |  4 +-
 2 files changed, 91 insertions(+), 1 deletion(-)

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch 
b/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch
new file mode 100644
index 000..dd003d6c069
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch
@@ -0,0 +1,88 @@
+From 91d5e708835b4c7810835d59b8ef5968454cfd0a Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan 
+Date: Fri, 15 Jun 2018 23:05:01 +0800
+Subject: [PATCH 1/2] common: Fix build with wayland disabled on FreeBSD
+
+HAVE_WAYLAND is always defined. We should check whether it is set to a
+non-zero value instead of checking whether it is defined.
+
+(cherry picked from commit 34199fa54641abae15199a311002ac726f47aa89)
+---
+ plugins/common/gsd-device-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/common/gsd-device-manager.c 
b/plugins/common/gsd-device-manager.c
+index 541f2948..ff72ad69 100644
+--- a/plugins/common/gsd-device-manager.c
 b/plugins/common/gsd-device-manager.c
+@@ -275,7 +275,7 @@ gsd_device_manager_get (void)
+   manager = g_object_get_data (G_OBJECT (screen), 
"gsd-device-manager-data");
+ 
+   if (!manager) {
+-#ifdef HAVE_WAYLAND
++#if HAVE_WAYLAND
+   if (gnome_settings_is_wayland ()) {
+   manager = g_object_new (GSD_TYPE_UDEV_DEVICE_MANAGER,
+   NULL);
+-- 
+2.17.0
+
+
+From 218f1ff0a3c6c500fd36601a4db6902fc1c57a43 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt 
+Date: Fri, 22 Jun 2018 20:12:50 +0200
+Subject: [PATCH 2/2] build: Fix build when wayland support is disabled
+
+The udev based device manager used for wayland environments was built
+based on the state of the gudev option instead of the wayland option.
+This resulted in an build error when building with `-Dwayland=false`
+since the gdk/gdkwayland.h header file is not present on systems without
+gdk-wayland-3.0.
+
+This patch puts the compilation of the udev based device manager behind
+the wayland option and the gdk-wayland-3.0 dependency
+
+(cherry picked from commit 51088a9c27d713bbe63359b865603c833eb5a930)
+---
+ meson.build| 3 ++-
+ plugins/common/meson.build | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 79c493a1..27fdd049 100644
+--- a/meson.build
 b/meson.build
+@@ -129,11 +129,12 @@ if enable_colord
+   colord_dep = dependency('colord', version: '>= 1.0.2')
+ endif
+ 
+-# Check for libwayland-client
++# Check for wayland dependencies
+ enable_wayland = get_option('wayland')
+ if enable_wayland
+   assert(enable_gudev, 'GUDev support is required for wayland support.')
+   wayland_client_dep = dependency('wayland-client')
++  wayland_gdk_dep = dependency('gdk-wayland-3.0')
+ endif
+ config_h.set10('HAVE_WAYLAND', enable_wayland)
+ 
+diff --git a/plugins/common/meson.build b/plugins/common/meson.build
+index 65a0757c..6bda2d2a 100644
+--- a/plugins/common/meson.build
 b/plugins/common/meson.build
+@@ -42,10 +42,10 @@ if host_is_darwin
+   ldflags += ['-Wl,-bundle_loader,@0@'.format(join_paths(), 
meson.build_root(), meson.project_name(), meson.project_name())]
+ endif
+ 
+-if enable_gudev
++if enable_wayland
+   sources += files('gsd-device-manager-udev.c')
+ 
+-  deps += gudev_dep
++  deps += [wayland_gdk_dep, gudev_dep]
+ endif
+ 
+ if enable_wacom
+-- 
+2.17.0
+

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild
similarity index 95%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1.ebuild
rename to 
gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild
index 0786e730078..2c04b07b0b1 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild
@@ -26,7 +26,7 @@ COMMON_DEPEND="
>=dev-libs/glib-2.53.0:2
>=gnome-base/gnome-desktop-3.11.1:3=
>=gnome-base/gsettings-desktop-schemas-3.23.3
-   >=x11-libs/gtk+-3.15.3:3[X]
+   >=x11-libs/gtk+-3.15.3:3[X,wayland?]
>=dev-libs/libgweather-3.9.5:2=
colord? (
>=x11-misc/colord-1.0.2:=
@@ -85,6 +8

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2018-12-25 Thread Mart Raudsepp 
commit: 8403a13490ce4e7f9c8a6c956ac11ee1289bab97
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Dec 25 15:42:30 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Dec 25 15:50:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8403a134

gnome-base/gnome-settings-daemon: fix build with glib-2.58

New glib does typeof() checking on g_clear_pointer macro calls,
which fails with code that passed something unsuitable as
g_clear_pointer destroy parameter. notify_notification_close
takes a second parameter, which is not a valid function signature
for g_clear_pointer, thus it errors now. Add upstream patch to
fix that.

Because in practice the destroy func call worked out fine with
earlier glib, without any known problems, there is no revbump by
considering it only a build fix (which strictly it's not).

Closes: https://bugs.gentoo.org/673706
Signed-off-by: Mart Raudsepp  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 .../files/glib-2.58-compat.patch   | 33 ++
 .../gnome-settings-daemon-3.24.4.ebuild|  3 +-
 .../gnome-settings-daemon-3.26.2-r1.ebuild |  1 +
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch 
b/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch
new file mode 100644
index 000..94e1cad666e
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch
@@ -0,0 +1,33 @@
+From 3110457f72f70b2d283c1ad2f27b91b95d75d92f Mon Sep 17 00:00:00 2001
+From: Christian Hergert 
+Date: Wed, 18 Jul 2018 19:31:17 -0700
+Subject: [PATCH] housekeeping: fix improper notify_notification_close() usage
+
+notify_notification_close() expects that a parameter will be available for
+the error location, which could be a dangling pointer in a register or
+on the stack in the case of some architectures.
+
+This was caught by GNOME/glib#1425 which allows us to check proper type
+parameters.
+---
+ plugins/housekeeping/gsd-disk-space.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/housekeeping/gsd-disk-space.c 
b/plugins/housekeeping/gsd-disk-space.c
+index 0ae40193..0eee94ea 100644
+--- a/plugins/housekeeping/gsd-disk-space.c
 b/plugins/housekeeping/gsd-disk-space.c
+@@ -1017,7 +1017,9 @@ gsd_ldsm_clean (void)
+ g_clear_object (&ldsm_monitor);
+ g_clear_object (&settings);
+ g_clear_object (&privacy_settings);
+-g_clear_pointer (¬ification, notify_notification_close);
++/* NotifyNotification::closed callback will drop reference */
++if (notification != NULL)
++notify_notification_close (notification, NULL);
+ g_slist_free_full (ignore_paths, g_free);
+ ignore_paths = NULL;
+ }
+-- 
+2.17.0
+

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
index 30c72516856..dbde38ea937 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -103,6 +103,7 @@ PATCHES=(
# Reduce memory usage by using a fake CSS theme instead of full Adwaita 
for GTK+ needing plugins; requires eautoreconf
# Fix build system to require gudev with wayland, bug #627966
"${WORKDIR}"/patches/
+   "${FILESDIR}"/glib-2.58-compat.patch
 )
 
 python_check_deps() {

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
index fc862199ab3..b7c6a9990f9 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
# Allow specifying udevrulesdir via configure, bug 509484; requires 
eautoreconf
# Fix build system to require gudev with wayland, bug #627966; requires 
eautoreconf
"${WORKDIR}"/patches/
+   "${FILESDIR}"/glib-2.58-compat.patch # included in 3.29.1+, might be 
backported to 3.28 too
 )
 
 python_check_deps() {

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2017-08-15 Thread Gilles Dartiguelongue 
commit: 02aa485159f7f98b6a316ea9ecb75d369fdf6a43
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Aug 15 17:33:07 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Aug 15 17:33:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02aa4851

gnome-base/gnome-settings-daemon: version bump 3.24.2 → 3.24.3

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 gnome-base/gnome-settings-daemon/Manifest  |   1 +
 .../files/3.24.3-optional.patch| 142 ++
 .../gnome-settings-daemon-3.24.3.ebuild| 158 +
 3 files changed, 301 insertions(+)

diff --git a/gnome-base/gnome-settings-daemon/Manifest 
b/gnome-base/gnome-settings-daemon/Manifest
index a5f3d72f07b..bff715e5361 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 SHA256 
0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01 SHA512 
7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3
 WHIRLPOOL 
edae1afc97a314f3d90c7d77d9a456e74e9fe9059353e15a5a9b8318c32d2ebad792e7c9b7acaf54a8f3ea11a5de629f06d7bdb9cb3d5bff4f0621fe6a50683a
 DIST gnome-settings-daemon-3.24.2.tar.xz 1621368 SHA256 
4aa9d72644e3ee8a30096a38986b0e9543fca92f586c561f6c8a11fb8148dcca SHA512 
fa75a499750c9e8f8fd2c1af44d033e55f90f97ef39c4159fa58a2957aeae036b4ae505dede6333b640b0dfcd0400eacd3715aeb184fc021c1d787230b1a1f12
 WHIRLPOOL 
305f16567488b54be4f7ec359f4a1249c18de74e967a410e18fd4bc8b84748bd5146a3bd2b86852d9e6a37bc829b281e79a38c7a3cfcece5f80ae516d062780f
+DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 SHA256 
68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593 SHA512 
2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6
 WHIRLPOOL 
90fa96f9e1c641a63ba4eac2160f6fbc141f31009eaa93be7a4d3737d086553bb5f3fec7a75c32c2e9a364071216a36c578948f60d89867b6e12f8d12948dab4

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch
new file mode 100644
index 000..5202f77d5dc
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch
@@ -0,0 +1,142 @@
+From 7b7bbbeeb9fa422d5a291574910e0881fa13f171 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider 
+Date: Tue, 15 Aug 2017 18:51:42 +0200
+Subject: [PATCH] Make colord and wacom support optional
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ configure.ac  | 54 +++
+ plugins/Makefile.am   |  9 ++--
+ plugins/dummy/Makefile.am |  5 -
+ 3 files changed, 47 insertions(+), 21 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 73fe91e6..d8778c93 100644
+--- a/configure.ac
 b/configure.ac
+@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD,
+ gtk+-x11-3.0
+ x11)
+ 
+-PKG_CHECK_MODULES(COLOR,
+-colord >= 1.0.2
+-gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+-libcanberra-gtk3
+-libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+-lcms2 >= $LCMS_REQUIRED_VERSION
+-libnotify)
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++ [turn off color plugin]),
++   [],
++   [enable_color=yes])
++
++AS_IF([test "$enable_color" = "yes"],
++  [PKG_CHECK_MODULES(COLOR,
++ colord >= 1.0.2
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++ libcanberra-gtk3
++ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++ lcms2 >= $LCMS_REQUIRED_VERSION
++ libnotify)
++   AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++  ])
++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
+ 
+ PKG_CHECK_MODULES(DATETIME,
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION
+@@ -268,23 +278,31 @@ case $host_os in
+ if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+   have_wacom=no
+ else
+-  if test x$enable_gudev != xno; then
+-LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
+-PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+-PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
+-PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
+-  else
+-AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+-  fi
+-  AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is 
available])
+-  have_wacom=yes
++  have_wacom=no
++  AS_IF([test "$enable_gudev" != "no"],
++[AC_ARG_ENABLE([wacom],
++   AS_HELP_STRING([--

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2017-05-29 Thread Mart Raudsepp 
commit: d9e6623e04fe7089bcbac42e39edee715792f541
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon May 29 06:59:35 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon May 29 07:02:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e6623e

gnome-base/gnome-settings-daemon: bump to 3.24.2, backport memory reduction 
patches

Also rebase the udevrulesdir patch, as it's gotten to fuzzy applying.
Unneeded gtk-init removal from plugins that didn't need it patch reduces their
private memory usage from ~5MB to 1-2MB (3 plugins, used by gdm and user).
CSS theme change patch should give a big win for those that still need gtk_init,
but I wasn't able to observe that personally.
Grab a color test fixing patch from gnome-3-24 in case it helps, but tests still
restricted due to power tests failing.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 gnome-base/gnome-settings-daemon/Manifest  |   2 +-
 .../files/3.24.2-fix-color-tests.patch |  85 ++
 ...3.24.0-optional.patch => 3.24.2-optional.patch} |   0
 .../files/3.24.2-reduce-memory-usage.patch | 177 +
 .../files/3.24.2-remove-unneeded-gtk-init.patch|  77 +
 .../files/3.24.2-udevrulesdir-configure.patch  |  48 ++
 ebuild => gnome-settings-daemon-3.24.2.ebuild} |  13 +-
 7 files changed, 398 insertions(+), 4 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/Manifest 
b/gnome-base/gnome-settings-daemon/Manifest
index d8c2242ce76..a5f3d72f07b 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,2 +1,2 @@
 DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 SHA256 
0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01 SHA512 
7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3
 WHIRLPOOL 
edae1afc97a314f3d90c7d77d9a456e74e9fe9059353e15a5a9b8318c32d2ebad792e7c9b7acaf54a8f3ea11a5de629f06d7bdb9cb3d5bff4f0621fe6a50683a
-DIST gnome-settings-daemon-3.24.0.tar.xz 1620184 SHA256 
4f31a68aebdd4e0c37336306a4eea4cf219d46ed8fc59e3f3081b7a3088900c4 SHA512 
94bf904cb424baa4201fc49e7ea978f86c6e7ede74794fefec784ca125e86b949e8ea7585284377a586d73d438a9fcf0ef9d9e0dc26c4fcba60250b384ec797a
 WHIRLPOOL 
e86332a1872bff33511d84d213f4ecb11be0510a1d1e87513f35efcc51a56b3c5d0233bb000671ccb3c5f49f975621a35a315b2353ccd3c02aaec135c0f842bb
+DIST gnome-settings-daemon-3.24.2.tar.xz 1621368 SHA256 
4aa9d72644e3ee8a30096a38986b0e9543fca92f586c561f6c8a11fb8148dcca SHA512 
fa75a499750c9e8f8fd2c1af44d033e55f90f97ef39c4159fa58a2957aeae036b4ae505dede6333b640b0dfcd0400eacd3715aeb184fc021c1d787230b1a1f12
 WHIRLPOOL 
305f16567488b54be4f7ec359f4a1249c18de74e967a410e18fd4bc8b84748bd5146a3bd2b86852d9e6a37bc829b281e79a38c7a3cfcece5f80ae516d062780f

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch
new file mode 100644
index 000..70069589dae
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch
@@ -0,0 +1,85 @@
+From 63b73af23efd97de34a9dde58938c5c772040974 Mon Sep 17 00:00:00 2001
+From: Iain Lane 
+Date: Fri, 19 May 2017 16:38:07 +0100
+Subject: [PATCH] color: Make the testcase able to run uninstalled
+
+Distributions might want to be able to run their tests during package
+builds, for example.
+
+Compile the schema and set GSETTINGS_SCHEMA_DIR to the build dir.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782170
+---
+ Makefile.am   |  2 +-
+ plugins/color/Makefile.am | 11 ++-
+ plugins/color/gcm-self-test.c |  6 ++
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 0a32954..096c245 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -2,8 +2,8 @@ NULL =
+ 
+ SUBDIRS = \
+   gnome-settings-daemon   \
+-  plugins \
+   data\
++  plugins \
+   po  \
+   tests   \
+   $(NULL)
+diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
+index a280ba8..35dcad4 100644
+--- a/plugins/color/Makefile.am
 b/plugins/color/Makefile.am
+@@ -30,6 +30,15 @@ gcm_self_test_LDADD =   \
+ 
+ TESTS = gcm-self-test
+ 
++BUILT_SOURCES = gschemas.compiled
++
++CLEANFILES = gschemas.compiled
++
++gschemas.compiled: 
$(top_builddir)/data/org.gnome.settings-daemon.plugins.color.gschema.xml
++  $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --schema-file=$< 
--targetdir=$(builddir)
++
++all-am: gschemas.compiled
++
+ libexec_PROGRAMS = gsd-color
+ gsd_color_SOURCES =   \
+   main.c  \
+@@ -80,7 +89,7 @@ EXTRA_DIST = \
+   test-data/Lenovo-T61-Internal.bin   \
+   test-data/LG-L225W-External.

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2017-03-20 Thread Mart Raudsepp 
commit: 998608a7330d83ceabcff572589338a790e09d20
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Mar 20 23:49:19 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Mar 21 00:19:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998608a7

gnome-base/gnome-settings-daemon: bump to 3.22.2, fix udev rule location

Gentoo-bug: 606826

Package-Manager: Portage-2.3.4, Repoman-2.3.1

 gnome-base/gnome-settings-daemon/Manifest  |   1 +
 .../files/3.22.2-udevrulesdir-configure.patch  |  48 +++
 .../gnome-settings-daemon-3.22.2.ebuild| 147 +
 3 files changed, 196 insertions(+)

diff --git a/gnome-base/gnome-settings-daemon/Manifest 
b/gnome-base/gnome-settings-daemon/Manifest
index 2cd1df7d4c0..710a6f95daa 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-settings-daemon-3.20.2.tar.xz 1620696 SHA256 
1dd7a084449a2c240308d253f86d60f3efe25f59322c3f5ec3b9e2e9f5eabb45 SHA512 
b23ac4cfc5c1fe4b1eeb4ba37cae448b2a23e11b988ae609c3d23168a9c22502829b68a4ab5fc8291bde91b429fcb4159c0f37bef78437838de6c6f3417817ed
 WHIRLPOOL 
94463af0fcc3c3e36ded002e359aa1049d8a6171ae9b7edbf1e3ceeda5f1d2ee9389c09fa2929c2197b20a48fa613cc35fb31dc3eed30feec5f370868b1b4e49
 DIST gnome-settings-daemon-3.22.1.tar.xz 1622420 SHA256 
b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba SHA512 
7afd550d5e018524e1aadad540d85816d4f42245af025356d079c28fe78754120b3b0d1de2746603331122659e1f43496d5a1160db069e4b1e9669c3404619b2
 WHIRLPOOL 
d9cb415c3874ba9e650dbfc95d3482b83f6dab8ce2fb17a98e4c892230d8e82a34acb43bbb7fe2d620864d09a068dd32467f08063e7fe56a3589d30acfe83159
+DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 SHA256 
0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01 SHA512 
7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3
 WHIRLPOOL 
edae1afc97a314f3d90c7d77d9a456e74e9fe9059353e15a5a9b8318c32d2ebad792e7c9b7acaf54a8f3ea11a5de629f06d7bdb9cb3d5bff4f0621fe6a50683a
 DIST gnome-settings-daemon-3.23.90.tar.xz 1614204 SHA256 
c9e860558a8132763f6441f317e1df47fc5fe64bc5517bcc9ff9d44a08824fac SHA512 
995eae1876df7918746a0050fd4fa08fd50d6bef9e0c5474da33eb5fd7fc53a1f4214179035f6b0716f60620f198697cef4eaf70cb24c510ce5a30cfc761bdcb
 WHIRLPOOL 
45b21a328a57c08fd6872fd1b7e1df30a5f2a47ffd2dc32d41b85ccc3e7c0937c505aa9aa7b21910140759c0f30d90bc5a9afba773547755805866822cf061fb

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch 
b/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch
new file mode 100644
index 000..d0436ecdc6e
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch
@@ -0,0 +1,48 @@
+From 19394974869513ab4a98d72593dce18f08105983 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Tue, 21 Mar 2017 01:30:52 +0200
+Subject: [PATCH] build: Get udevrulesdir from pkg-config
+
+Use the standard way to find the udev rules directory via pkg-config by 
default,
+and support specifying it, should it be necessary.
+This is the same logic as in colord.
+---
+ configure.ac   | 9 +
+ plugins/rfkill/Makefile.am | 1 -
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8d4f5cb..5390404 100644
+--- a/configure.ac
 b/configure.ac
+@@ -135,6 +135,15 @@ fi
+ AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
+ 
+ dnl 
---
++dnl - Where to install udev rules
++dnl 
---
++AC_ARG_WITH([udevrulesdir],
++AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev 
rules files]),
++[],
++[with_udevrulesdir=$($PKG_CONFIG --variable=udevdir 
udev)/rules.d])
++AC_SUBST([udevrulesdir], [$with_udevrulesdir])
++
++dnl 
---
+ dnl - ALSA integration (default enabled)
+ dnl 
---
+ ALSA_PKG=""
+diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
+index fed7adc..05f2c78 100644
+--- a/plugins/rfkill/Makefile.am
 b/plugins/rfkill/Makefile.am
+@@ -59,7 +59,6 @@ plugin_in_files = rfkill.gnome-settings-plugin.in
+ 
+ plugin_DATA = 
$(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+ 
+-udevrulesdir = $(prefix)/lib/udev/rules.d
+ udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
+ 
+ EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA)
+-- 
+2.10.1
+

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild
new file mode 100644
index 000..4c9c15c975c
--- /dev/null
+++ b/gnome-bas

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2016-11-03 Thread Gilles Dartiguelongue 
commit: 7885d0144ab49984fa438ac7d71b178c677ea5e0
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu Nov  3 08:17:26 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Nov  3 08:19:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7885d014

gnome-base/gnome-settings-daemon: version bump 3.20.2 → 3.22.1

Package-Manager: portage-2.3.2

 gnome-base/gnome-settings-daemon/Manifest  |   1 +
 .../gnome-settings-daemon-3.22.0-optional.patch| 111 +++
 .../gnome-settings-daemon-3.22.1.ebuild| 151 +
 3 files changed, 263 insertions(+)

diff --git a/gnome-base/gnome-settings-daemon/Manifest 
b/gnome-base/gnome-settings-daemon/Manifest
index af820d4..34f95c6 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-settings-daemon-3.18.3.tar.xz 1657000 SHA256 
36e6170768ef17f5e089090f943ee93e632fa5abb64502a2f68a54974f08bf1f SHA512 
2449bc2056887dbf00367bd064fc42ed416647b6533015626fe53160983ba6657554d5cc0f500cf4585ac30e73d8ac78595883cbf8390523d89e2614fb75b39b
 WHIRLPOOL 
0784bdcc9b6d3e4ee919df83dbe19596c624ca948dcf199b7fb7a36aa3723fc60ed6c09692295ac6ae0150d4c81d66706aff4d1641ae8657e138892635b6a30a
 DIST gnome-settings-daemon-3.20.1.tar.xz 1650928 SHA256 
e84a075d895ca3baeefb8508e0a901027b66f7d5a7ee8c966e31d301b38e78e7 SHA512 
4d8ec7c8d508a0dead00c08ef591c9814bf1c33d0016626c6cd5153bd2aad601ea1146b0e5617465ee276b44d8d622b664817a83e045cece69c2be76c5e33a84
 WHIRLPOOL 
14736006a40d4e84bebcc9c17eff8f3fa2c5db36e4ecb546d24a4db006479b6005f583aa9db31caa65988ba0b65beeabb1efa12b0b6a480cfb7e03f6f8e0f4cc
 DIST gnome-settings-daemon-3.20.2.tar.xz 1620696 SHA256 
1dd7a084449a2c240308d253f86d60f3efe25f59322c3f5ec3b9e2e9f5eabb45 SHA512 
b23ac4cfc5c1fe4b1eeb4ba37cae448b2a23e11b988ae609c3d23168a9c22502829b68a4ab5fc8291bde91b429fcb4159c0f37bef78437838de6c6f3417817ed
 WHIRLPOOL 
94463af0fcc3c3e36ded002e359aa1049d8a6171ae9b7edbf1e3ceeda5f1d2ee9389c09fa2929c2197b20a48fa613cc35fb31dc3eed30feec5f370868b1b4e49
+DIST gnome-settings-daemon-3.22.1.tar.xz 1622420 SHA256 
b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba SHA512 
7afd550d5e018524e1aadad540d85816d4f42245af025356d079c28fe78754120b3b0d1de2746603331122659e1f43496d5a1160db069e4b1e9669c3404619b2
 WHIRLPOOL 
d9cb415c3874ba9e650dbfc95d3482b83f6dab8ce2fb17a98e4c892230d8e82a34acb43bbb7fe2d620864d09a068dd32467f08063e7fe56a3589d30acfe83159

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
new file mode 100644
index ..3188337
--- /dev/null
+++ 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
@@ -0,0 +1,111 @@
+From 2aa9a92b06418642339cf27a3df5051f63eb8ddb Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider 
+Date: Sat, 11 Apr 2015 23:10:21 +0200
+Subject: [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac| 41 ++---
+ plugins/Makefile.am |  9 +++--
+ 2 files changed, 37 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6d9408a..628af0e 100644
+--- a/configure.ac
 b/configure.ac
+@@ -245,7 +245,17 @@ dnl 
---
+ dnl - color
+ dnl 
---
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= 
$GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= 
$LCMS_REQUIRED_VERSION])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++ [turn off color plugin]),
++   [],
++   [enable_color=yes])
++
++AS_IF([test "$enable_color" = "yes"],
++  [PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= 
$GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= 
$LCMS_REQUIRED_VERSION])
++   AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++  ])
++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
+ 
+ dnl 
---
+ dnl - datetime
+@@ -270,22 +280,31 @@ case $host_os in
+ if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+   have_wacom=no
+ else
+-  if test x$enable_gudev != xno; then
+-PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 
xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION 
xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= 
$LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
+-PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
+-  else
+-AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+-  fi
+-  AC_DEFINE_UNQUOTED(HAVE_

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

2015-11-14 Thread Pacho Ramos 
commit: 3b1e9b7f653f9c8d9a44f95bdf43c72a3e6f8bcf
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Nov 14 12:19:31 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Nov 14 13:46:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1e9b7f

gnome-base/gnome-settings-daemon: Drop old

Package-Manager: portage-2.2.24

 gnome-base/gnome-settings-daemon/Manifest  |   2 -
 .../gnome-settings-daemon-3.14.0-optional.patch|  95 -
 ...ttings-daemon-3.16.2-settings_set_display.patch |  47 ---
 .../gnome-settings-daemon-3.14.4.ebuild| 152 
 .../gnome-settings-daemon-3.16.2-r1.ebuild | 155 -
 5 files changed, 451 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/Manifest 
b/gnome-base/gnome-settings-daemon/Manifest
index f00585d..7108a86 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,4 +1,2 @@
-DIST gnome-settings-daemon-3.14.4.tar.xz 1650276 SHA256 
ce4453f83a19328e4f031251430325cb6ae832b83fa9fce80a8cde1d4bb0a2a5 SHA512 
c6c62f7e13f93fd3dcff7990571289e10c9ef341ebb9d6deab67adf705a32a13142b7e8aebccd4a71d39f191a472d427fdea5acebc5fcf6f6106c641af320a32
 WHIRLPOOL 
145e694c74364f6fec6543976cf1e0abb6049f8a13c8f0c8b95a481d849a94255f68ade1a4926f0207c19cdbc8927f55edbcae68b01e7ef95046c3786cb07cbb
-DIST gnome-settings-daemon-3.16.2.tar.xz 1602508 SHA256 
d8d536584ebb8fb1403050eb65e7ee3328eba14b123542369ff1917e727fa69a SHA512 
04f62429b6f3edf6d7c11b0fbe8b5b74a3be3d6309ec7a9019dc77d2f8557ad26242a210bcfb36b393b99d93c33590c595c6d7dca9c1272f04bdf5cfc7144076
 WHIRLPOOL 
95f69752b3a9ad7d22489123555cd84dffb6c0ac4872dd5febbfb444013eb2417a0f50f53b311f640cc3d4ac8b662c0b2a102fbe3e32de0614161ed9cf646579
 DIST gnome-settings-daemon-3.16.3.tar.xz 1651880 SHA256 
8752f79ba2ee76701744b4806140d1b88c665ad7cd44e7ff58b4e78e1063daea SHA512 
d11c16b9ccf17683c0917ed8bee8b5142bfcc3d2099073df5318e8a1f801a9b7e07f2dfe68818edee568d6fb2cc8571580b072c1de46dc22aee4bbffddfc3ff5
 WHIRLPOOL 
1dec35ba84975bd297b69622733ab33db981a4b569cf67711f8b526bc3285515ca8fd522131888f6419459d6382ac493aed54b073a4e5950a837cca3f55f2ccf
 DIST gnome-settings-daemon-3.18.2.tar.xz 1626400 SHA256 
3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f SHA512 
82aa939c485d4fa90ee135d4f987a13c6b1629546f41a1399b2badd166c0cc4e298096d860fafefa1236d3af87484bd8903fb6e39fe971660e553e28768775fc
 WHIRLPOOL 
98dc47d6428134504f2a6ed332944fb0f24f95304dfb44a6009d5778ae68820a49ff77e42a6be6721f7880484ba729ee518b0f03e59404560ee78d04a82c44e5

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
deleted file mode 100644
index a7a56b0..000
--- 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From b9515b8ef35915fd1a9721e2eb6ca4e1272d0f47 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour 
-Date: Tue, 10 Dec 2013 00:27:27 +0100
-Subject: [PATCH] Make colord and wacom support optional
-

- configure.ac| 35 +--
- plugins/Makefile.am |  7 ++-
- 2 files changed, 35 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c42ea8b..26ccd36 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -225,7 +225,20 @@ dnl 
---
- dnl - color
- dnl 
---
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= 
$GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+ [turn off color plugin]),
-+   [with_color=$enableval],
-+   [with_color=yes]) dnl Default value
-+
-+if test x$with_color = xyes; then
-+   PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= 
$GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+   AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
- 
- dnl 
---
- dnl - datetime
-@@ -256,15 +269,25 @@ case $host_os in
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-   have_wacom=no
- else
-+  have_wacom=no
-   if test x$enable_gudev != xno; then
--PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 
xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION 
xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= 
$LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
--PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0