pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnome-settings-daemon: misc. delinting

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Tue Nov 10 02:13:53 2020 +0100
Changeset:	52562c658aec03d1667124ba9b9ebf6db5b78674

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_xsettings_meson.build

Log Message:
gnome-settings-daemon: misc. delinting

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

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

diffstat:
 gnome-settings-daemon/Makefile                     | 48 +++++++++++++++++++---
 gnome-settings-daemon/PLIST                        | 36 ++++++++--------
 gnome-settings-daemon/distinfo                     |  2 +
 gnome-settings-daemon/patches/patch-meson.build    | 15 +++++++
 .../patches/patch-plugins_xsettings_meson.build    | 15 +++++++
 5 files changed, 92 insertions(+), 24 deletions(-)

diffs:
diff --git a/gnome-settings-daemon/Makefile b/gnome-settings-daemon/Makefile
index 2272443829..d8bb30e7f7 100644
--- a/gnome-settings-daemon/Makefile
+++ b/gnome-settings-daemon/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.54 2015/04/25 14:24:52 tnn Exp $
 
 DISTNAME=	gnome-settings-daemon-3.38.1
-CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/3.38/}
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -13,11 +13,12 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 TOOL_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config msgfmt perl
+USE_TOOLS+=	pkg-config msgfmt xgettext perl
 
 CONFLICTS+=	gnome-control-center<2.22.0
 
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/gnome-settings-daemon-3.0
+
 MESON_ARGS+=		-Dgudev=false
 MESON_ARGS+=		-Drfkill=false
 MESON_ARGS+=		-Dnetwork_manager=false
@@ -27,11 +28,46 @@ MESON_ARGS+=		-Dsmartcard=false
 MESON_ARGS+=		-Dwwan=false
 MESON_ARGS+=		-Dalsa=false
 
-LDFLAGS+=       ${COMPILER_RPATH_FLAG}${PREFIX}/lib/gnome-settings-daemon-3.0
-
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
 PKGCONFIG_OVERRIDE+=		output/meson-private/gnome-settings-daemon.pc
 
+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 \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.UsbProtection.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.UsbProtection.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
+
 .include "../../devel/meson/build.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
diff --git a/gnome-settings-daemon/PLIST b/gnome-settings-daemon/PLIST
index c17463448f..9caff04c4d 100644
--- a/gnome-settings-daemon/PLIST
+++ b/gnome-settings-daemon/PLIST
@@ -1,22 +1,4 @@
 @comment $NetBSD$
-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.Power.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.Wwan.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/libgsd.so
 lib/pkgconfig/gnome-settings-daemon.pc
@@ -35,6 +17,24 @@ libexec/gsd-sound
 libexec/gsd-usb-protection
 libexec/gsd-xsettings
 share/GConf/gsettings/gnome-settings-daemon.convert
+share/examples/xdg/Xwayland-session.d/00-xrdb
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.UsbProtection.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop
+share/examples/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
 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
diff --git a/gnome-settings-daemon/distinfo b/gnome-settings-daemon/distinfo
index fa3485ce39..e01908f076 100644
--- a/gnome-settings-daemon/distinfo
+++ b/gnome-settings-daemon/distinfo
@@ -4,3 +4,5 @@ SHA1 (gnome-settings-daemon-3.38.1.tar.xz) = ca9f25f0609192fab5dff73d93fea3256e1
 RMD160 (gnome-settings-daemon-3.38.1.tar.xz) = f6135eb43315eeae8c129cc4d5df233817b93d94
 SHA512 (gnome-settings-daemon-3.38.1.tar.xz) = b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd
 Size (gnome-settings-daemon-3.38.1.tar.xz) = 1437096 bytes
+SHA1 (patch-meson.build) = ed5b0c7bec805fec149080a2bf21fe39fae339e2
+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
new file mode 100644
index 0000000000..b29f458485
--- /dev/null
+++ b/gnome-settings-daemon/patches/patch-meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Install config files to examples.
+
+--- meson.build.orig	2020-10-08 20:37:58.145899300 +0000
++++ meson.build
+@@ -25,7 +25,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)
diff --git a/gnome-settings-daemon/patches/patch-plugins_xsettings_meson.build b/gnome-settings-daemon/patches/patch-plugins_xsettings_meson.build
new file mode 100644
index 0000000000..85b6f7d671
--- /dev/null
+++ b/gnome-settings-daemon/patches/patch-plugins_xsettings_meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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')
Home | Main Index | Thread Index | Old Index