sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (46f3c46b4d2704389bb5c65ed00c3c0e5a8e203e)
- 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 (46f3c46b4d2704389bb5c65ed00c3c0e5a8e203e)
- Date: Thu, 9 Jan 2025 23:08:10 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
utils/flatpak/BUILD | 5 -
utils/flatpak/CONFIGURE | 4
utils/flatpak/DEPENDS | 201
+++++++++++++++++-------------------------------
utils/flatpak/DETAILS | 10 +-
utils/flatpak/HISTORY | 5 +
utils/flatpak/PRE_BUILD | 7 -
6 files changed, 86 insertions(+), 146 deletions(-)
New commits:
commit 46f3c46b4d2704389bb5c65ed00c3c0e5a8e203e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
utils/flatpak: version 1.16.0
diff --git a/utils/flatpak/BUILD b/utils/flatpak/BUILD
index f38312d..8957688 100755
--- a/utils/flatpak/BUILD
+++ b/utils/flatpak/BUILD
@@ -1,4 +1,3 @@
-if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
-OPTS+=" tests=false"
-fi &&
+OPTS="tests=false ${OPTS}" &&
+
default_build
diff --git a/utils/flatpak/CONFIGURE b/utils/flatpak/CONFIGURE
index be24166..5d7cb43 100755
--- a/utils/flatpak/CONFIGURE
+++ b/utils/flatpak/CONFIGURE
@@ -1,3 +1 @@
-if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
-source $GRIMOIRE/MESON_CONFIGURE
-fi
+source "${GRIMOIRE}/MESON_CONFIGURE"
diff --git a/utils/flatpak/DEPENDS b/utils/flatpak/DEPENDS
index d0b23f5..6ea069b 100755
--- a/utils/flatpak/DEPENDS
+++ b/utils/flatpak/DEPENDS
@@ -1,3 +1,4 @@
+. "$GRIMOIRE"/MESON_DEPENDS &&
depends PKG-CONFIG &&
depends libarchive &&
depends gpgme &&
@@ -15,135 +16,77 @@ depends dbus &&
depends FUSE &&
depends gdk-pixbuf2 &&
-if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
- . "$GRIMOIRE"/MESON_DEPENDS &&
- depends xdg-dbus-proxy
"system_dbus_proxy=${INSTALL_ROOT}/usr/bin/xdg-dbus-proxy" &&
-
- optional_depends dconf
\
- "dconf=enabled"
\
- "dconf=disabled"
\
- "Use dconf?"
&&
-
- optional_depends gobject-introspection
\
- "gir=enabled"
\
- "gir=disabled"
\
- "Build GObject-Introspection metadata?"
\
-
- optional_depends gtk-doc
\
- "gtkdoc=enabled"
\
- "gtkdoc=disabled"
\
- "build API reference documentation?"
&&
-
- 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 curl "http_backend=curl" &&
- depends -sub WITH_CURL ostree
- fi &&
-
- optional_depends zstd
\
- "libzstd=enabled"
\
- "libzstd=disabled"
\
- "Use zstd?"
&&
-
- optional_depends libseccomp
\
- "seccomp=enabled"
\
- "seccomp=disabled"
\
- "Enabled seccomp?"
&&
-
- optional_depends bubblewrap
\
- "system_bubblewrap=${INSTALL_ROOT}/usr/bin/bwrap"
\
- ""
\
- "Use system bubblewrap? (recommended)"
&&
-
- optional_depends systemd
\
- "systemd=enabled"
\
- "systemd=disabled"
\
- "Build with systemd support?"
&&
-
- optional_depends policykit
\
- ""
\
- "system_helper=disabled"
\
- "Enable system helper?"
&&
-
- optional_depends xauth
\
- ""
\
- "xauth=disabled"
\
- "Enabled Xauth use?"
&&
-
- if is_depends_enabled $SPELL xauth; then
- depends libxau
- fi &&
-
- optional_depends libxslt
\
- "man=enabled"
\
- "man=disabled"
\
- "Generate man-pages?"
&&
-
- optional_depends xmlto
\
- "docbook_docs=enabled"
\
- "docbook_docs=disabled"
\
- "Build documentation?"
+depends xdg-dbus-proxy
"system_dbus_proxy=${INSTALL_ROOT}/usr/bin/xdg-dbus-proxy" &&
+
+optional_depends dconf \
+ "dconf=enabled" \
+ "dconf=disabled" \
+ "Use dconf?"
&&
+
+optional_depends gobject-introspection \
+ "gir=enabled" \
+ "gir=disabled" \
+ "Build GObject-Introspection metadata?" \
+
+optional_depends gtk-doc \
+ "gtkdoc=enabled" \
+ "gtkdoc=disabled" \
+ "build API reference documentation?"
&&
+
+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
- optional_depends policykit
\
- ""
\
- "--disable-system-helper"
\
- "Enable system helper? (recommended)"
&&
-
- if is_depends_enabled $SPELL policykit; then
- optional_depends libselinux \
- "--enable-selinux-module" \
- "" \
- "Enable selinux module for system-helper?"
- fi &&
-
- optional_depends xauth
\
- ""
\
- "--disable-xauth"
\
- "Enable Xauth use?"
&&
-
- if is_depends_enabled $SPELL xauth; then
- depends libxau
- fi &&
-
- optional_depends libseccomp
\
- ""
\
- "--disable-seccomp"
\
- "Enable seccomp support?"
&&
-
- optional_depends gobject-introspection
\
- "--enable-introspection=yes"
\
- "--enable-introspection=no"
\
- "Enable introspection?"
&&
-
- optional_depends systemd
\
- "--with-systemd=yes"
\
- "--with-systemd=no"
\
- "Enable systemd support?"
&&
-
- optional_depends bubblewrap
\
- "--with-system-bubblewrap=${INSTALL_ROOT}/usr/bin/bwrap"
\
- "--with-system-bubblewrap=no"
\
- "Use system bubblewrap? (recommended)"
&&
-
- optional_depends xdg-dbus-proxy
\
-
"--with-system-dbus-proxy=${INSTALL_ROOT}/usr/bin/xdg-dbus-proxy" \
- "--with-system-dbus-proxy=no"
\
- "Use system xdg-dbus-proxy? (recommended)"
-
- optional_depends gtk-doc
\
- "--enable-documentation --enable-gtk-doc"
\
- ""
\
- "Build gtk-doc documentation?"
&&
-
- optional_depends xmlto
\
- "--enable-docbook-docs"
\
- ""
\
- "Build docbook documentation?"
+ depends curl "http_backend=curl" &&
+ depends -sub WITH_CURL ostree
fi &&
+
+optional_depends zstd \
+ "libzstd=enabled" \
+ "libzstd=disabled" \
+ "Use zstd?"
&&
+
+optional_depends libseccomp \
+ "seccomp=enabled" \
+ "seccomp=disabled" \
+ "Enabled seccomp?"
&&
+
+optional_depends bubblewrap \
+ "system_bubblewrap=${INSTALL_ROOT}/usr/bin/bwrap" \
+ "" \
+ "Use system bubblewrap? (recommended)"
&&
+
+optional_depends systemd \
+ "systemd=enabled" \
+ "systemd=disabled" \
+ "Build with systemd support?"
&&
+
+optional_depends policykit \
+ "" \
+ "system_helper=disabled" \
+ "Enable system helper?"
&&
+
+optional_depends xauth \
+ "" \
+ "xauth=disabled" \
+ "Enabled Xauth use?"
&&
+
+if is_depends_enabled $SPELL xauth; then
+ depends libxau
+fi &&
+
+optional_depends libxslt \
+ "man=enabled" \
+ "man=disabled" \
+ "Generate man-pages?"
&&
+
+optional_depends xmlto \
+ "docbook_docs=enabled" \
+ "docbook_docs=disabled" \
+ "Build documentation?"
&&
+
suggest_depends xdg-desktop-portal "" "" "portal front-end service for
flatpak"
diff --git a/utils/flatpak/DETAILS b/utils/flatpak/DETAILS
index a43337b..11b04bf 100755
--- a/utils/flatpak/DETAILS
+++ b/utils/flatpak/DETAILS
@@ -1,13 +1,13 @@
. "${GRIMOIRE}/FUNCTIONS"
+. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=flatpak
if [[ "${FLATPAK_BRANCH}" == pre-release ]]; then
- . "${GRIMOIRE}/MESON_FUNCTIONS"
- VERSION=1.15.91
-
SOURCE_HASH="sha256:b1458c00eae49d59bc1c8eae5066fce0019295dc0ba6cc942f68911f200d8802:UPSTREAM_HASH"
+ VERSION=1.16.0
+
SOURCE_HASH="sha256:cb0ac565adcb62127c6d11ed50ee7044d6a836fa69c354b2f4b640a22bfa4b2a:UPSTREAM_HASH"
else
- VERSION=1.14.10
-
SOURCE_HASH="sha256:6bbdc7908127350ad85a4a47d70292ca2f4c46e977b32b1fd231c2a719d821cd:UPSTREAM_HASH"
+ VERSION=1.16.0
+
SOURCE_HASH="sha256:cb0ac565adcb62127c6d11ed50ee7044d6a836fa69c354b2f4b640a22bfa4b2a:UPSTREAM_HASH"
fi
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/utils/flatpak/HISTORY b/utils/flatpak/HISTORY
index 16c3e41..b3b3f05 100644
--- a/utils/flatpak/HISTORY
+++ b/utils/flatpak/HISTORY
@@ -1,3 +1,8 @@
+2025-01-0 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.16.0
+ * BUILD, CONFIGURE, DEPENDS, PRE_BUILD: removed branching code,
+ now use meson
+
2024-12-20 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.15.91
diff --git a/utils/flatpak/PRE_BUILD b/utils/flatpak/PRE_BUILD
index 4879ce4..007609f 100755
--- a/utils/flatpak/PRE_BUILD
+++ b/utils/flatpak/PRE_BUILD
@@ -1,8 +1,3 @@
default_pre_build &&
create_group flatpak &&
-create_account flatpak &&
-
-cd "${SOURCE_DIRECTORY}" &&
-if [[ ${FLATPAK_BRANCH} == "stable" ]]; then
- autoreconf -f -i
-fi
+create_account flatpak
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (46f3c46b4d2704389bb5c65ed00c3c0e5a8e203e), Pavel Vinogradov, 01/09/2025
Archive powered by MHonArc 2.6.24.