From 0f5fd1f8fc039c300a484995a1daa4492b73e20a Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 16 Dec 2020 20:56:24 +0100 Subject: [PATCH] main/qtvirtualkeyboard-plasma: fix install dir (MR 1780) Don't use cmake to copy the files to the target path, because it would install to the wrong directory: /usr/lib/qml/QtQuick/VirtualKeyboard/Styles/Plasma/ instead of: /usr/lib/qt5/qml/QtQuick/VirtualKeyboard/Styles/Plasma/ I've spent some time trying to figure out why it does that, but could not find it right away. This is just a legacy component, so not worth spending much time on this detail. --- main/qtvirtualkeyboard-plasma/APKBUILD | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/main/qtvirtualkeyboard-plasma/APKBUILD b/main/qtvirtualkeyboard-plasma/APKBUILD index d093ae322..ad007724a 100644 --- a/main/qtvirtualkeyboard-plasma/APKBUILD +++ b/main/qtvirtualkeyboard-plasma/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Bart Ribbers # Maintainer: Bart Ribbers +# Co-Maintainer: Oliver Smith pkgname=qtvirtualkeyboard-plasma pkgver=0_git20200921 -pkgrel=0 +pkgrel=1 _commit="0ebc1639efc6172866aa8706b3c8f1a83bf74b9e" pkgdesc="Plasma qtvirtualkeyboard style" url="https://invent.kde.org/bshah/qtvirtualkeyboard-plasma" @@ -10,23 +10,17 @@ url="https://invent.kde.org/bshah/qtvirtualkeyboard-plasma" arch="noarch !armhf" license="LicenseRef-KDE-Accepted-GPL" depends="qt5-qtquickcontrols2 qt5-qtvirtualkeyboard" -makedepends="extra-cmake-modules" source="https://invent.kde.org/bshah/qtvirtualkeyboard-plasma/-/archive/$_commit/qtvirtualkeyboard-plasma-$_commit.tar.gz" options="!check" # No tests -builddir="$srcdir/$pkgname-$_commit" - +builddir="$srcdir/$pkgname-$_commit/qtvirtualkeyboardplugin" replaces="plasma-phone-components-vkbd-style" -build() { - cmake -B build \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib - cmake --build build -} - package() { - DESTDIR="$pkgdir" cmake --build build --target install + # Don't use the CMakeLists.txt, it installs to the wrong dir (ondev#33) + for i in style.qml images/*.svg; do + install -v -Dm644 "$i" \ + "$pkgdir/usr/lib/qt5/qml/QtQuick/VirtualKeyboard/Styles/Plasma/$i" + done } sha512sums="49e6a0043a46c6707e4898e560a67b121a094e4ed92f7e4b920af56b68631b5cc74c9f8f1a2ed7312199d67695a3809bd273751d98f9c7df6e64a1efebbf5698 qtvirtualkeyboard-plasma-0ebc1639efc6172866aa8706b3c8f1a83bf74b9e.tar.gz"