Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (95227bfd8f27bf593fb7cfc1c4ccf05dff3c5967)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (95227bfd8f27bf593fb7cfc1c4ccf05dff3c5967)
  • Date: Wed, 29 Mar 2023 13:22:19 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/gpgme/BUILD | 10 +++++++---
crypto/gpgme/DEPENDS | 3 ++-
crypto/gpgme/DETAILS | 35 -----------------------------------
crypto/gpgme/HISTORY | 2 ++
crypto/gpgme/PREPARE | 2 +-
5 files changed, 12 insertions(+), 40 deletions(-)

New commits:
commit 95227bfd8f27bf593fb7cfc1c4ccf05dff3c5967
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gpgme - support qt6, delete old versions

diff --git a/crypto/gpgme/BUILD b/crypto/gpgme/BUILD
index ff4e621..e1c6e2f 100755
--- a/crypto/gpgme/BUILD
+++ b/crypto/gpgme/BUILD
@@ -1,11 +1,15 @@
+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
- export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
- export PATH+=":$QT5DIR/bin"
- GPG_LANG="$GPG_LANG,qt"
+ GPG_LANG="$GPG_LANG,qt5"
fi &&
if is_depends_enabled "$SPELL" python3 ||
is_depends_enabled "$SPELL" python; then
diff --git a/crypto/gpgme/DEPENDS b/crypto/gpgme/DEPENDS
index 7471f11..d193c69 100755
--- a/crypto/gpgme/DEPENDS
+++ b/crypto/gpgme/DEPENDS
@@ -1,7 +1,8 @@
depends libgpg-error &&
depends PKG-CONFIG &&
depends GNUPG &&
-optional_depends qtbase '' '' 'for QT bindings' &&
+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
diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index 73e1604..4800d2e 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -2,41 +2,6 @@
SECURITY_PATCH=1

case $GPGME_BRANCH in
- 1.4)
- VERSION=1.4.3
- ;;
- 1.5)
- VERSION=1.5.5
- SECURITY_PATCH=2
- ;;
- 1.6)
- VERSION=1.6.0
- ;;
- 1.7)
- VERSION=1.7.1
- ;;
- 1.8)
- VERSION=1.8.0
- PATCHLEVEL=1
- ;;
- 1.9)
- VERSION=1.9.0
- ;;
- 1.10)
- VERSION=1.10.0
- ;;
- 1.11)
- VERSION=1.11.1
- ;;
- 1.12)
- VERSION=1.12.0
- ;;
- 1.13)
- VERSION=1.13.1
- ;;
- 1.14)
- VERSION=1.14.0
- ;;
1.15)
VERSION=1.15.1
;;
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 4ae7958..fc1d007 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -2,6 +2,8 @@
* DETAILS: version 1.19.0
* PREPARE: add 1.19 branch
* PRE_BUILD, patches/python31x.patch: deleted
+ * PREPARE DETAILS: delete versions < 1.15
+ * DEPENDS BUILD: add qt6 support

2022-10-26 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS, PRE_BUILD, patches/python31x.patch: enabled Python 3.10
and 3.11
diff --git a/crypto/gpgme/PREPARE b/crypto/gpgme/PREPARE
index 76da4d1..99ded7d 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.4 1.5 1.6 1.7 1.8 1.9 1.10 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
+ 1.15 1.16 1.17 1.18 1.19



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (95227bfd8f27bf593fb7cfc1c4ccf05dff3c5967), Treeve Jelbert, 03/29/2023

Archive powered by MHonArc 2.6.24.

Top of Page