Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (36b77bf3cef007ca8ac59d1165efa28b1776593a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (36b77bf3cef007ca8ac59d1165efa28b1776593a)
  • Date: Sat, 27 Oct 2018 16:45:22 +0000

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

crypto/gpgme/CONFIGURE | 2 +-
crypto/gpgme/DEPENDS | 14 ++++++--------
crypto/gpgme/HISTORY | 5 +++--
3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 36b77bf3cef007ca8ac59d1165efa28b1776593a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

crypto/gpgme: corrected pattern matching and simplified logic in
CONFIGURE and DEPENDS

diff --git a/crypto/gpgme/CONFIGURE b/crypto/gpgme/CONFIGURE
index a157f10..d49fb0a 100755
--- a/crypto/gpgme/CONFIGURE
+++ b/crypto/gpgme/CONFIGURE
@@ -1,6 +1,6 @@
source $GRIMOIRE/config_query_multi.function
case $GPGME_BRANCH in
- 1.[7-12])
+ 1.[7-9] | 1.1[0-2])
config_query_multi GPG_LANG "which languages bindings to support" \
qt c++ python
;;
diff --git a/crypto/gpgme/DEPENDS b/crypto/gpgme/DEPENDS
index 71f13d3..d3aa045 100755
--- a/crypto/gpgme/DEPENDS
+++ b/crypto/gpgme/DEPENDS
@@ -1,3 +1,4 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
depends libgpg-error &&
depends pkgconfig &&
optional_depends GNUPG "" "" "to use GnuPG 2 for CMS (Cryptographic Message
Syntax) protocol support" &&
@@ -6,15 +7,12 @@ if ! is_depends_enabled $SPELL $(get_spell_provider $SPELL
GNUPG); then
depends gnupg
fi &&

+if is_version_less "1.2" "${GPGME_BRANCH}"; then
+ depends libassuan
+fi &&
+
case $GPGME_BRANCH in
- 0.3 | 1.0 | 1.1 | 1.2)
- ;;
- *)
- depends libassuan
- ;;
-esac &&
-case $GPGME_BRANCH in
- 1.[7-12])
+ 1.[7-9] | 1.1[0-2])
if list_find "$GPG_LANG" qt; then
depends qtbase &&
depends -sub CXX gcc
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index ce88d53..f47d462 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,6 +1,7 @@
2018-10-27 Pavel Vinogradov <public AT sourcemage.org>
- * CONFIGURE, DEPENDS, DETAILS, PREPARE: added 1.12 branch, version
- 1.12.0
+ * CONFIGURE, DEPENDS, DETAILS, PREPARE: added 1.12 branch,
+ version 1.12.0, corrected pattern matching, simplified logic in
DEPENDS by
+ using is_version_less

2018-05-04 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: fix for qt5



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (36b77bf3cef007ca8ac59d1165efa28b1776593a), Pavel Vinogradov, 10/27/2018

Archive powered by MHonArc 2.6.24.

Top of Page