gnome-settings-daemon: Update wip/gnome-settings-daemon to 3.36.1

[Dan Cîrnaț <dan%alt.md@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Wed Jun 17 19:07:02 2020 +0200
Changeset:	5834d92461a4a9edd99450a0730ea66678252aa6

Modified Files:
	gnome-settings-daemon/Makefile
	gnome-settings-daemon/PLIST
	gnome-settings-daemon/distinfo
Added Files:
	gnome-settings-daemon/patches/patch-meson.build
	gnome-settings-daemon/patches/patch-plugins_meson.build
Removed Files:
	gnome-settings-daemon/patches/patch-data_Makefile.in

Log Message:
gnome-settings-daemon: Update wip/gnome-settings-daemon to 3.36.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5834d92461a4a9edd99450a0730ea66678252aa6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnome-settings-daemon/Makefile                     | 25 +++---
 gnome-settings-daemon/PLIST                        | 95 +++++++---------------
 gnome-settings-daemon/distinfo                     | 11 +--
 .../patches/patch-data_Makefile.in                 | 13 ---
 gnome-settings-daemon/patches/patch-meson.build    | 61 ++++++++++++++
 .../patches/patch-plugins_meson.build              | 12 +++
 6 files changed, 124 insertions(+), 93 deletions(-)

diffs:
diff --git a/gnome-settings-daemon/Makefile b/gnome-settings-daemon/Makefile
index a4a0d5a5f2..36ce4475ce 100644
--- a/gnome-settings-daemon/Makefile
+++ b/gnome-settings-daemon/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.54 2015/04/25 14:24:52 tnn Exp $
 
-DISTNAME=	gnome-settings-daemon-3.16.4
-PKGREVISION=	1
+DISTNAME=	gnome-settings-daemon-3.36.1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/3.16/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/3.36/}
 EXTRACT_SUFX=	.tar.xz
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 
@@ -20,11 +19,14 @@ USE_TOOLS+=	pkg-config intltool gmake msgfmt
 
 CONFLICTS+=	gnome-control-center<2.22.0
 
-CONFIGURE_ARGS=		--disable-gudev
-CONFIGURE_ARGS+=	--disable-rfkill
-CONFIGURE_ARGS+=	--disable-network-manager
-
-PYTHON_VERSIONS_ACCEPTED=	27
+MESON_ARGS+=		-Dgudev=false
+MESON_ARGS+=		-Drfkill=false
+MESON_ARGS+=		-Dnetwork_manager=false
+MESON_ARGS+=		-Dsystemd=false
+MESON_ARGS+=		-Dwayland=false
+MESON_ARGS+=		-Dsmartcard=false
+MESON_ARGS+=		-Dwwan=false
+MESON_ARGS+=		-Dalsa=false
 
 GCONF_SCHEMAS+=		gnome-settings-daemon.schemas
 GCONF_SCHEMAS+=		desktop_gnome_font_rendering.schemas
@@ -36,6 +38,8 @@ GCONF_SCHEMAS+=		desktop_gnome_peripherals_touchpad.schemas
 GCONF_SCHEMAS+=		desktop_gnome_peripherals_smartcard.schemas
 PKGCONFIG_OVERRIDE+=	data/gnome-settings-daemon.pc.in
 
+.include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../x11/xkeyboard-config/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
@@ -44,8 +48,6 @@ BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../x11/gnome-desktop/buildlink3.mk"
-#BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.21.2
 .include "../../x11/gtk3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgnomekbd+=	libgnomekbd>=2.31.2
 .include "../../x11/libgnomekbd/buildlink3.mk"
@@ -53,7 +55,7 @@ BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=5.0
 .include "../../x11/libxklavier/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.15.4
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../x11/gnome-desktop3/buildlink3.mk"
+.include "../../wip/gnome-desktop3/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../sysutils/upower/buildlink3.mk"
@@ -64,5 +66,6 @@ BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.1
 .include "../../security/polkit/buildlink3.mk"
 .include "../../print/cups-base/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/gnome-settings-daemon/PLIST b/gnome-settings-daemon/PLIST
index 8a5dbae570..a71a3b5aa0 100644
--- a/gnome-settings-daemon/PLIST
+++ b/gnome-settings-daemon/PLIST
@@ -1,82 +1,49 @@
 @comment $NetBSD$
-include/gnome-settings-daemon-3.0/gnome-settings-daemon/gnome-settings-plugin.h
+etc/xdg/Xwayland-session.d/00-xrdb
+etc/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.UsbProtection.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
 include/gnome-settings-daemon-3.0/gnome-settings-daemon/gsd-enums.h
