sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (d98b6ca7495c86489df97d4930bd3bc1bf605842)
Date: Sun, 26 Feb 2023 19:20:47 +0000

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

utils/flatpak/DEPENDS | 28 +++++++++++-----------------
utils/flatpak/HISTORY | 3 +++
2 files changed, 14 insertions(+), 17 deletions(-)

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

utils/flatpak: enabled libsoup optional dependency

diff --git a/utils/flatpak/DEPENDS b/utils/flatpak/DEPENDS
index 585fa73..27aaf39 100755
--- a/utils/flatpak/DEPENDS
+++ b/utils/flatpak/DEPENDS
@@ -14,16 +14,11 @@ depends json-glib &&
depends libassuan &&
depends libxml2 &&
depends pyparsing &&
-depends ostree && #needs curl or libsoup support for http
downloading
depends gsettings-desktop-schemas &&
depends dbus &&
depends FUSE &&
depends gdk-pixbuf2 &&

-# Curl is non-optional dependency until ostree sub-depends implemented
-depends curl &&
-
-
if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
optional_depends dconf
\
"dconf=enabled"
\
@@ -40,17 +35,17 @@ if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
"gtkdoc=disabled"
\
"build API reference documentation?"
&&

- # Disabling soup HTTP backend until flatpak ostree sub-depends is set up
- #optional_depends libsoup
\
- # "
\
- # "http_backend=soup"
\
- # "Use libsoup as http backend?"
&&
+ optional_depends libsoup
\
+ "http_backend=soup"
\
+ ""
\
+ "Use libsoup as http backend (curl otherwise)?"
&&

- #if is_depends_enabled $SPELL libsoup; then
- # depends -sub WITH_SOUP ostree
- #else
- # depends -sub WITH_CURL ostree
- #fi &&
+ if is_depends_enabled $SPELL libsoup; then
+ depends -sub WITH_SOUP ostree
+ else
+ depends curl "http_backend=curl" &&
+ depends -sub WITH_CURL ostree
+ fi &&

optional_depends zstd
\
"libzstd=enabled"
\
@@ -101,12 +96,11 @@ if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
"docbook_docs=disabled"
\
"Build documentation?"
else
-
optional_depends policykit
\
""
\
"--disable-system-helper"
\
"Enable system helper? (recommended)"
&&
-
+
if is_depends_enabled $SPELL policykit; then
optional_depends libselinux \
"--enable-selinux-module" \
diff --git a/utils/flatpak/HISTORY b/utils/flatpak/HISTORY
index 52fc95b..366aaed 100644
--- a/utils/flatpak/HISTORY
+++ b/utils/flatpak/HISTORY
@@ -1,3 +1,6 @@
+2023-02-26 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: enabled libsoup optional dependency
+
2023-02-24 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: fuse3 -> FUSE

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d98b6ca7495c86489df97d4930bd3bc1bf605842), Pavel Vinogradov, 02/26/2023