From dc93e5773a78152971aa4dc626144f953eff18d3 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 27 Feb 2018 10:21:02 +0100
Subject: Make installation of KDE components generic

---
 .travis.yml                            |  9 ++++++---
 .travis/install-extra-cmake-modules.sh | 11 -----------
 .travis/install-kcodecs.sh             | 11 -----------
 .travis/install-kcoreaddons.sh         | 11 -----------
 .travis/install-kde.sh                 | 15 +++++++++++++++
 5 files changed, 21 insertions(+), 36 deletions(-)
 delete mode 100755 .travis/install-extra-cmake-modules.sh
 delete mode 100755 .travis/install-kcodecs.sh
 delete mode 100755 .travis/install-kcoreaddons.sh
 create mode 100755 .travis/install-kde.sh

diff --git a/.travis.yml b/.travis.yml
index c2457624..f4176cb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,14 @@ addons:
             - liblmdb-dev
 before_script:
     - source /opt/qt57/bin/qt57-env.sh
-    - ./.travis/install-extra-cmake-modules.sh
-    - ./.travis/install-kcoreaddons.sh
-    - ./.travis/install-kcodecs.sh
+
+    - ./.travis/install-kde.sh extra-cmake-modules v5.43.0
+    - ./.travis/install-kde.sh kcoreaddons v5.43.0
+    - ./.travis/install-kde.sh kcodecs v5.43.0
+
     - ./.travis/install-kasync.sh
     - ./.travis/install-flatbuffers.sh
+
     - ./.travis/install-kdav2.sh
     - ./.travis/install-kimap2.sh
 
diff --git a/.travis/install-extra-cmake-modules.sh b/.travis/install-extra-cmake-modules.sh
deleted file mode 100755
index 35ca1894..00000000
--- a/.travis/install-extra-cmake-modules.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -xeuo pipefail
-git clone "git://anongit.kde.org/extra-cmake-modules" /tmp/ecm
-cd /tmp/ecm
-git checkout "v5.43.0"
-mkdir build
-cd build
-cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=/usr
-ninja && sudo ninja install
-cd
-rm -rf /tmp/ecm
diff --git a/.travis/install-kcodecs.sh b/.travis/install-kcodecs.sh
deleted file mode 100755
index ad0a5d54..00000000
--- a/.travis/install-kcodecs.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -xeuo pipefail
-git clone "git://anongit.kde.org/kcodecs" /tmp/kcodecs
-cd /tmp/kcodecs
-git checkout "v5.43.0"
-mkdir build
-cd build
-cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=/usr
-ninja && sudo ninja install
-cd
-rm -rf /tmp/kcodecs
diff --git a/.travis/install-kcoreaddons.sh b/.travis/install-kcoreaddons.sh
deleted file mode 100755
index e68dc768..00000000
--- a/.travis/install-kcoreaddons.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -xeuo pipefail
-git clone "git://anongit.kde.org/kcoreaddons" /tmp/kcoreaddons
-cd /tmp/kcoreaddons
-git checkout "v5.43.0"
-mkdir build
-cd build
-cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=/usr
-ninja && sudo ninja install
-cd
-rm -rf /tmp/kcoreaddons
diff --git a/.travis/install-kde.sh b/.travis/install-kde.sh
new file mode 100755
index 00000000..0c54bbe3
--- /dev/null
+++ b/.travis/install-kde.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+package=$1
+version=$2
+
+set -xeuo pipefail
+git clone "git://anongit.kde.org/$package" "/tmp/$package"
+cd "/tmp/$package"
+git checkout "$version"
+mkdir build
+cd build
+cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=/usr
+ninja && sudo ninja install
+cd
+rm -rf "/tmp/$package"
-- 
cgit v1.2.3