sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (231c36ecdede2983b67813cc1ae7cffcde0e6773)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (231c36ecdede2983b67813cc1ae7cffcde0e6773)
Date: Fri, 16 Aug 2024 19:09:52 +0000

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

utils/flatpak/DEPENDS | 13 +++----------
utils/flatpak/HISTORY | 3 +++
2 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 231c36ecdede2983b67813cc1ae7cffcde0e6773
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

utils/flatpak: simplified branching code and
removed extra xdg-dbus-proxy
entry in DEPENDS

diff --git a/utils/flatpak/DEPENDS b/utils/flatpak/DEPENDS
index 2e73ea3..3f624d9 100755
--- a/utils/flatpak/DEPENDS
+++ b/utils/flatpak/DEPENDS
@@ -1,8 +1,3 @@
-if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
- . "$GRIMOIRE"/MESON_DEPENDS &&
- depends xdg-dbus-proxy
"system_dbus_proxy=${TRACK_ROOT}/usr/bin/xdg-dbus-proxy"
-fi &&
-
depends PKG-CONFIG &&
depends libarchive &&
depends gpgme &&
@@ -21,6 +16,9 @@ depends FUSE &&
depends gdk-pixbuf2 &&

if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
+ . "$GRIMOIRE"/MESON_DEPENDS &&
+ depends xdg-dbus-proxy
"system_dbus_proxy=${TRACK_ROOT}/usr/bin/xdg-dbus-proxy" &&
+
optional_depends dconf
\
"dconf=enabled"
\
"dconf=disabled"
\
@@ -63,11 +61,6 @@ if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
""
\
"Use system bubblewrap? (recommended)"
&&

- optional_depends xdg-dbus-proxy
\
-
"system_dbus_proxy=${INSTALL_ROOT}/usr/bin/xdg-dbus-proxy" \
- ""
\
- "Use system xdg-dbus-proxy? (recommended)"
&&
-
optional_depends systemd
\
"systemd=enabled"
\
"systemd=disabled"
\
diff --git a/utils/flatpak/HISTORY b/utils/flatpak/HISTORY
index bc198ec..559ad79 100644
--- a/utils/flatpak/HISTORY
+++ b/utils/flatpak/HISTORY
@@ -1,3 +1,6 @@
+2024-08-16 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: simplified branching code, removed duplicate xdg-dbus-proxy
+
2024-08-14 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: versions 1.15.10/1.14.10, SECURITY_PATCH++,
(CVE-2024-42472)

[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (231c36ecdede2983b67813cc1ae7cffcde0e6773), Pavel Vinogradov, 08/16/2024