From d18ede2cfff0ac8c23a20084f4f0032cef4a260f Mon Sep 17 00:00:00 2001
From: jan Iversen <jani@libreoffice.org>
Date: Wed, 23 May 2018 15:41:55 +0200
Subject: [PATCH] build-system: get-dep-lib add support for kirigami and
breeze-icons
mobilecomponents.sh do git clone of kirigami and breeze-icons.
should be centralized with get-dep-lib
Signed-off-by: Jan Iversen <jani@apache.org>
---
scripts/get-dep-lib.sh | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh
index c5c281575..b0cd519e3 100755
--- a/scripts/get-dep-lib.sh
+++ b/scripts/get-dep-lib.sh
@@ -13,6 +13,8 @@ CURRENT_XSLT="v1.1.29"
CURRENT_SQLITE="3190200"
CURRENT_LIBXML2="v2.9.4"
CURRENT_LIBFTDI="1.3"
+CURRENT_KIRIGAMI="70c025ef6f6dc63c85180867f70f5e00ba5a8dba"
+CURRENT_BREEZE_ICONS=""
# deal with all the command line arguments
if [[ $# -ne 2 && $# -ne 3 ]] ; then
@@ -47,15 +49,16 @@ if [ "`which curl`" == "" ] ; then
else
CURL="curl -O "
fi
+BUILD_COMMON="libzip libgit2 googlemaps kirigami breeze-icons"
case ${PLATFORM} in
scripts)
- BUILD="libzip libgit2 googlemaps hidapi libcurl libusb openssl libssh2"
+ BUILD="${BUILD_COMMON} hidapi libcurl libusb openssl libssh2"
;;
ios)
- BUILD="libzip libgit2 googlemaps libxslt"
+ BUILD="${BUILD_COMMON} libxslt"
;;
android)
- BUILD="libzip libgit2 googlemaps libxslt sqlite libxml2 openssl libftdi libusb"
+ BUILD="${BUILD_COMMON} libxslt sqlite libxml2 openssl libftdi libusb"
;;
single)
BUILD="$3"
@@ -153,6 +156,13 @@ if [[ "$BUILD" = *"libzip"* && ! -d libzip ]]; then
mv libzip-${CURRENT_LIBZIP} libzip
fi
+if [[ "$BUILD" = *"breeze-icons"* && ! -d breeze-icons ]]; then
+ git clone https://github.com/kde/breeze-icons
+ pushd breeze-icons
+ git pull --rebase
+ popd
+fi
+
if [[ "$BUILD" = *"googlemaps"* && ! -d googlemaps ]]; then
git clone https://github.com/Subsurface-divelog/googlemaps.git
pushd googlemaps
@@ -174,6 +184,16 @@ if [[ "$BUILD" = *"hidapi"* && ! -d hidapi ]]; then
popd
fi
+if [[ "$BUILD" = *"kirigami"* && ! -d kirigami ]]; then
+ git clone -b master https://github.com/KDE/kirigami.git
+ pushd kirigami
+ if ! git checkout $CURRENT_KIRIGAMI ; then
+ echo "Can't find the right tag in openssl - giving up"
+ exit -1
+ fi
+ popd
+fi
+
if [[ "$BUILD" = *"openssl"* && ! -d openssl ]]; then
git clone https://github.com/openssl/openssl
pushd openssl