pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnome-settings-daemon: Remove unnecessary patches/dependencies.



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Tue Nov 10 01:57:45 2020 +0100
Changeset:	d361f5eb6eac7df61d040c0f9c8ad508a8cfa94c

Modified Files:
	gnome-settings-daemon/Makefile
	gnome-settings-daemon/buildlink3.mk
	gnome-settings-daemon/distinfo
Removed Files:
	gnome-settings-daemon/patches/patch-plugins_meson.build

Log Message:
gnome-settings-daemon: Remove unnecessary patches/dependencies.

Fix pkgconfig override path.

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

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

diffstat:
 gnome-settings-daemon/Makefile                          | 10 +++-------
 gnome-settings-daemon/buildlink3.mk                     |  2 --
 gnome-settings-daemon/distinfo                          |  1 -
 gnome-settings-daemon/patches/patch-plugins_meson.build |  0
 4 files changed, 3 insertions(+), 10 deletions(-)

diffs:
diff --git a/gnome-settings-daemon/Makefile b/gnome-settings-daemon/Makefile
index 3fea8c8fa8..2272443829 100644
--- a/gnome-settings-daemon/Makefile
+++ b/gnome-settings-daemon/Makefile
@@ -27,10 +27,11 @@ MESON_ARGS+=		-Dsmartcard=false
 MESON_ARGS+=		-Dwwan=false
 MESON_ARGS+=		-Dalsa=false
 
-PKGCONFIG_OVERRIDE+=	data/gnome-settings-daemon.pc.in
-
 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
+
 .include "../../devel/meson/build.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
@@ -54,9 +55,4 @@ BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.1
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../x11/gnome-desktop3/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/libgnomekbd/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=5.0
-.include "../../x11/libxklavier/buildlink3.mk"
-.include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/xkeyboard-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gnome-settings-daemon/buildlink3.mk b/gnome-settings-daemon/buildlink3.mk
index 879cff098e..1bb76c531a 100644
--- a/gnome-settings-daemon/buildlink3.mk
+++ b/gnome-settings-daemon/buildlink3.mk
@@ -8,8 +8,6 @@ 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?=	../../wip/gnome-settings-daemon
-
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .endif # GNOME_SETTINGS_DAEMON_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnome-settings-daemon
diff --git a/gnome-settings-daemon/distinfo b/gnome-settings-daemon/distinfo
index 638bf3ea22..fa3485ce39 100644
--- a/gnome-settings-daemon/distinfo
+++ b/gnome-settings-daemon/distinfo
@@ -4,4 +4,3 @@ 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-plugins_meson.build) = da39a3ee5e6b4b0d3255bfef95601890afd80709
diff --git a/gnome-settings-daemon/patches/patch-plugins_meson.build b/gnome-settings-daemon/patches/patch-plugins_meson.build
deleted file mode 100644
index e69de29bb2..0000000000


Home | Main Index | Thread Index | Old Index