diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-11-23 09:34:02 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-17 09:17:54 -0800 |
| commit | 0851224b6c53d1023ea7b2d8642de77608475e44 (patch) | |
| tree | d314f6cf5e07d9bfcdfaafea238eede07587c83b /scripts | |
| parent | daebd0ad0e49f7577a45c182d738f03b157d05df (diff) | |
| download | subsurface-0851224b6c53d1023ea7b2d8642de77608475e44.tar.gz | |
mobile/kirigami: first steps to switching to Kirigami 5.76
Our half-assed manual build of Kirigami was becoming completely unmaintainable.
So let's try to use the build method that the Kirigami team recommends. Which
unfortunately requires us to have access to the KDE extra cmake modules (ECM).
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/get-dep-lib.sh | 2 | ||||
| -rwxr-xr-x | scripts/mobilecomponents.sh | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index 3a0bb5901..c81b1711a 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -13,7 +13,7 @@ CURRENT_XSLT="v1.1.34" CURRENT_SQLITE="3190200" CURRENT_LIBXML2="v2.9.4" CURRENT_LIBFTDI="1.3" -CURRENT_KIRIGAMI="v5.62.0" +CURRENT_KIRIGAMI="v5.76.0" CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02" CURRENT_MDBTOOLS="master" CURRENT_QT_ANDROID_CMAKE="master" diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 64538c44b..e295c49d8 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -14,6 +14,17 @@ if [ ! -d "$SRC/subsurface" ] || [ ! -d "mobile-widgets" ] || [ ! -d "core" ] ; exit 1 fi +# completely changing the Kirigami build, going down the path that the +# Kirigami developers favor, which is to install Kirigami and Breeze in +# a 3rdparty folder within our sources +./scripts/get-dep-lib.sh single "$SRC"/subsurface/mobile-widgets/3rdparty kirigami +./scripts/get-dep-lib.sh single "$SRC"/subsurface/mobile-widgets/3rdparty breeze-icons + + +exit 0 + + + # now bring in the latest Kirigami mobile components plus a couple of icons that we need # first, get the latest from upstream # yes, this is a bit overkill as we clone a lot of stuff for just a few files, but this way @@ -64,7 +75,7 @@ sed -i -e "s/width: backgroundRect/enabled: root.enabled; width: backgroundRe # double defined symbols in our setting. I would like a nicer fix for this # issue, but failed to find one. For example, not adding the resource in # our build causes the qrc file not to be generated. Manual generation -# of the resource file (using rcc) introduces the double symbols again. +# of the resource file (using rcc) introduces the double symbols again. # so it seems some Kirigami weirdness (but their staticcmake example compiles # correctly). |