[PATCH] WIP: use kirigami plugin instead of embedding in qrc

[Dirk Hohndel]

On Thu, May 05, 2016 at 05:27:08PM +0200, Marco Martin wrote:
> diff --git a/packaging/android/build.sh b/packaging/android/build.sh
> index 2213780..8d6f11d 100644
> --- a/packaging/android/build.sh
> +++ b/packaging/android/build.sh
> @@ -290,6 +290,18 @@ if [ ! -e $PKG_CONFIG_LIBDIR/libdivecomputer.pc ] ; then
>  	popd
>  fi
>  
> +if [ ! -e kirigami-build-$ARCH ] ; then
> +	mkdir -p kirigami-build-$ARCH
> +	pushd kirigami-build-$ARCH
> +	cmake -DCMAKE_SYSTEM_NAME=Android \
> +		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
> +		-DCMAKE_PREFIX_PATH=${QT5_ANDROID}/android_${QT_ARCH}/ \
> +		$SUBSURFACE_SOURCE/../kirigami/
> +	make
> +	make install
> +	popd
> +fi
> +
>  if [ ! -e qt-android-cmake ] ; then
>  	git clone git://github.com/LaurentGomila/qt-android-cmake.git
>  else
> @@ -337,6 +349,7 @@ cmake $MOBILE_CMAKE \
>  	-DPKG_CONFIG_EXECUTABLE=${PKGCONF} \
>  	-DQT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT \
>  	-DQT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \
> +	-DCMAKE_INSTALL_PREFIX=${PREFIX} \
>  	-DCMAKE_TOOLCHAIN_FILE=$BUILDROOT/qt-android-cmake/toolchain/android.toolchain.cmake \
>  	-DQT_ANDROID_CMAKE=$BUILDROOT/qt-android-cmake/AddQtAndroidApk.cmake \
>  	-DFORCE_LIBSSH=ON \
> diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh
> index d406f71..e53df43 100755
> --- a/scripts/mobilecomponents.sh
> +++ b/scripts/mobilecomponents.sh
> @@ -47,24 +47,18 @@ MC=$SRC/subsurface/mobile-widgets/qml/kirigami
>  PMMC=kirigami/src/qml
>  BREEZE=breeze-icons
>  
> -rm -rf $MC
> -mkdir -p $MC/icons
> -cp -R $PMMC/* $MC/
> -cp $PMMC/../fallbacktheme/*qml $MC/
> +mkdir -p $PMMC/icons
>  
> -# fix plugin requirement
> -sed -i -e 's/^plugin kirigamiplugin/# plugin kirigamiplugin/' $MC/qmldir
> -
> -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
> -cp $BREEZE/icons/actions/16/view-readermode.svg $MC/icons
> -cp $BREEZE/icons/actions/24/application-menu.svg $MC/icons
> -cp $BREEZE/icons/actions/22/gps.svg $MC/icons
> -cp $BREEZE/icons/actions/24/trash-empty.svg $MC/icons
> -cp $BREEZE/icons/actions/24/list-add.svg $MC/icons
> +cp $BREEZE/icons/actions/24/dialog-cancel.svg $PMMC/icons
> +cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $PMMC/icons
> +cp $BREEZE/icons/actions/24/document-edit.svg $PMMC/icons
> +cp $BREEZE/icons/actions/24/document-save.svg $PMMC/icons
> +cp $BREEZE/icons/actions/24/go-next.svg $PMMC/icons
> +cp $BREEZE/icons/actions/24/go-previous.svg $PMMC/icons
> +cp $BREEZE/icons/actions/16/view-readermode.svg $PMMC/icons
> +cp $BREEZE/icons/actions/24/application-menu.svg $PMMC/icons
> +cp $BREEZE/icons/actions/22/gps.svg $PMMC/icons
> +cp $BREEZE/icons/actions/24/trash-empty.svg $PMMC/icons
> +cp $BREEZE/icons/actions/24/list-add.svg $PMMC/icons
>  
>  echo org.kde.plasma.kirigami synced from upstream


So this now copies the icons we need into the Kirigami sources... I assume
that's on the theory that this gets run before Kirigami gets built and
that therefore these icons get installed with Kirigami?

But your patch above inserts the building and installing of Kirigami
BEFORE we run mobilecomponents.sh. So I think that won't work.

Or am I missing something here?

/D