Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 utils/dbus/BUILD                                                          |  
 31 +---
 utils/dbus/CONFIGURE                                                      |  
  4 
 utils/dbus/DEPENDS                                                        |  
 40 ------
 utils/dbus/DETAILS                                                        |  
  4 
 utils/dbus/HISTORY                                                        |  
  6 
 utils/dbus/INSTALL                                                        |  
  6 
 utils/dbus/PRE_BUILD                                                      |  
 10 -
 utils/dbus/patches-1.14/dbus-1.14.0-enable-elogind-dbus-userdb-util.patch |  
 23 ---
 utils/dbus/patches-1.15/dbus-1.15.8-enable-elogind.patch                  |  
 65 ----------
 utils/dbus/patches/dbus-enable-elogind.patch                              |  
 54 --------
 10 files changed, 19 insertions(+), 224 deletions(-)

New commits:
commit 472781d07f3d83eac2f3ba432cc2f405d76e8a5e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    utils/dbus: version 1.16.0

diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index 8a9db3d..df36791 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -1,26 +1,13 @@
-if [[ "${DBUS_BRANCH}" == "devel" ]]; then
-  OPTS="runtime_dir=${TRACK_ROOT}/run ${OPTS}" &&
-  if [ "$DBUS_SELINUX" == "y" ]; then
-     OPTS="selinux=enabled ${OPTS}"
-  fi &&
-  # Glib2 is used for regression tests and can cause unnecessary build 
failure
-  # when we're in a chain where libffi just has been updated and glib2 not 
yet.
-  # Other solution would be to unnecessarily depend on glib2, or even
-  # dbus-glib, which just smells too circular.
-  OPTS="user_session=true modular_tests=disabled ${OPTS}"
-else
-  OPTS="--runstatedir=${TRACK_ROOT}/run ${OPTS}" &&
-  if [ "$DBUS_SELINUX" == "y" ]; then
-     OPTS="--enable-selinux ${OPTS}"
-  fi  &&
-  OPTS="--enable-user-session --disable-modular-tests ${OPTS}"
+OPTS="runtime_dir=${TRACK_ROOT}/run ${OPTS}" &&
+if [ "$DBUS_SELINUX" == "y" ]; then
+   OPTS="selinux=enabled ${OPTS}"
 fi &&
+# Glib2 is used for regression tests and can cause unnecessary build failure
+# when we're in a chain where libffi just has been updated and glib2 not yet.
+# Other solution would be to unnecessarily depend on glib2, or even
+# dbus-glib, which just smells too circular.
+OPTS="user_session=true modular_tests=disabled ${OPTS}"
 
 create_account  messagebus  &&
 
-default_build &&
-
-if [[ "${DBUS_BRANCH}" == "stable" ]] &&
-   is_depends_enabled "${SPELL}" "doxygen"; then
-  doxygen
-fi
+default_build
diff --git a/utils/dbus/CONFIGURE b/utils/dbus/CONFIGURE
index e1da812..e0a483d 100755
--- a/utils/dbus/CONFIGURE
+++ b/utils/dbus/CONFIGURE
@@ -1,5 +1,3 @@
-if [[ "${DBUS_BRANCH}" == "devel" ]]; then
-  . "${GRIMOIRE}/MESON_CONFIGURE"
-fi &&
+. "${GRIMOIRE}/MESON_CONFIGURE" &&
 
 config_query  DBUS_SELINUX  'Enable SELinux support?'  n  
diff --git a/utils/dbus/DEPENDS b/utils/dbus/DEPENDS
index 51127f8..4738bf8 100755
--- a/utils/dbus/DEPENDS
+++ b/utils/dbus/DEPENDS
@@ -1,10 +1,8 @@
+  . "${GRIMOIRE}/MESON_DEPENDS" &&
 depends  libtool &&
 depends  PKG-CONFIG &&
 depends  which &&
 
-if [[ "${DBUS_BRANCH}" == "devel" ]]; then
-  . "${GRIMOIRE}/MESON_DEPENDS" &&
-
   optional_depends  libx11 \
                     "x11_autolaunch=enabled" \
                     "x11_autolaunch=disabled" \
@@ -20,46 +18,10 @@ if [[ "${DBUS_BRANCH}" == "devel" ]]; then
                     "doxygen_docs=disabled" \
                     "API documentation" &&
 
-  optional_depends elogind \
-                   "elogind=enabled" \
-                   "elogind=disabled" \
-                   "for elogind support" &&
-
   optional_depends  xmlto \
                     "xml_docs=enabled" \
                     "xml_docs=disabled" \
                    "docs in XML format"
