sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (09f41929006bfd49af4797feac2700c21d22b167)
Date: Sun, 26 Feb 2023 19:05:50 +0000

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

utils/ostree/DEPENDS | 20 ++++++++------------
utils/ostree/HISTORY | 4 ++++
utils/ostree/PRE_SUB_DEPENDS | 6 ++++++
utils/ostree/REPAIR^all^PRE_SUB_DEPENDS | 6 ++++++
utils/ostree/SUB_DEPENDS | 8 ++++++++
5 files changed, 32 insertions(+), 12 deletions(-)

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

utils/ostree: enabled libsoup backend and added WITH_CURL and WITH_SOUP
sub_dependencies

diff --git a/utils/ostree/DEPENDS b/utils/ostree/DEPENDS
index 9ad5e64..2b69ff2 100755
--- a/utils/ostree/DEPENDS
+++ b/utils/ostree/DEPENDS
@@ -4,18 +4,14 @@ depends zlib &&
depends gpgme &&
depends FUSE &&

-# Non-optional dependency until flatpak ostree sub-depends
-depends curl '--with-curl=yes --with-soup=no' &&
-
-# To be enabled when flatpak has ostree sub-depends, forcing curl in BUILD
otherwise
-#optional_depends curl \
-# '--with-curl=yes --with-soup=no' \
-# '' \
-# 'Use curl over libsoup? (recommended)' &&
-
-#if ! is_depends_enabled "${SPELL}" curl; then
-# depends libsoup
-#fi &&
+optional_depends curl \
+ '--with-curl=yes --with-soup=no' \
+ '--with-curl=no' \
+ 'Use curl over libsoup? (recommended)' &&
+
+if ! is_depends_enabled "${SPELL}" curl; then
+ depends libsoup '--with-soup=yes'
+fi &&

optional_depends libarchive \
'--with-libarchive=yes' \
diff --git a/utils/ostree/HISTORY b/utils/ostree/HISTORY
index a5f1ed6..3d4102f 100644
--- a/utils/ostree/HISTORY
+++ b/utils/ostree/HISTORY
@@ -1,3 +1,7 @@
+2023-02-26 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: enabled libsoup alternative to curl
+ * *SUB_DEPENDS: added WITH_CURL and WITH_SOUP sub_dependencies
+
2023-02-25 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: fuse3 -> FUSE, corrected systemd off flag, reformatted

diff --git a/utils/ostree/PRE_SUB_DEPENDS b/utils/ostree/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..bcfaf63
--- /dev/null
+++ b/utils/ostree/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "${THIS_SUB_DEPENDS}" in
+ WITH_CURL) is_depends_enabled "${SPELL}" curl && ! is_depends_enabled
"${SPELL}" libsoup ;;
+ WITH_SOUP) is_depends_enabled "${SPELL}" libsoup && ! is_depends_enabled
"${SPELL}" curl ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1 ;;
+esac
diff --git a/utils/ostree/REPAIR^all^PRE_SUB_DEPENDS
b/utils/ostree/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..bcfaf63
--- /dev/null
+++ b/utils/ostree/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "${THIS_SUB_DEPENDS}" in
+ WITH_CURL) is_depends_enabled "${SPELL}" curl && ! is_depends_enabled
"${SPELL}" libsoup ;;
+ WITH_SOUP) is_depends_enabled "${SPELL}" libsoup && ! is_depends_enabled
"${SPELL}" curl ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1 ;;
+esac
diff --git a/utils/ostree/SUB_DEPENDS b/utils/ostree/SUB_DEPENDS
new file mode 100755
index 0000000..1b43acd
--- /dev/null
+++ b/utils/ostree/SUB_DEPENDS
@@ -0,0 +1,8 @@
+case "${THIS_SUB_DEPENDS}" in
+ WITH_CURL) message "${SPELL} with curl backend requested, forcing curl
dependency" &&
+ depends curl "--with-curl=yes --with-soup=no" ;;
+ WITH_SOUP) message "${SPELL} with libsoup backend requested, forcing
libsoup dependency" &&
+ depends libsoup "--with-soup=yes" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1;;
+esac

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