pkgsrc-WIP-changes archive

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

dbus: fix linking on Darwin



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Sun May 18 11:01:18 2025 +0200
Changeset:	845d6770140852ea77b5d362ba8929c2e5ce755c

Modified Files:
	dbus/distinfo
Added Files:
	dbus/patches/patch-bus_meson.build
	dbus/patches/patch-tools_meson.build

Log Message:
dbus: fix linking on Darwin

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

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

diffstat:
 dbus/distinfo                        |  2 ++
 dbus/patches/patch-bus_meson.build   | 24 ++++++++++++++++++++++++
 dbus/patches/patch-tools_meson.build | 15 +++++++++++++++
 3 files changed, 41 insertions(+)

diffs:
diff --git a/dbus/distinfo b/dbus/distinfo
index 0ba476b1a3..ec1b13250e 100644
--- a/dbus/distinfo
+++ b/dbus/distinfo
@@ -3,3 +3,5 @@ $NetBSD: distinfo,v 1.103 2023/09/03 18:31:52 pin Exp $
 BLAKE2s (dbus-1.16.2.tar.xz) = 3c0a3f816ad77f1866671498bd9d505deb81310149faefb28916b0910f27bee1
 SHA512 (dbus-1.16.2.tar.xz) = 5c26f52d85984bb9ae1dde8d7e73921eacbdf020a61ff15f00a4c240cb38a121553ee04bd66e62b28425ff9bc50f4f5e15135166573ac0888332a01a0db1faa2
 Size (dbus-1.16.2.tar.xz) = 1115644 bytes
+SHA1 (patch-bus_meson.build) = e815474ffeb4ee7086121746174de6d220290347
+SHA1 (patch-tools_meson.build) = 1199df4b4d73cf32278a359c94f3bef8d1d34a51
diff --git a/dbus/patches/patch-bus_meson.build b/dbus/patches/patch-bus_meson.build
new file mode 100644
index 0000000000..016bea0075
--- /dev/null
+++ b/dbus/patches/patch-bus_meson.build
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Explicitly link against libdbus to avoid @rpath in executables on Darwin.
+
+--- bus/meson.build.orig	2025-05-18 08:46:07.973006923 +0000
++++ bus/meson.build
+@@ -137,7 +137,7 @@ libdbus_daemon_internal = static_library
+ dbus_daemon = executable('dbus-daemon',
+     'main.c',
+     include_directories: root_include,
+-    link_with: libdbus_daemon_internal,
++    link_with: [libdbus, libdbus_daemon_internal],
+     install: true,
+ )
+ 
+@@ -177,7 +177,7 @@ if platform_unix and use_traditional_act
+     dbus_daemon_launch_helper = executable('dbus-daemon-launch-helper',
+         dbus_daemon_launch_helper_sources,
+         include_directories: root_include,
+-        link_with: liblaunch_helper_internal,
++        link_with: [libdbus, liblaunch_helper_internal],
+         install: true,
+         install_dir: get_option('libexecdir'),
+     )
diff --git a/dbus/patches/patch-tools_meson.build b/dbus/patches/patch-tools_meson.build
new file mode 100644
index 0000000000..1755a22900
--- /dev/null
+++ b/dbus/patches/patch-tools_meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Explicitly link against libdbus to avoid @rpath in executables on Darwin.
+
+--- tools/meson.build.orig	2025-05-18 08:54:08.689176730 +0000
++++ tools/meson.build
+@@ -63,7 +63,7 @@ if message_bus
+         'dbus-run-session.c',
+         'tool-common.c',
+         include_directories: root_include,
+-        link_with: libdbus_internal,
++        link_with: [libdbus, libdbus_internal],
+         install: true,
+     )
+ endif


Home | Main Index | Thread Index | Old Index