Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (046bdd79e2fbf3022ab0077da0508e0b5d5f1e23)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (046bdd79e2fbf3022ab0077da0508e0b5d5f1e23)
  • Date: Wed, 2 Nov 2022 01:36:27 +0000

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

utils/dbus/BUILD | 2 +-
utils/dbus/DEPENDS | 13 +++++++------
utils/dbus/HISTORY | 4 ++++
3 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 046bdd79e2fbf3022ab0077da0508e0b5d5f1e23
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

utils/dbus: fixed libx11 flags, added x11 autolaunch option, always build
with
user session support, dropped expat dependency

diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index 5210a48..7c098ab 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -9,7 +9,7 @@ fi &&
# 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="--without-dbus-glib --disable-modular-tests $OPTS" &&
+OPTS="--disable-modular-tests --enable-user-session ${DBUS_OPTS} $OPTS" &&

create_account messagebus &&
default_build &&
diff --git a/utils/dbus/DEPENDS b/utils/dbus/DEPENDS
index 44accde..092fc68 100755
--- a/utils/dbus/DEPENDS
+++ b/utils/dbus/DEPENDS
@@ -1,14 +1,15 @@
depends PKG-CONFIG &&
-depends expat '--with-xml=expat' &&

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

optional_depends systemd \
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 89c3de8..f4bbc8d 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,7 @@
+2022-11-01 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, DEPENDS: fixed libx11 flags, added x11 autolaunch option,
always
+ build with user session support, dropped expat dependency
+
2022-10-05 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: versions 1.15.2/1.14.4, SECURITY_PATCH++,
(CVE-2022-42010, CVE-2022-42012)



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (046bdd79e2fbf3022ab0077da0508e0b5d5f1e23), Pavel Vinogradov, 11/01/2022

Archive powered by MHonArc 2.6.24.

Top of Page