sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (8f3e89cbe258dc0d028ea9319523f496f0a27afe)
- 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 (8f3e89cbe258dc0d028ea9319523f496f0a27afe)
- Date: Thu, 23 Oct 2025 00:02:51 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
crypto/gpgme/BUILD | 36 +++++++++++++++++++-----------------
crypto/gpgme/CONFIGURE | 7 ++++++-
crypto/gpgme/DEPENDS | 19 +++++++++++--------
crypto/gpgme/DETAILS | 3 +++
crypto/gpgme/HISTORY | 4 ++++
crypto/gpgme/PREPARE | 2 +-
6 files changed, 44 insertions(+), 27 deletions(-)
New commits:
commit 8f3e89cbe258dc0d028ea9319523f496f0a27afe
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
crypto/gpgme: added new 2.0 branch, version 2.0.1
diff --git a/crypto/gpgme/BUILD b/crypto/gpgme/BUILD
index f72e6be..0970de5 100755
--- a/crypto/gpgme/BUILD
+++ b/crypto/gpgme/BUILD
@@ -1,21 +1,23 @@
CFLAGS+=' -D_LARGEFILE64_SOURCE' &&
OPTS+=" --disable-gpg-test" &&
-export QT6DIR=$INSTALL_ROOT/opt/qt6 &&
-GPG_LANG=no
-if [ "$GPG_LANG_CXX" = y ]; then
- GPG_LANG=cpp
+if is_version_less "${VERSION}" "2.0.0"; then
+ export QT6DIR=$INSTALL_ROOT/opt/qt6 &&
+ GPG_LANG=no
+ if [ "$GPG_LANG_CXX" = y ]; then
+ GPG_LANG=cpp
+ fi &&
+ if is_depends_enabled "$SPELL" qt6base; then
+ export PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig"
+ export PATH+=":$QT6DIR/bin"
+ GPG_LANG="$GPG_LANG,qt6"
+ fi &&
+ if is_depends_enabled "$SPELL" qtbase; then
+ GPG_LANG="$GPG_LANG,qt5"
+ fi &&
+ if is_depends_enabled "$SPELL" python3 ||
+ is_depends_enabled "$SPELL" python; then
+ GPG_LANG="$GPG_LANG,python"
+ fi &&
+ OPTS+=" --enable-languages=${GPG_LANG#no,}"
fi &&
-if is_depends_enabled "$SPELL" qt6base; then
- export PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig"
- export PATH+=":$QT6DIR/bin"
- GPG_LANG="$GPG_LANG,qt6"
-fi &&
-if is_depends_enabled "$SPELL" qtbase; then
- GPG_LANG="$GPG_LANG,qt5"
-fi &&
-if is_depends_enabled "$SPELL" python3 ||
- is_depends_enabled "$SPELL" python; then
- GPG_LANG="$GPG_LANG,python"
-fi &&
-OPTS+=" --enable-languages=${GPG_LANG#no,}" &&
default_build
diff --git a/crypto/gpgme/CONFIGURE b/crypto/gpgme/CONFIGURE
index fbee4f0..e739c8b 100755
--- a/crypto/gpgme/CONFIGURE
+++ b/crypto/gpgme/CONFIGURE
@@ -1,4 +1,9 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
if [ -n "$GPG_LANG" ]; then
persistent_remove GPG_LANG
-fi
+fi &&
+if is_version_less "${VERSION}" "2.0.0"; then
config_query GPG_LANG_CXX "build C++ bindings" y
+else
+ persistent_remove GPG_LANG_CXX
+fi
diff --git a/crypto/gpgme/DEPENDS b/crypto/gpgme/DEPENDS
index d193c69..c1eaef1 100755
--- a/crypto/gpgme/DEPENDS
+++ b/crypto/gpgme/DEPENDS
@@ -1,12 +1,15 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
depends libgpg-error &&
depends PKG-CONFIG &&
depends GNUPG &&
-optional_depends qt6base '' '' 'for QT6 bindings' &&
-optional_depends qtbase '' '' 'for QT5 bindings' &&
-optional_depends PYTHON '' '' 'for Python bindings' &&
-if is_depends_enabled "$SPELL" python3 ||
- is_depends_enabled "$SPELL" python; then
- depends autoconf &&
- depends automake &&
- depends swig
+if is_version_less "${VERSION}" "2.0.0"; then
+ optional_depends qt6base '' '' 'for QT6 bindings' &&
+ optional_depends qtbase '' '' 'for QT5 bindings' &&
+ optional_depends PYTHON '' '' 'for Python bindings' &&
+ if is_depends_enabled "$SPELL" python3 ||
+ is_depends_enabled "$SPELL" python; then
+ depends autoconf &&
+ depends automake &&
+ depends swig
+ fi
fi
diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index 835d073..eee38a5 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -28,6 +28,9 @@ case $GPGME_BRANCH in
;;
1.24)
VERSION=1.24.3
+ ;;
+ 2.0)
+ VERSION=2.0.1
esac
SOURCE=${SPELL}-${VERSION}.tar.bz2
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 855a9fb..30ad158 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,7 @@
+2025-10-22 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PREPARE: added new 2.0 branch, version 2.0.1
+ * BUILD, CONFIGURE, DEPENDS: adapted for 2.0 branch
+
2025-06-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.24.3
diff --git a/crypto/gpgme/PREPARE b/crypto/gpgme/PREPARE
index f48867f..eb708ba 100755
--- a/crypto/gpgme/PREPARE
+++ b/crypto/gpgme/PREPARE
@@ -1,2 +1,2 @@
config_query_list GPGME_BRANCH "Which branch of GPGME do you want to build?"
\
- 1.15 1.16 1.17 1.18 1.19 1.20 1.22 1.23 1.24
+ 1.15 1.16 1.17 1.18 1.19 1.20 1.22 1.23 1.24 2.0
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (8f3e89cbe258dc0d028ea9319523f496f0a27afe), Pavel Vinogradov, 10/22/2025
Archive powered by MHonArc 2.6.24.