Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Conner Clere (b4292282ce5916cc2bb14626dfab563e9c75af5f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Conner Clere (b4292282ce5916cc2bb14626dfab563e9c75af5f)
  • Date: Thu, 9 Feb 2023 15:35:15 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

utils/flatpak/BUILD | 4
utils/flatpak/CONFIGURE | 2
utils/flatpak/DEPENDS | 215
++++++++++++++++++++++++++++++------------------
utils/flatpak/DETAILS | 12 ++
utils/flatpak/HISTORY | 13 ++
utils/flatpak/PREPARE | 2
utils/flatpak/PRE_BUILD | 11 +-
7 files changed, 172 insertions(+), 87 deletions(-)

New commits:
commit b4292282ce5916cc2bb14626dfab563e9c75af5f
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

flatpak: => 1.15.2, add stable branch (1.14.2)

diff --git a/utils/flatpak/BUILD b/utils/flatpak/BUILD
index b010114..f38312d 100755
--- a/utils/flatpak/BUILD
+++ b/utils/flatpak/BUILD
@@ -1,2 +1,4 @@
-OPTS+=" tests=false" &&
+if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
+OPTS+=" tests=false"
+fi &&
default_build
diff --git a/utils/flatpak/CONFIGURE b/utils/flatpak/CONFIGURE
index d0bac55..be24166 100755
--- a/utils/flatpak/CONFIGURE
+++ b/utils/flatpak/CONFIGURE
@@ -1 +1,3 @@
+if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
source $GRIMOIRE/MESON_CONFIGURE
+fi
diff --git a/utils/flatpak/DEPENDS b/utils/flatpak/DEPENDS
index 4f7f388..2441ad4 100755
--- a/utils/flatpak/DEPENDS
+++ b/utils/flatpak/DEPENDS
@@ -1,10 +1,12 @@
-. "$GRIMOIRE"/MESON_DEPENDS &&
+if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
+ . "$GRIMOIRE"/MESON_DEPENDS
+fi &&

depends PKG-CONFIG &&
depends libarchive &&
depends gpgme &&
depends python3 &&
-depends libcap &&
+depends libcap &&
depends appstream &&
depends appstream-glib &&
depends glib2 &&
@@ -21,80 +23,139 @@ depends gdk-pixbuf2 &&
# Curl is non-optional dependency until ostree sub-depends implemented
depends curl &&

-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?" &&
-
-# Disabling soup HTTP backend until flatpak ostree sub-depends is set up
-#optional_depends libsoup \
-# " \
-# "http_backend=soup" \
-# "Use libsoup as http backend?" &&
-
-#if is_depends_enabled $SPELL libsoup; then
-# depends -sub WITH_SOUP ostree
-#else
-# 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 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" \
- "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?" &&

+if [[ "${FLATPAK_BRANCH}" == "pre-release" ]]; then
+ 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?"
&&
+
+ # Disabling soup HTTP backend until flatpak ostree sub-depends is set up
+ #optional_depends libsoup
\
+ # "
\
+ # "http_backend=soup"
\
+ # "Use libsoup as http backend?"
&&
+
+ #if is_depends_enabled $SPELL libsoup; then
+ # depends -sub WITH_SOUP ostree
+ #else
+ # 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 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"
\
+ "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?"
+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?"
+fi &&
suggest_depends xdg-desktop-portal "" "" "portal front-end service for
flatpak"
diff --git a/utils/flatpak/DETAILS b/utils/flatpak/DETAILS
index 496c89b..8bd72e8 100755
--- a/utils/flatpak/DETAILS
+++ b/utils/flatpak/DETAILS
@@ -1,11 +1,17 @@
-. ${GRIMOIRE}/MESON_FUNCTIONS
+. "${GRIMOIRE}/FUNCTIONS"
SPELL=flatpak
- VERSION=1.15.1
+if [[ "${FLATPAK_BRANCH}" == pre-release ]]; then
+ . "${GRIMOIRE}/MESON_FUNCTIONS"
+ VERSION=1.15.2
+
SOURCE_HASH=sha256:292e383d8d1bc1d1fdfd031f3802b0550d90bc4fd300b3e4fd9c2cb0750a8d63
+else
+ VERSION=1.14.2
+
SOURCE_HASH=sha256:c80711eacf42a99078f6396aa65555dd6bf73eec631776b79e9d7b7262b6f774
+fi
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=https://www.github.com/$SPELL/$SPELL/releases/download/$VERSION/$SOURCE
WEB_SITE=https://www.flatpak.org
-
SOURCE_HASH=sha512:807bc318d13882aa20d43282204661b02853464a88544588f1692bce675ade9d0ebb74b29fa6d243f0cd77f5fe725879db0baf7bf0169d30a9fe69b5df3d4b52
ENTERED=20221120
LICENSE=LGPL
KEYWORDS="flatpak sandbox"
diff --git a/utils/flatpak/HISTORY b/utils/flatpak/HISTORY
index 1d40661..c3554a4 100644
--- a/utils/flatpak/HISTORY
+++ b/utils/flatpak/HISTORY
@@ -1,7 +1,14 @@
+2023-02-08 Conner Clere <xenanthropy AT sourcemage.org>
+ * DETAILS: add stable/pre-release branch,
+ add version 1.14.2 as stable and 1.15.2 (update) as pre-release
+ * CONFIGURE, BUILD, PRE_BUILD: add if statement to check for current
branch
+ * DEPENDS: added separate optional_depends for (non-meson) stable
branch
+ * PREPARE: added, add stable/pre-release branch
+
2022-12-19 Florian Franzmann <bwlf AT bandrate.org>
- * FINAL: mark 'user' as non-terminal symbol
- * DETAILS: version 1.15.1
- * DEPENDS: replace tab with space
+ * FINAL: mark 'user' as non-terminal symbol
+ * DETAILS: version 1.15.1
+ * DEPENDS: replace tab with space

2022-11-20 Conner Clere <connerclere AT gmail.com>
* BUILD, CONFIGURE, DEPENDS, DETAILS, FINAL, PRE_BUILD: version
1.5.0, new spell
diff --git a/utils/flatpak/PREPARE b/utils/flatpak/PREPARE
new file mode 100755
index 0000000..963daa5
--- /dev/null
+++ b/utils/flatpak/PREPARE
@@ -0,0 +1,2 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+prepare_select_branch stable pre-release
diff --git a/utils/flatpak/PRE_BUILD b/utils/flatpak/PRE_BUILD
index 6306c69..4879ce4 100755
--- a/utils/flatpak/PRE_BUILD
+++ b/utils/flatpak/PRE_BUILD
@@ -1,3 +1,8 @@
-default_pre_build &&
-create_group flatpak &&
-create_account flatpak
+default_pre_build &&
+create_group flatpak &&
+create_account flatpak &&
+
+cd "${SOURCE_DIRECTORY}" &&
+if [[ ${FLATPAK_BRANCH} == "stable" ]]; then
+ autoreconf -f -i
+fi



  • [SM-Commit] GIT changes to master grimoire by Conner Clere (b4292282ce5916cc2bb14626dfab563e9c75af5f), Conner Clere, 02/09/2023

Archive powered by MHonArc 2.6.24.

Top of Page