2016-01-08 09:55:32 -08:00
|
|
|
#!/bin/bash
|
|
|
|
#
|
|
|
|
# if you run the build.sh script to build Subsurface you'll never need
|
|
|
|
# this, but if you build your binaries differently for some reason and
|
|
|
|
# you want to build Subsurface-mobile, running this from within the
|
|
|
|
# checked out source directory (not your build directory) should do the
|
|
|
|
# trick - you can also run this to update to the latest upstream when
|
|
|
|
# you don't want to rerun the whole build.sh script.
|
|
|
|
|
|
|
|
SRC=$(cd .. ; pwd)
|
|
|
|
|
2016-04-04 22:02:03 -07:00
|
|
|
if [ ! -d "$SRC/subsurface" ] || [ ! -d "mobile-widgets" ] || [ ! -d "core" ] ; then
|
2016-01-08 09:55:32 -08:00
|
|
|
echo "please start this script from the Subsurface source directory (which needs to be named \"subsurface\")."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2016-04-01 20:11:56 -05:00
|
|
|
if [ "$1" = "-nopull" ] ; then
|
|
|
|
NOPULL=1
|
|
|
|
fi
|
|
|
|
|
2016-03-10 14:40:19 +01:00
|
|
|
# now bring in the latest Kirigami mobile components plus a couple of icons that we need
|
2016-01-08 09:55:32 -08:00
|
|
|
# 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
|
|
|
|
# we stop having to manually merge our code with upstream all the time
|
|
|
|
# as we get closer to shipping a production version we'll likely check out specific tags
|
|
|
|
# or SHAs from upstream
|
|
|
|
cd $SRC
|
2016-03-31 18:10:24 -05:00
|
|
|
if [ ! -d kirigami ] ; then
|
2017-04-15 12:33:38 +02:00
|
|
|
git clone -b master https://github.com/KDE/kirigami.git
|
2016-01-08 09:55:32 -08:00
|
|
|
fi
|
2016-04-01 20:11:56 -05:00
|
|
|
if [ "$NOPULL" = "" ] ; then
|
|
|
|
pushd kirigami
|
2017-03-31 16:15:14 +02:00
|
|
|
git checkout master
|
|
|
|
git pull origin master
|
2017-10-04 08:20:14 -07:00
|
|
|
# if we want to pin a specific Kirigami version, we can do this here
|
2018-04-15 07:54:09 -07:00
|
|
|
git checkout 70c025ef6f6dc63c85180867f70f5e00ba5a8dba
|
2016-04-01 20:11:56 -05:00
|
|
|
popd
|
|
|
|
fi
|
2016-01-08 09:55:32 -08:00
|
|
|
if [ ! -d breeze-icons ] ; then
|
2017-11-27 13:40:25 -08:00
|
|
|
git clone https://github.com/kde/breeze-icons
|
2016-01-08 09:55:32 -08:00
|
|
|
fi
|
2016-04-01 20:11:56 -05:00
|
|
|
if [ "$NOPULL" = "" ] ; then
|
|
|
|
pushd breeze-icons
|
|
|
|
git pull
|
|
|
|
popd
|
|
|
|
fi
|
2016-01-08 09:55:32 -08:00
|
|
|
|
|
|
|
# now copy the components and a couple of icons into plae
|
2016-04-04 22:02:03 -07:00
|
|
|
MC=$SRC/subsurface/mobile-widgets/qml/kirigami
|
2016-06-22 18:17:25 +02:00
|
|
|
PMMC=kirigami
|
2016-01-08 09:55:32 -08:00
|
|
|
BREEZE=breeze-icons
|
|
|
|
|
|
|
|
rm -rf $MC
|
|
|
|
mkdir -p $MC/icons
|
2016-03-31 18:10:24 -05:00
|
|
|
cp -R $PMMC/* $MC/
|
2016-04-01 16:40:07 -05:00
|
|
|
|
2018-03-08 21:16:24 +02:00
|
|
|
cp $BREEZE/icons/actions/22/map-globe.svg $MC/icons
|
2016-01-08 09:55:32 -08:00
|
|
|
cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons
|
|
|
|
cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons
|
|
|
|
cp $BREEZE/icons/actions/24/document-edit.svg $MC/icons
|
|
|
|
cp $BREEZE/icons/actions/24/document-save.svg $MC/icons
|
|
|
|
cp $BREEZE/icons/actions/24/go-next.svg $MC/icons
|
|
|
|
cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons
|
2017-06-22 08:52:33 -07:00
|
|
|
cp $BREEZE/icons/actions/24/go-up.svg $MC/icons
|
2016-01-08 09:55:32 -08:00
|
|
|
cp $BREEZE/icons/actions/16/view-readermode.svg $MC/icons
|
2016-01-08 21:48:53 -08:00
|
|
|
cp $BREEZE/icons/actions/24/application-menu.svg $MC/icons
|
2016-01-08 23:17:48 -08:00
|
|
|
cp $BREEZE/icons/actions/22/gps.svg $MC/icons
|
2016-01-08 23:16:19 -08:00
|
|
|
cp $BREEZE/icons/actions/24/trash-empty.svg $MC/icons
|
2016-04-01 22:30:28 -05:00
|
|
|
cp $BREEZE/icons/actions/24/list-add.svg $MC/icons
|
2016-06-12 07:31:14 -07:00
|
|
|
cp $BREEZE/icons/actions/22/handle-left.svg $MC/icons
|
2017-07-14 15:41:00 +02:00
|
|
|
cp $BREEZE/icons/actions/22/handle-right.svg $MC/icons
|
2017-10-09 21:09:54 -07:00
|
|
|
cp $BREEZE/icons/actions/22/overflow-menu.svg $MC/icons
|
2016-01-08 09:55:32 -08:00
|
|
|
|
2017-01-02 12:55:13 -08:00
|
|
|
# kirigami now needs the breeze-icons internally as well
|
|
|
|
pushd $MC
|
|
|
|
ln -s $SRC/$BREEZE .
|
2018-02-15 10:44:13 +01:00
|
|
|
|
|
|
|
# do not show the action buttons when the keyboard is open
|
2017-08-01 18:21:11 +02:00
|
|
|
sed -i -e "s/visible: root.action/visible: root.action \&\& \!Qt.inputMethod.visible/g" src/controls/private/ActionButton.qml
|
2017-10-04 12:35:33 -07:00
|
|
|
sed -i -e "s/visible: root.leftAction/visible: root.leftAction \&\& \!Qt.inputMethod.visible/g" src/controls/private/ActionButton.qml
|
|
|
|
sed -i -e "s/visible: root.rightAction/visible: root.rightAction \&\& \!Qt.inputMethod.visible/g" src/controls/private/ActionButton.qml
|
2018-02-15 10:44:13 +01:00
|
|
|
|
2018-05-13 15:39:26 +02:00
|
|
|
# kirigami hack: passive notification hijacks area even after disabled.
|
|
|
|
# https://bugs.kde.org/show_bug.cgi?id=394204
|
|
|
|
sed -i -e "s/width: backgroundRect/enabled: root.enabled; width: backgroundRect/g" src/controls/templates/private/PassiveNotification.qml
|
|
|
|
|
2018-02-15 10:44:13 +01:00
|
|
|
# another hack. Do not include the Kirigami resources (on static build). It causes
|
|
|
|
# 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.
|
|
|
|
# so it seems some Kirigami weirdness (but their staticcmake example compiles
|
|
|
|
# correctly).
|
|
|
|
sed -i -e "s/#include <qrc_kirigami.cpp>/\/\/#include <qrc_kirigami.cpp>/" src/kirigamiplugin.cpp
|
2017-01-02 12:55:13 -08:00
|
|
|
popd
|
|
|
|
|
2016-03-31 18:10:24 -05:00
|
|
|
echo org.kde.plasma.kirigami synced from upstream
|