Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (12b7766f3185e94fcf0976988ba1984420ec0993)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (12b7766f3185e94fcf0976988ba1984420ec0993)
  • Date: Tue, 22 Aug 2023 19:51:16 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

utils/dbus/BUILD | 20 +++++++++++---------
utils/dbus/DEPENDS | 53
++++++++++++++++++++++-------------------------------
utils/dbus/DETAILS | 1 +
utils/dbus/HISTORY | 3 +++
utils/dbus/INSTALL | 8 ++++----
5 files changed, 41 insertions(+), 44 deletions(-)

New commits:
commit 12b7766f3185e94fcf0976988ba1984420ec0993
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dbus - now uses meson buld

diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index 7c098ab..dcf5890 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -1,19 +1,21 @@
+OPTS+=" runtime_dir=/run" &&
if spell_ok systemd; then
- # if systemd is installed, then include this. Needed for systemd to work
- OPTS=" --with-systemdsystemunitdir=${INSTALL_ROOT}/lib/systemd/system"
+# # if systemd is installed, then include this. Needed for systemd to work
+ OPTS+=" systemd_system_unitdir=/lib/systemd/system" &&
+ OPTS+=" runtime_dir=/run"
fi &&
+
if [ "$DBUS_SELINUX" == "y" ]; then
- OPTS="--enable-selinux $OPTS"
+ OPTS+=" selinux=enabled"
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="--disable-modular-tests --enable-user-session ${DBUS_OPTS} $OPTS" &&
-
+OPTS+=" user_session=true modular_tests=disabled"
create_account messagebus &&
-default_build &&
+default_build

-if is_depends_enabled $SPELL doxygen; then
- doxygen
-fi
+#if is_depends_enabled $SPELL doxygen; then
+# doxygen
+#fi
diff --git a/utils/dbus/DEPENDS b/utils/dbus/DEPENDS
index 13e6864..5ae7114 100755
--- a/utils/dbus/DEPENDS
+++ b/utils/dbus/DEPENDS
@@ -1,37 +1,28 @@
-depends PKG-CONFIG &&
+source $GRIMOIRE/MESON_DEPENDS &&

-optional_depends libx11 \
- '--with-x' \
- '--without-x' \
- 'for X11 support' &&
-if is_depends_enabled "${SPELL}" "libx11"; then
+depends PKG-CONFIG &&
+
+optional_depends libx11 \
+ x11_autolaunch=enabled \
+ x11_autolaunch=disabled \
+ 'X11 autolaunch support' &&
+
+if is_depends_enabled dbus libx11; then
depends libsm &&
- depends libice &&
- config_query_option DBUS_OPTS "Enable X11 autolaunch support?" y \
- "--enable-x11-autolaunch" \
- "--disable-x11-autolaunch"
+ depends libice
fi &&

-optional_depends systemd \
- '--enable-systemd
--with-systemdsystemunitdi=$INSTALL_ROOT/etc/systemd/system
--with-systemduserunitdir=$INSTALL_ROOT/etc/systemd/user' \
- '--disable-systemd' \
- 'for systemd support' &&
-
-optional_depends doxygen \
- '--enable-doxygen-docs' \
- '--disable-doxygen-docs' \
- 'to build API documentation' &&
+optional_depends systemd \
+ systemd=enabled \
+ systemd=disabled \
+ 'systemd support' &&

-optional_depends xmlto \
- '--enable-xml-docs' \
- '--disable-xml-docs' \
- 'to build docs in XML format' &&
+optional_depends doxygen \
+ doxygen_docs=enabled \
+ doxygen_docs=disabled \
+ 'API documentation' &&

-optional_depends elogind \
- '--enable-elogind' \
- '--disable-elogind' \
- 'for elogind support' &&
-if is_depends_enabled "${SPELL}" "elogind"; then
- depends autoconf &&
- depends automake
-fi
+optional_depends xmlto \
+ xml_docs=enabled \
+ xml_docs=disabled \
+ 'docs in XML format'
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index c3190ee..25a35e7 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,4 +1,5 @@
SPELL=dbus
+source $GRIMOIRE/MESON_FUNCTIONS
if [[ "${DBUS_BRANCH}" == "devel" ]]; then
VERSION=1.15.8
else
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index e088577..dbf81eb 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2023-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS DEPENDS BUILD INSTALL: use meson build, per upstream
+
2023-88-22 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: devel version 1.15.8

diff --git a/utils/dbus/INSTALL b/utils/dbus/INSTALL
index cd83661..5b2a18e 100755
--- a/utils/dbus/INSTALL
+++ b/utils/dbus/INSTALL
@@ -1,9 +1,9 @@
default_install &&

-if 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 &&
+#if 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/* \



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (12b7766f3185e94fcf0976988ba1984420ec0993), Treeve Jelbert, 08/22/2023

Archive powered by MHonArc 2.6.24.

Top of Page