-lib/gnome-settings-daemon-3.0/a11y-keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/a11y-settings.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/color.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/datetime.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/liba11y-keyboard.la
-lib/gnome-settings-daemon-3.0/liba11y-settings.la
-lib/gnome-settings-daemon-3.0/libclipboard.la
-lib/gnome-settings-daemon-3.0/libcolor.la
-lib/gnome-settings-daemon-3.0/libdatetime.la
-lib/gnome-settings-daemon-3.0/libgsd.la
-lib/gnome-settings-daemon-3.0/libhousekeeping.la
-lib/gnome-settings-daemon-3.0/libkeyboard.la
-lib/gnome-settings-daemon-3.0/libmedia-keys.la
-lib/gnome-settings-daemon-3.0/libmouse.la
-lib/gnome-settings-daemon-3.0/libpower.la
-lib/gnome-settings-daemon-3.0/libprint-notifications.la
-lib/gnome-settings-daemon-3.0/libscreensaver-proxy.la
-lib/gnome-settings-daemon-3.0/libsharing.la
-lib/gnome-settings-daemon-3.0/libsound.la
-lib/gnome-settings-daemon-3.0/libxrandr.la
-lib/gnome-settings-daemon-3.0/libxsettings.la
-lib/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/power.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/screensaver-proxy.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/sharing.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/libgsd.so
 lib/pkgconfig/gnome-settings-daemon.pc
-libexec/gnome-settings-daemon
-libexec/gnome-settings-daemon-localeexec
-libexec/gsd-locate-pointer
+libexec/gsd-a11y-settings
+libexec/gsd-color
+libexec/gsd-datetime
+libexec/gsd-dummy
+libexec/gsd-housekeeping
+libexec/gsd-keyboard
+libexec/gsd-media-keys
+libexec/gsd-print-notifications
 libexec/gsd-printer
-libexec/gsd-test-a11y-keyboard
-libexec/gsd-test-a11y-settings
-libexec/gsd-test-datetime
-libexec/gsd-test-housekeeping
-libexec/gsd-test-input-helper
-libexec/gsd-test-keyboard
-libexec/gsd-test-media-keys
-libexec/gsd-test-mouse
-libexec/gsd-test-print-notifications
-libexec/gsd-test-screensaver-proxy
-libexec/gsd-test-sound
-libexec/gsd-test-xrandr
-libexec/gsd-test-xsettings
-man/man1/gnome-settings-daemon.1
+libexec/gsd-screensaver-proxy
+libexec/gsd-sharing
+libexec/gsd-sound
+libexec/gsd-usb-protection
+libexec/gsd-xsettings
 share/GConf/gsettings/gnome-settings-daemon.convert
 share/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml
 share/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
 share/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml
 share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
-share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.datetime.gschema.xml
 share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml
 share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml
-share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.keyboard.gschema.xml
 share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.media-keys.gschema.xml
-share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.orientation.gschema.xml
 share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml
-share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml
 share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml
-share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xrandr.gschema.xml
 share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml
-share/gnome-settings-daemon-3.0/input-device-example.sh
 share/gnome-settings-daemon/datetime/backward
-share/gnome/autostart/gnome-settings-daemon.desktop
-share/icons/hicolor/16x16/apps/gsd-xrandr.png
-share/icons/hicolor/22x22/apps/gsd-xrandr.png
-share/icons/hicolor/24x24/apps/gsd-xrandr.png
-share/icons/hicolor/32x32/apps/gsd-xrandr.png
-share/icons/hicolor/scalable/apps/gsd-xrandr.svg
 share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo
@@ -109,6 +76,7 @@ share/locale/eu/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/fa/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/fi/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/fr/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/fur/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ga/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/gd/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo
@@ -172,4 +140,3 @@ share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
-share/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
diff --git a/gnome-settings-daemon/distinfo b/gnome-settings-daemon/distinfo
index b82271997a..9e1610fdf8 100644
--- a/gnome-settings-daemon/distinfo
+++ b/gnome-settings-daemon/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.14 2015/11/04 01:32:15 agc Exp $
 
