mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Desktop: update to Grantlee 5.1

Browse source 
Also make sure Grantlee still compiles with Qt 5.13 by cherry picking a commit
that was added after the v5.1.0 release.

In order to identify this commit as comming from the build automation we
temporarily override the user name and email address. As a side effect this
also makes this work on Travis.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-08-12 13:02:25 -07:00
parent 01f1bea995
commit 0f3d287200
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/get-dep-lib.sh
View file

@ -15,7 +15,7 @@ CURRENT_LIBXML2="v2.9.4"
CURRENT_LIBFTDI="1.3" CURRENT_LIBFTDI="1.3"
CURRENT_KIRIGAMI="v5.62.0" CURRENT_KIRIGAMI="v5.62.0"
CURRENT_BREEZE_ICONS="" CURRENT_BREEZE_ICONS=""
CURRENT_GRANTLEE="v5.0.0" CURRENT_GRANTLEE="v5.1.0"
CURRENT_MDBTOOLS="master" CURRENT_MDBTOOLS="master"
CURRENT_QT_ANDROID_CMAKE="master" CURRENT_QT_ANDROID_CMAKE="master"
@ -188,6 +188,8 @@ for package in "${PACKAGES[@]}" ; do
;; ;;
grantlee) grantlee)
git_checkout_library grantlee $CURRENT_GRANTLEE https://github.com/steveire/grantlee.git git_checkout_library grantlee $CURRENT_GRANTLEE https://github.com/steveire/grantlee.git
# this should be removed once there is a newer Grantlee release than v5.1.0
( cd grantlee ; git -c user.email=in@val.id -c user.name='Subsurface build automation' cherry-pick 1b4f22431ae35dfd11f07a5ae88a1b4db3de2a85 ; cd .. )
;; ;;
mdbtools) mdbtools)
git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/brianb/mdbtools.git git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/brianb/mdbtools.git