CVS commit: pkgsrc/sysutils/dbus

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Aug  7 09:33:05 UTC 2025

Modified Files:
        pkgsrc/sysutils/dbus: Makefile distinfo
        pkgsrc/sysutils/dbus/patches: patch-meson.build

Log Message:
dbus: Fix SunOS fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 pkgsrc/sysutils/dbus/Makefile
cvs rdiff -u -r1.105 -r1.106 pkgsrc/sysutils/dbus/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/dbus/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/sysutils/dbus/Makefile
diff -u pkgsrc/sysutils/dbus/Makefile:1.141 pkgsrc/sysutils/dbus/Makefile:1.142
--- pkgsrc/sysutils/dbus/Makefile:1.141 Sat Aug  2 05:04:27 2025
+++ pkgsrc/sysutils/dbus/Makefile       Thu Aug  7 09:33:05 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2025/08/02 05:04:27 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2025/08/07 09:33:05 jperkin Exp $
 
 DISTNAME=      dbus-1.16.2
 PKGREVISION=   1
@@ -40,7 +40,7 @@ MESON_ARGS+=          -Dsystem_socket=${VARBASE}
 MESON_ARGS+=           -Dsystem_pid_file=${VARBASE}/run/dbus/pid
 MESON_ARGS+=           -Ddoxygen_docs=disabled
 
-LDFLAGS.SunOS+=                -lnsl
+LDFLAGS.SunOS+=                -lsocket -lnsl
 
 SUBST_CLASSES+=                docbook
 SUBST_STAGE.docbook=   pre-configure

Index: pkgsrc/sysutils/dbus/distinfo
diff -u pkgsrc/sysutils/dbus/distinfo:1.105 pkgsrc/sysutils/dbus/distinfo:1.106
--- pkgsrc/sysutils/dbus/distinfo:1.105 Sat Aug  2 05:16:29 2025
+++ pkgsrc/sysutils/dbus/distinfo       Thu Aug  7 09:33:05 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.105 2025/08/02 05:16:29 wiz Exp $
+$NetBSD: distinfo,v 1.106 2025/08/07 09:33:05 jperkin 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-meson.build) = b81435e50a287cd327ff50e2f380dcdaabae05e1
+SHA1 (patch-meson.build) = d8713c596b35b8406a2ec68dda908d54abc191bc
 SHA1 (patch-tools_meson.build) = 1199df4b4d73cf32278a359c94f3bef8d1d34a51

Index: pkgsrc/sysutils/dbus/patches/patch-meson.build
diff -u pkgsrc/sysutils/dbus/patches/patch-meson.build:1.1 pkgsrc/sysutils/dbus/patches/patch-meson.build:1.2
--- pkgsrc/sysutils/dbus/patches/patch-meson.build:1.1  Sat Aug  2 05:16:29 2025
+++ pkgsrc/sysutils/dbus/patches/patch-meson.build      Thu Aug  7 09:33:05 2025
@@ -1,24 +1,41 @@
-$NetBSD: patch-meson.build,v 1.1 2025/08/02 05:16:29 wiz Exp $
+$NetBSD: patch-meson.build,v 1.2 2025/08/07 09:33:05 jperkin Exp $
 
 Handle Illumos like Solaris.
 
 --- meson.build.orig   2025-02-27 16:29:06.000000000 +0000
 +++ meson.build
-@@ -171,7 +171,7 @@ compile_args = [
+@@ -171,14 +171,14 @@ compile_args = [
  # See https://gitlab.freedesktop.org/dbus/dbus/-/issues/4
  compile_args += ['-fno-strict-aliasing']
  
 -if host_os.contains('solaris')
-+if host_os.contains('solaris') or host_os.contains('illumos')
++if host_os.contains('sunos')
      compile_args += [
          # Solaris' C library apparently needs these runes to be threadsafe...
          '-D_POSIX_PTHREAD_SEMANTICS',
+         # ... this opt-in to get sockaddr_in6 and sockaddr_storage...
+         '-D__EXTENSIONS__',
+         # ... and this opt-in to get file descriptor passing support
+-        ' -D_XOPEN_SOURCE=500',
++        '-D_XOPEN_SOURCE=600',
+     ]
+ endif
+ 
+@@ -429,7 +429,7 @@ else
+     endif
+ endif
+ 
+-if get_option('epoll').disabled()
++if get_option('epoll').disabled() or host_os.contains('sunos')
+     use_linux_epoll = false
+ else
+     use_linux_epoll = (
 @@ -532,7 +532,7 @@ endif
  have_console_owner_file = false
  console_owner_file = get_option('solaris_console_owner_file')
  if console_owner_file != ''
 -  if not host_os.contains('solaris')
-+  if not host_os.contains('solaris') and not host_os.contains('illumos')
++  if not host_os.contains('sunos')
      error('solaris_console_owner_file is only supported on Solaris)')
    endif
    have_console_owner_file = true
@@ -27,7 +44,7 @@ Handle Illumos like Solaris.
  }
  
 -if host_os.contains('solaris')
-+if host_os.contains('solaris') or host_os.contains('illumos')
++if host_os.contains('sunos')
    summary_dict += {
        'Console owner file': console_owner_file,
    }