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

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnome-settings-daemon: Update wip/gnome-settings-daemon to 47.2
From: Dan Cîrnaț (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sat, 14 Dec 2024 09:19:41 +0000
Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Sat Dec 14 10:19:24 2024 +0100
Changeset:	36038977f1a56d80c94378224a12400cdf6c5e33

Modified Files:
	gnome-settings-daemon/Makefile
	gnome-settings-daemon/PLIST
	gnome-settings-daemon/buildlink3.mk
	gnome-settings-daemon/distinfo
Added Files:
	gnome-settings-daemon/TODO
Removed Files:
	gnome-settings-daemon/patches/patch-meson.build
	gnome-settings-daemon/patches/patch-plugins_xsettings_meson.build

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

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

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

diffstat:
 gnome-settings-daemon/Makefile                     | 30 ++++++++-----
 gnome-settings-daemon/PLIST                        | 12 ++++-
 gnome-settings-daemon/TODO                         |  1 +
 gnome-settings-daemon/buildlink3.mk                |  2 +-
 gnome-settings-daemon/distinfo                     |  6 +--
 gnome-settings-daemon/patches/patch-meson.build    | 51 ----------------------
 .../patches/patch-plugins_xsettings_meson.build    | 15 -------
 7 files changed, 35 insertions(+), 82 deletions(-)

diffs:
diff --git a/gnome-settings-daemon/Makefile b/gnome-settings-daemon/Makefile
index 934536b146..1250af50e7 100644
--- a/gnome-settings-daemon/Makefile
+++ b/gnome-settings-daemon/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.84 2021/09/29 19:01:20 adam Exp $
 
-DISTNAME=	gnome-settings-daemon-40.0.1
-PKGREVISION=	1
+DISTNAME=	gnome-settings-daemon-47.2
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/40/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/47/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -20,15 +19,18 @@ CONFLICTS+=	gnome-control-center<2.22.0
 
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/gnome-settings-daemon-40
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
 MESON_ARGS+=		-Drfkill=false
 MESON_ARGS+=		-Dnetwork_manager=false
+.endif
+
 MESON_ARGS+=		-Dsystemd=false
 MESON_ARGS+=		-Dwayland=false
 MESON_ARGS+=		-Dsmartcard=false
 MESON_ARGS+=		-Dwwan=false
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${OPSYS} != "Linux"
 MESON_ARGS+=		-Dalsa=false
 MESON_ARGS+=		-Dgudev=false
@@ -37,6 +39,12 @@ MESON_ARGS+=		-Dgudev=false
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
 PKGCONFIG_OVERRIDE+=		output/meson-private/gnome-settings-daemon.pc
 
+PYTHON_FOR_BUILD_ONLY=	tool
+
+post-install:
+	${MKDIR} ${DESTDIR}${PREFIX}/share/examples
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/xdg ${DESTDIR}${PREFIX}/share/examples/
+
 CONF_FILES+=	${PREFIX}/share/examples/xdg/Xwayland-session.d/00-xrdb \
 		${PKG_SYSCONFDIR}/xdg/Xwayland-session.d/00-xrdb
 CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop \
@@ -79,29 +87,31 @@ PYTHON_FOR_BUILD_ONLY=	tool
 .if ${OPSYS} == "Linux"
 .include "../../wip/libgudev/buildlink3.mk"
 .include "../../audio/alsa-lib/buildlink3.mk"
+.include "../../wip/libwacom/buildlink3.mk"
+.include "../../wip/NetworkManager/buildlink3.mk"
 .endif
 .include "../../wip/mk/libseccomp.buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/dconf/buildlink3.mk"
-.include "../../devel/libgweather/buildlink3.mk"
+.include "../../wip/libgweather4/buildlink3.mk"
 .include "../../geography/geoclue/buildlink3.mk"
 .include "../../geography/geocode-glib/buildlink3.mk"
-.include "../../graphics/colord/buildlink3.mk"
+.include "../../wip/colord/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../print/libcups/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.15.4
-.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=47.0
+.include "../../wip/gsettings-desktop-schemas/buildlink3.mk"
 .include "../../security/polkit/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/upower/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
-.include "../../x11/gnome-desktop3/buildlink3.mk"
+.include "../../wip/gnome-desktop4/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gnome-settings-daemon/PLIST b/gnome-settings-daemon/PLIST
index d9aefc9faf..d3c74e3cbf 100644
--- a/gnome-settings-daemon/PLIST
+++ b/gnome-settings-daemon/PLIST
@@ -1,7 +1,8 @@
 @comment $NetBSD$
-include/gnome-settings-daemon-40/gnome-settings-daemon/gsd-enums.h
-lib/gnome-settings-daemon-40/libgsd.so
+include/gnome-settings-daemon-47/gnome-settings-daemon/gsd-enums.h
+lib/gnome-settings-daemon-47/libgsd.so
 lib/pkgconfig/gnome-settings-daemon.pc
+lib/udev/rules.d/61-gnome-settings-daemon-rfkill.rules
 libexec/gsd-a11y-settings
 libexec/gsd-backlight-helper
 libexec/gsd-color
@@ -12,10 +13,13 @@ libexec/gsd-media-keys
 libexec/gsd-power
 libexec/gsd-print-notifications
 libexec/gsd-printer
+libexec/gsd-rfkill
 libexec/gsd-screensaver-proxy
 libexec/gsd-sharing
 libexec/gsd-sound
 libexec/gsd-usb-protection
+libexec/gsd-wacom
+libexec/gsd-wacom-oled-helper
 libexec/gsd-xsettings
 share/GConf/gsettings/gnome-settings-daemon.convert
 share/examples/xdg/Xwayland-session.d/00-xrdb
@@ -47,6 +51,7 @@ share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.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.xsettings.gschema.xml
 share/gnome-settings-daemon/datetime/backward
+share/locale/ab/LC_MESSAGES/gnome-settings-daemon.mo
 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
@@ -94,6 +99,7 @@ share/locale/is/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/it/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ja/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ka/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/kab/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/kk/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/km/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/kn/LC_MESSAGES/gnome-settings-daemon.mo
@@ -145,3 +151,5 @@ 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
+share/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy
+@pkgdir etc
diff --git a/gnome-settings-daemon/TODO b/gnome-settings-daemon/TODO
new file mode 100644
index 0000000000..5a9d64ae31
--- /dev/null
+++ b/gnome-settings-daemon/TODO
@@ -0,0 +1 @@
+* missing library errors when PKG_DEVELOPER=yes
diff --git a/gnome-settings-daemon/buildlink3.mk b/gnome-settings-daemon/buildlink3.mk
index 0aca7c3582..d098b5c590 100644
--- a/gnome-settings-daemon/buildlink3.mk
+++ b/gnome-settings-daemon/buildlink3.mk
@@ -7,7 +7,7 @@ GNOME_SETTINGS_DAEMON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-settings-daemon+=	gnome-settings-daemon>=3.16.0
 BUILDLINK_ABI_DEPENDS.gnome-settings-daemon+=	gnome-settings-daemon>=3.16.1nb13
-BUILDLINK_PKGSRCDIR.gnome-settings-daemon?=	../../sysutils/gnome-settings-daemon
+BUILDLINK_PKGSRCDIR.gnome-settings-daemon?=	../../wip/gnome-settings-daemon
 .endif # GNOME_SETTINGS_DAEMON_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnome-settings-daemon
diff --git a/gnome-settings-daemon/distinfo b/gnome-settings-daemon/distinfo
index 243264796c..cf6c487bd5 100644
--- a/gnome-settings-daemon/distinfo
+++ b/gnome-settings-daemon/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.19 2021/11/17 09:43:03 cirnatdan Exp $
 
-BLAKE2s (gnome-settings-daemon-40.0.1.tar.xz) = 9e11f4977a112af78602cee7c61ca618e80c183c6173b5e0c5e8bf47e1ac055c
-SHA512 (gnome-settings-daemon-40.0.1.tar.xz) = d5b7235e097baded66cbbc2c4f05effcac722daa09413f495368555ad97830746415c4c8f1ecfe54dac262f3b75ab1a83863dc4b736b9854dcf86c94c14edd79
-Size (gnome-settings-daemon-40.0.1.tar.xz) = 1443100 bytes
+BLAKE2s (gnome-settings-daemon-47.2.tar.xz) = d8af8c2137b9ea21119ec924e711495e071c7fb079faf964881ed8901c4f6471
+SHA512 (gnome-settings-daemon-47.2.tar.xz) = fd3e358aa1f6a317dc49436965135dde204bd55fee9c96127d1208aafb60af3667fcc344a1667be1596892987f67ebab3fc7eefaeeefce82e1c65635e36c126f
+Size (gnome-settings-daemon-47.2.tar.xz) = 1480428 bytes
 SHA1 (patch-meson.build) = b30c456bb328f6d10f57f8e89fc018d9050b9e51
 SHA1 (patch-plugins_xsettings_meson.build) = 38fbf05aec12262ad7a3528a98ace9af19b7e828
diff --git a/gnome-settings-daemon/patches/patch-meson.build b/gnome-settings-daemon/patches/patch-meson.build
deleted file mode 100644
index 8f8d415b19..0000000000
--- a/gnome-settings-daemon/patches/patch-meson.build
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-meson.build,v 1.1 2020/11/10 01:21:24 nia Exp $
-
-Install config files to examples.
-
---- meson.build.orig	2021-04-14 14:55:00.460781800 +0000
-+++ meson.build
-@@ -23,7 +23,7 @@ gsd_includedir = join_paths(gsd_prefix,
- gsd_libdir = join_paths(gsd_prefix, get_option('libdir'))
- gsd_libexecdir = join_paths(gsd_prefix, get_option('libexecdir'))
- gsd_localedir = join_paths(gsd_prefix, get_option('localedir'))
--gsd_sysconfdir = join_paths(gsd_prefix, get_option('sysconfdir'))
-+gsd_sysconfdir = join_paths(gsd_prefix, get_option('datadir'), 'examples')
- 
- gsd_pkgdatadir = join_paths(gsd_datadir, meson.project_name())
- gsd_pkgincludedir = join_paths(gsd_includedir, gsd_api_name)
-@@ -84,7 +84,7 @@ endif
- 
- # Workaround for meson's bug
- # https://github.com/mesonbuild/meson/pull/1896
--if get_option('b_ndebug') == true
-+if get_option('b_ndebug') == 'true'
-   common_flags += ['-DG_DISABLE_ASSERT']
- endif
- 
-@@ -156,7 +156,7 @@ 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 #host_is_linux_not_s390
- if enable_wacom
-   assert(enable_gudev, 'GUDev support is required for wacom support.')
-   libwacom_dep = dependency('libwacom', version: '>= 0.7')
-@@ -198,7 +198,7 @@ endif
- 
- # Rfkill
- enable_rfkill = get_option('rfkill')
--assert(enable_rfkill or not host_is_linux, 'rfkill is not optional on Linux platforms')
-+#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')
-@@ -218,7 +218,7 @@ 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')
-+#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_xsettings_meson.build b/gnome-settings-daemon/patches/patch-plugins_xsettings_meson.build
deleted file mode 100644
index 8f3c208315..0000000000
--- a/gnome-settings-daemon/patches/patch-plugins_xsettings_meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-plugins_xsettings_meson.build,v 1.1 2020/11/10 01:21:24 nia Exp $
-
-Install config files to examples.
-
---- plugins/xsettings/meson.build.orig	2020-10-08 20:37:58.241902000 +0000
-+++ plugins/xsettings/meson.build
-@@ -48,7 +48,7 @@ endforeach
- 
- install_data(
-   files('00-xrdb'),
--  install_dir: join_paths(gsd_sysconfdir, 'xdg/Xwayland-session.d')
-+  install_dir: join_paths(get_option('datadir'), 'examples/xdg/Xwayland-session.d')
- )
- 
- test_py = find_program('test.py')
Prev by Date: NetworkManager: Import NetworkManager-1.50.0 as wip/NetworkManager
Next by Date: gnome-settings-daemon: pkglint
Previous by Thread: NetworkManager: Import NetworkManager-1.50.0 as wip/NetworkManager
Next by Thread: gnome-settings-daemon: pkglint
Indexes:
Home | Main Index | Thread Index | Old Index