-SHA1 (gnome-settings-daemon-3.16.4.tar.xz) = 69fd3c2c5834da5face3c80025bbdea04a3a1428
-RMD160 (gnome-settings-daemon-3.16.4.tar.xz) = ef1af70a45345ee172422c10f59a1c0ae612ffdb
-SHA512 (gnome-settings-daemon-3.16.4.tar.xz) = 2833065ec2dd931fe287d7f7098f97cca8049303677609903318be207f6cc492a6bf78390a4c8e298dc006774fe0cd2aa4869ff4a1ac7e95ff495d1296620a82
-Size (gnome-settings-daemon-3.16.4.tar.xz) = 1605708 bytes
-SHA1 (patch-data_Makefile.in) = 3d5558ba2930ee238b7ff46618e70e9f5b3058b6
+SHA1 (gnome-settings-daemon-3.36.1.tar.xz) = 59668ceac43f847f38aad4bac1b55fdf066dea18
+RMD160 (gnome-settings-daemon-3.36.1.tar.xz) = 79f00768a1c410bb643a2d5b97fe2cd5fca05bf6
+SHA512 (gnome-settings-daemon-3.36.1.tar.xz) = f2f43d9b772589b6b4212ee2b0afe8be79d50a2e0473a960c7a7b9d379222bbe84ca548114d0a247810a094b4b3bf41e40ca91173c6cf552517dc63eb3750c88
+Size (gnome-settings-daemon-3.36.1.tar.xz) = 1415080 bytes
+SHA1 (patch-meson.build) = 771bfd9a94c691a4277f6a543b64c2fabf2a63aa
+SHA1 (patch-plugins_meson.build) = 54cc3f9d12ab6fa72e5a1e87b998e5c71db4aae3
diff --git a/gnome-settings-daemon/patches/patch-data_Makefile.in b/gnome-settings-daemon/patches/patch-data_Makefile.in
deleted file mode 100644
index b3ffba4e5d..0000000000
--- a/gnome-settings-daemon/patches/patch-data_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- data/Makefile.in.orig	2015-11-13 14:00:20.000000000 +0000
-+++ data/Makefile.in
-@@ -418,7 +418,7 @@ gsettings_SCHEMAS = \
- 
- convertdir = $(datadir)/GConf/gsettings
- convert_DATA = gnome-settings-daemon.convert
--desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(datadir)/gnome/autostart
- desktop_in_files = gnome-settings-daemon.desktop.in.in
- desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
- pkgconfigdir = $(libdir)/pkgconfig
diff --git a/gnome-settings-daemon/patches/patch-meson.build b/gnome-settings-daemon/patches/patch-meson.build
new file mode 100644
index 0000000000..e147bb8ff6
--- /dev/null
+++ b/gnome-settings-daemon/patches/patch-meson.build
@@ -0,0 +1,61 @@
+$NetBSD$
+
+--- meson.build.orig	2020-04-29 22:04:41.202864200 +0000
++++ meson.build
+@@ -118,7 +118,6 @@ m_dep = cc.find_library('m')
+ 
+ # ALSA integration (default enabled)
+ enable_alsa = get_option('alsa')
+-assert(enable_alsa or not host_is_linux, 'ALSA is not optional on Linux platforms')
+ 
+ libgvc = subproject(
+   'gvc',
+@@ -135,9 +134,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
+ 
+ has_timerfd_create = cc.has_function('timerfd_create')
+ config_h.set10('HAVE_TIMERFD', has_timerfd_create)
+@@ -151,8 +147,7 @@ if enable_wayland
+ endif
+ config_h.set10('HAVE_WAYLAND', enable_wayland)
+ 
+-# wacom (disabled for s390/s390x and non Linux platforms)
+-enable_wacom = host_is_linux_not_s390
++enable_wacom = false
+ if enable_wacom
+   assert(enable_gudev, 'GUDev support is required for wacom support.')
+   libwacom_dep = dependency('libwacom', version: '>= 0.7')
+@@ -177,7 +172,6 @@ if enable_cups
+   assert(cups_dep.found(), 'CUPS 1.4 or newer not found')
+ 
+   # FIXME: 1.6 cflags generate a lot of errors
+-  '''
+   cups_cflags = []
+   if cups_dep.version().version_compare('>= 1.6')
+     cups_cflags += '-D_PPD_DEPRECATED=""'
+@@ -187,12 +181,10 @@ if enable_cups
+     dependencies: cups_dep,
+     compile_args: cups_cflags
+   )
+-  '''
+ 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')
+@@ -212,7 +204,6 @@ endif
+ 
+ # Sharing plugin
+ enable_network_manager = get_option('network_manager')
+-assert(enable_network_manager or not host_is_linux, 'NetworkManager support is not optional on Linux platforms')
+ if enable_network_manager
+   # network manager
+   libnm_dep = dependency('libnm', version: '>= 1.0')
diff --git a/gnome-settings-daemon/patches/patch-plugins_meson.build b/gnome-settings-daemon/patches/patch-plugins_meson.build
new file mode 100644
index 0000000000..c7385b1c78
--- /dev/null
+++ b/gnome-settings-daemon/patches/patch-plugins_meson.build
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- plugins/meson.build.orig	2020-04-29 22:04:41.239865300 +0000
++++ plugins/meson.build
+@@ -3,7 +3,6 @@ enabled_plugins = [
+   ['color', 'Color', ''],
+   ['datetime', 'Datetime'],
+   ['dummy', ''],
+-  ['power', 'Power'],
+   ['housekeeping', 'Housekeeping'],
+   ['keyboard', 'Keyboard'],
+   ['media-keys', 'MediaKeys'],