-else
-  optional_depends  libx11 \
-                    "--with-x --enable-x11-autolaunch" \
-                    "--without-x --disable-x11-autolaunch" \
-                    "X11 autolaunch support" &&
-
-  optional_depends  systemd \
-                    "--enable-systemd 
--with-systemdsystemunitdir=${INSTALL_ROOT}/etc/systemd/system 
--with-systemduserunitdir=${INSTALL_ROOT}/etc/systemd/user" \
-                    "--disable-systemd" \
-                    "systemd support"  &&
-
-  optional_depends  doxygen \
-                    "--enable-doxygen-docs" \
-                    "--disable-doxygen-docs" \
-                    "API documentation" &&
-
-  optional_depends elogind \
-                   "--enable-elogind" \
-                   "--disable-elogind" \
-                   "for elogind support" &&
-  if is_depends_enabled "${SPELL}" "elogind"; then
-    depends autoconf &&
-    depends autoconf-archive &&
-    depends automake
-  fi &&
-
-  optional_depends  xmlto \
-                    "--enable-xml-docs" \
-                    "--disable-xml-docs" \
-                   "docs in XML format"
-fi &&
 
 if is_depends_enabled "${SPELL}" "libx11"; then
   depends libsm  &&
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 9d58c1b..8a7e016 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,9 +1,9 @@
            SPELL=dbus
 if [[ "${DBUS_BRANCH}" == "devel" ]]; then
 . "${GRIMOIRE}/MESON_FUNCTIONS"
-         VERSION=1.15.92
+         VERSION=1.16.0
 else
-         VERSION=1.14.10
+         VERSION=1.16.0
 fi
   SECURITY_PATCH=19
           SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index cb086ea..ac153d2 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,9 @@
+2024-12-16 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 1.16.0
+       * DEPENDS: removed autotools flags and elogind optional dependency
+       * BUILD, CONFIGURE, INSTALL: removed autotools related code
+       * PRE_BUILD, patches*: removed, not needed anymore
+
 2024-12-11 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 1.15.92
 
diff --git a/utils/dbus/INSTALL b/utils/dbus/INSTALL
index dc8dea4..f16d044 100755
--- a/utils/dbus/INSTALL
+++ b/utils/dbus/INSTALL
@@ -1,11 +1,5 @@
 default_install  &&
 
