From c4ca4c9dfcd9907b25df89948545bd4fee32e725 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 27 Feb 2018 15:11:18 +0100
Subject: Install (in generic ways) libgpg-error libassuan and gpgme

---
 .travis.yml              |  4 +++-
 .travis/install-gpg.sh   | 18 ++++++++++++++++++
 .travis/install-gpgme.sh | 11 -----------
 3 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100755 .travis/install-gpg.sh
 delete mode 100755 .travis/install-gpgme.sh

diff --git a/.travis.yml b/.travis.yml
index b96b8715..6f7a7139 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,9 @@ install:
 
     - ./.travis/install-kde.sh sink develop
 
-    - ./.travis/install-gpgme.sh
+    - ./.travis/install-gpg.sh libgpg-error 1.27 --enable-threads --enable-nls
+    - ./.travis/install-gpg.sh libassuan 2.5.1
+    - ./.travis/install-gpg.sh gpgme 1.10.0 --enable-languages="cpp qt"
 
 script:
     - mkdir build
diff --git a/.travis/install-gpg.sh b/.travis/install-gpg.sh
new file mode 100755
index 00000000..667f1b83
--- /dev/null
+++ b/.travis/install-gpg.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -xeuo pipefail
+
+package=$1
+version=$2
+shift
+shift
+configure_opts=( "$@" )
+
+wget "https://www.gnupg.org/ftp/gcrypt/$package/$package-$version.tar.bz2" -O "/tmp/$package.tar.bz2"
+cd /tmp
+tar xvfa "/tmp/$package.tar.bz2"
+cd "$package-$version"
+./configure "${configure_opts[@]}"
+make
+sudo make install
+cd
+rm -rf "/tmp/$package.tar.bz2" "/tmp/$package-$version"
diff --git a/.travis/install-gpgme.sh b/.travis/install-gpgme.sh
deleted file mode 100755
index 3d5ab448..00000000
--- a/.travis/install-gpgme.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -xeuo pipefail
-wget "https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.10.0.tar.bz2" -O /tmp/gpgme.tar.bz2
-cd /tmp
-tar xvfa /tmp/gpgme.tar.bz2
-cd gpgme-1.10.0
-./configure --enable-languages="cpp qt"
-make
-sudo make install
-cd
-rm -rf /tmp/gpgme.tar.bz2 /tmp/gpgme-1.10.0
-- 
cgit v1.2.3