Skip to Content.
Sympa Menu

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

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 (5ad924707fa62683fb00a6c074819037bea79970)
  • Date: Thu, 24 Nov 2016 09:51:20 +0000

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

crypto/gpgme/CONFIGURE | 2 +-
crypto/gpgme/DEPENDS | 2 +-
crypto/gpgme/DETAILS | 5 +++++
crypto/gpgme/HISTORY | 5 +++++
crypto/gpgme/PREPARE | 2 +-
crypto/gpgme/PRE_BUILD | 6 ++++++
6 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 5ad924707fa62683fb00a6c074819037bea79970
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gpgme: => 1.8.0

diff --git a/crypto/gpgme/CONFIGURE b/crypto/gpgme/CONFIGURE
index 488ccec..4fb5ebf 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)
+ 1.7 | 1.8)
config_query_multi GPG_LANG "which languages bindings to support" \
qt c++ python
;;
diff --git a/crypto/gpgme/DEPENDS b/crypto/gpgme/DEPENDS
index c1b989f..7b8f0b4 100755
--- a/crypto/gpgme/DEPENDS
+++ b/crypto/gpgme/DEPENDS
@@ -14,7 +14,7 @@ case $GPGME_BRANCH in
;;
esac &&
case $GPGME_BRANCH in
- 1.7)
+ 1.7 | 1.8)
if list_find "$GPG_LANG" qt; then
depends qtbase &&
depends -sub CXX gcc
diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index 340620b..82d9652 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -39,6 +39,11 @@ case $GPGME_BRANCH in
VERSION=1.7.1
SOURCE=$SPELL-$VERSION.tar.bz2
;;
+ 1.8)
+ VERSION=1.8.0
+ PATCHLEVEL=1
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ ;;
esac

SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 175a04d..a21ed37 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,8 @@
+2016-11-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.0
+ * PREPARE CONFIGURE DEPENDS: add 1.8 branch
+ * PRE_BUILD: added, apply upstream fix
+
2016-10-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.1
* DETAILS: add gpg checking
diff --git a/crypto/gpgme/PREPARE b/crypto/gpgme/PREPARE
index 7e3238d..bf2a292 100755
--- a/crypto/gpgme/PREPARE
+++ b/crypto/gpgme/PREPARE
@@ -14,7 +14,7 @@ if [[ $GPGME_OLD == n ]]; then
fi

config_query_list GPGME_BRANCH "Which branch of GPGME do you want to build?"
\
- DEFAULT 0.3 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7
+ DEFAULT 0.3 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8

###
# 2006-07-07
diff --git a/crypto/gpgme/PRE_BUILD b/crypto/gpgme/PRE_BUILD
new file mode 100755
index 0000000..4192bd7
--- /dev/null
+++ b/crypto/gpgme/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# upstream fix
+if [[ $GPGME_BRANCH == '1.8' ]];then
+ sed -i 's/@libsuffix@/.so/' lang/cpp/src/GpgmeppConfig.cmake.in.in
+fi



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5ad924707fa62683fb00a6c074819037bea79970), Treeve Jelbert, 11/24/2016

Archive powered by MHonArc 2.6.24.

Top of Page