diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-08-12 13:02:25 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-10-14 21:00:10 -0700 |
| commit | 0f3d2872008a0c5d179236e758471b905499c8ef (patch) | |
| tree | 259e182c0f1abe37c89c74ab477a49caad293a21 /scripts | |
| parent | 01f1bea995722f6e9934f84d6ac375b30d2a51e4 (diff) | |
| download | subsurface-0f3d2872008a0c5d179236e758471b905499c8ef.tar.gz | |
Desktop: update to Grantlee 5.1
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/get-dep-lib.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index d12397537..b0e5a6771 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -15,7 +15,7 @@ CURRENT_LIBXML2="v2.9.4" CURRENT_LIBFTDI="1.3" CURRENT_KIRIGAMI="v5.62.0" CURRENT_BREEZE_ICONS="" -CURRENT_GRANTLEE="v5.0.0" +CURRENT_GRANTLEE="v5.1.0" CURRENT_MDBTOOLS="master" CURRENT_QT_ANDROID_CMAKE="master" @@ -188,6 +188,8 @@ for package in "${PACKAGES[@]}" ; do ;; grantlee) 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) git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/brianb/mdbtools.git |