-if [[ "${DBUS_BRANCH}" == "stable" ]] &&
-   is_depends_enabled "${SPELL}" "doxygen"; then
-  mkdir -p  "$INSTALL_ROOT/usr/share/doc/$SPELL"  &&
-  cp -r  "$SOURCE_DIRECTORY"/doc/api/*  "$INSTALL_ROOT/usr/share/doc/$SPELL/"
-fi &&
-
 mkdir -p "$INSTALL_ROOT"/etc/X11/Xsession.d &&
 install -m644 -o root -g root "$SPELL_DIRECTORY"/Xsession.d/* \
   "$INSTALL_ROOT"/etc/X11/Xsession.d/
diff --git a/utils/dbus/PRE_BUILD b/utils/dbus/PRE_BUILD
deleted file mode 100755
index 616865b..0000000
--- a/utils/dbus/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-  apply_patch_dir "patches-${VERSION%.*}" &&
-if is_depends_enabled "${SPELL}" "elogind"; then
-  if [[ "${DBUS_BRANCH}" == "stable" ]]; then
-    apply_patch_dir patches &&
-    NOCONFIGURE=1 ./autogen.sh
-  fi
-fi
diff --git 
a/utils/dbus/patches-1.14/dbus-1.14.0-enable-elogind-dbus-userdb-util.patch 
b/utils/dbus/patches-1.14/dbus-1.14.0-enable-elogind-dbus-userdb-util.patch
deleted file mode 100644
index e16fcce..0000000
--- 
a/utils/dbus/patches-1.14/dbus-1.14.0-enable-elogind-dbus-userdb-util.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/53
-https://bugs.gentoo.org/599494
---- a/dbus/dbus-userdb-util.c
-+++ b/dbus/dbus-userdb-util.c
-@@ -39,6 +39,9 @@
- #ifdef HAVE_SYSTEMD
- #include <systemd/sd-login.h>
- #endif
-+#if HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#endif
- 
- /**
-  * @addtogroup DBusInternalsUtils
-@@ -70,7 +73,7 @@ _dbus_is_console_user (dbus_uid_t uid,
-   const DBusUserInfo *info;
-   dbus_bool_t result = FALSE;
- 
--#ifdef HAVE_SYSTEMD
-+#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
-   /* check if we have logind */
-   if (access ("/run/systemd/seats/", F_OK) >= 0)
-     {
diff --git a/utils/dbus/patches-1.15/dbus-1.15.8-enable-elogind.patch 
b/utils/dbus/patches-1.15/dbus-1.15.8-enable-elogind.patch
deleted file mode 100644
index 543eac5..0000000
--- a/utils/dbus/patches-1.15/dbus-1.15.8-enable-elogind.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/53
-https://bugs.gentoo.org/599494
-
-Especially see https://bugs.gentoo.org/599494#c21 - this functionality isn't
-particularly required. The only known consumer at the moment is hplip.
---- a/dbus/dbus-userdb-util.c
-+++ b/dbus/dbus-userdb-util.c
-@@ -41,6 +41,9 @@
- #ifdef HAVE_SYSTEMD
- #include <systemd/sd-login.h>
- #endif
-+#ifdef HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#endif
- 
- /**
-  * @addtogroup DBusInternalsUtils
-@@ -67,7 +70,7 @@ dbus_bool_t
- _dbus_is_console_user (dbus_uid_t uid,
-                      DBusError *error)
- {
--#ifdef HAVE_SYSTEMD
-+#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
-   /* check if we have logind */
-   if (access ("/run/systemd/seats/", F_OK) >= 0)
-     {
---- a/dbus/meson.build
-+++ b/dbus/meson.build
-@@ -23,6 +23,7 @@ dbus_dependencies = [
-     threads,
-     network_libs,
-     systemd,
-+    elogind,
-     valgrind.partial_dependency(compile_args: true),
- ]
- 
---- a/meson.build
-+++ b/meson.build
-@@ -478,6 +478,10 @@ if use_launchd
-     endif
- endif
- 
-+elogind = dependency('libelogind', version: '>=209', required: 
get_option('elogind'))
-+use_elogind = elogind.found()
-+config.set('HAVE_ELOGIND', use_elogind)
-+
- systemd = dependency('libsystemd', version: '>=209', required: 
get_option('systemd'))
- use_systemd = systemd.found()
- config.set('HAVE_SYSTEMD', use_systemd)
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -244,6 +244,13 @@ option(
-   description: 'Systemd at_console support'
- )
- 
-+option(
-+  'elogind',
-+  type: 'feature',
-+  value: 'auto',
-+  description: 'elogind at_console support'
-+)
-+
- option(
-   'test_socket_dir',
-   type: 'string',
diff --git a/utils/dbus/patches/dbus-enable-elogind.patch 
b/utils/dbus/patches/dbus-enable-elogind.patch
deleted file mode 100644
index 2721fe4..0000000
--- a/utils/dbus/patches/dbus-enable-elogind.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/53
-https://bugs.gentoo.org/599494
---- a/configure.ac
-+++ b/configure.ac
-@@ -215,6 +215,7 @@ AC_ARG_ENABLE(inotify, 
AS_HELP_STRING([--enable-inotify],[build with inotify sup
- AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue 
support]),enable_kqueue=$enableval,enable_kqueue=auto)
- AC_ARG_ENABLE(console-owner-file, 
AS_HELP_STRING([--enable-console-owner-file],[enable console owner 
file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
- AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with 
launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
-+AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with 
elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto)
- AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with 
systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto)
- AC_ARG_ENABLE(traditional-activation, 
AS_HELP_STRING([--disable-traditional-activation], [Do not build support for 
service activation without using SystemdService]), 
enable_traditional_activation="$enableval", enable_traditional_activation=yes)
- 
-@@ -904,6 +905,24 @@ fi
- 
- AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = 
xyes)
- 
-+dnl elogind detection
-+if test x$enable_elogind = xno ; then
-+    have_elogind=no;
-+else
-+    PKG_CHECK_MODULES([ELOGIND],
-+        [libelogind >= 209],
-+        [have_elogind=yes],
-+        [have_elogind=no])
-+fi
-+
-+if test x$have_elogind = xyes; then
-+    AC_DEFINE(HAVE_ELOGIND,1,[Have elogind])
-+fi
-+
-+if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then
-+    AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not 
found])
-+fi
-+
- dnl systemd detection
- if test x$enable_systemd = xno ; then
-     have_systemd=no;
-@@ -1024,7 +1043,7 @@ if test x$with_valgrind != xno; then
- fi
- 
- #### Set up final flags
--LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS"
-+LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS"
- AC_SUBST([LIBDBUS_LIBS])
- 
- ### X11 detection
-@@ -1731,6 +1750,7 @@ echo "
-         Building AppArmor support: ${have_apparmor}
-         Building inotify support: ${have_inotify}
-         Building kqueue support:  ${have_kqueue}
-+        Building elogind support: ${have_elogind}
-         Building systemd support: ${have_systemd}
-         Traditional activation:   ${enable_traditional_activation}
-         Building X11 code:        ${have_x11}