pkgsrc-Changes archive

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

CVS commit: pkgsrc/sysutils/dbus



Module Name:    pkgsrc
Committed By:   nros
Date:           Sat Nov 21 11:14:34 UTC 2026

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

Log Message:
dbus: resurrect jperkins fixes for dbus
The only difference is that epoll checking
now works without patching.
Console owner file is supported on Illumos
as well as Solaris.


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 pkgsrc/sysutils/dbus/Makefile
cvs rdiff -u -r1.108 -r1.109 pkgsrc/sysutils/dbus/distinfo
cvs rdiff -u -r1.4 -r1.5 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.150 pkgsrc/sysutils/dbus/Makefile:1.151
--- pkgsrc/sysutils/dbus/Makefile:1.150 Fri Nov 13 08:10:39 2026
+++ pkgsrc/sysutils/dbus/Makefile       Sat Nov 21 11:14:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.150 2026/11/13 08:10:39 wiz Exp $
+# $NetBSD: Makefile,v 1.151 2026/11/21 11:14:33 nros Exp $
 
 DISTNAME=      dbus-1.16.4
 CATEGORIES=    sysutils
@@ -48,8 +48,7 @@ SUBST_SED.docbook=    -e 's,http://www.oasi
 
 .if ${OPSYS} == "SunOS"
 MESON_ARGS+=           -Dinotify=disabled
-# Solaris only, not for Illumos - how to enable it there?
-#MESON_ARGS+=          -Dsolaris_console_owner_file="/dev/vt/console_user"
+MESON_ARGS+=           -Dsolaris_console_owner_file="/dev/vt/console_user"
 .endif
 
 DBUS_CONF_DIR=         ${PKG_SYSCONFBASE}/dbus-1

Index: pkgsrc/sysutils/dbus/distinfo
diff -u pkgsrc/sysutils/dbus/distinfo:1.108 pkgsrc/sysutils/dbus/distinfo:1.109
--- pkgsrc/sysutils/dbus/distinfo:1.108 Fri Nov 20 20:48:18 2026
+++ pkgsrc/sysutils/dbus/distinfo       Sat Nov 21 11:14:34 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.108 2026/11/20 20:48:18 nros Exp $
+$NetBSD: distinfo,v 1.109 2026/11/21 11:14:34 nros Exp $
 
 BLAKE2s (dbus-1.16.4.tar.xz) = 96239ce3f7e2f869ae81541deed2d658fb6c3cc73762d2ca7ae04e8c7519c9c4
 SHA512 (dbus-1.16.4.tar.xz) = edcd1102184e4a81da905a7a554531bcba74d4e037240c27b3cf1af8ed308df6ae6182fd8af0c98894c56b6d24100787893d6a86e430f4077c23c8a3a5f530a2
 Size (dbus-1.16.4.tar.xz) = 1124660 bytes
 SHA1 (patch-bus_meson.build) = e815474ffeb4ee7086121746174de6d220290347
-SHA1 (patch-meson.build) = 425c6666b3cb7a2d41808f62e806b8e5f0b229b5
+SHA1 (patch-meson.build) = 118f15950d1f04eaa28f8ae21f9907d49afec405
 SHA1 (patch-tools_meson.build) = 1199df4b4d73cf32278a359c94f3bef8d1d34a51

Index: pkgsrc/sysutils/dbus/patches/patch-meson.build
diff -u pkgsrc/sysutils/dbus/patches/patch-meson.build:1.4 pkgsrc/sysutils/dbus/patches/patch-meson.build:1.5
--- pkgsrc/sysutils/dbus/patches/patch-meson.build:1.4  Fri Nov 20 20:48:19 2026
+++ pkgsrc/sysutils/dbus/patches/patch-meson.build      Sat Nov 21 11:14:34 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-meson.build,v 1.4 2026/11/20 20:48:19 nros Exp $
+$NetBSD: patch-meson.build,v 1.5 2026/11/21 11:14:34 nros Exp $
 
-* Treat Illumos like solaris
+* The real identifier for Solaris/Illumos is "sunos" not "solaris"
 * The space before the -D_XOPEN_SOURCE=500 causes the compile test
   for it to fail somehow, causing the argument to not get added to
   the compile line
@@ -12,7 +12,7 @@ $NetBSD: patch-meson.build,v 1.4 2026/11
  compile_args += ['-fno-strict-aliasing']
  
 -if host_os.contains('solaris')
-+if host_os.contains('solaris') or host_os.contains('sunos')
++if host_os.contains('sunos')
      compile_args += [
          # Solaris' C library apparently needs these runes to be threadsafe...
          '-D_POSIX_PTHREAD_SEMANTICS',
@@ -24,3 +24,23 @@ $NetBSD: patch-meson.build,v 1.4 2026/11
      ]
  endif
  
+@@ -548,8 +548,8 @@ 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')
+-    error('solaris_console_owner_file is only supported on Solaris)')
++  if not host_os.contains('sunos')
++    error('solaris_console_owner_file is only supported on Solaris/Illumos)')
+   endif
+   have_console_owner_file = true
+   if console_owner_file == 'auto'
+@@ -1395,7 +1395,7 @@ summary_dict += {
+     'Tests socket dir':         test_socket_dir,
+ }
+ 
+-if host_os.contains('solaris')
++if host_os.contains('sunos')
+   summary_dict += {
+       'Console owner file': console_owner_file,
+   }



Home | Main Index | Thread Index | Old Index