From 462bdf5c310c7ab24751e05a7866846ec6d8e5fe Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Tue, 11 Feb 2020 14:33:44 +0100 Subject: [PATCH] temp/plasma-phone-components: upgrade to 5.18.0_git20200211 (!945) Also move from kde/ as it's now in the Alpine repos too --- .../set-qt-virtualkeyboard-style.patch | 12 --------- .../plasma-phone-components/APKBUILD | 26 ++++++------------- .../set-postmarketos-wallpaper.patch | 0 3 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 kde/plasma-phone-components/set-qt-virtualkeyboard-style.patch rename {kde => temp}/plasma-phone-components/APKBUILD (67%) rename {kde => temp}/plasma-phone-components/set-postmarketos-wallpaper.patch (100%) diff --git a/kde/plasma-phone-components/set-qt-virtualkeyboard-style.patch b/kde/plasma-phone-components/set-qt-virtualkeyboard-style.patch deleted file mode 100644 index 0a0c9d63b..000000000 --- a/kde/plasma-phone-components/set-qt-virtualkeyboard-style.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bin/kwinwrapper b/bin/kwinwrapper -index 986b9e3..4ec1b18 100755 ---- a/bin/kwinwrapper -+++ b/bin/kwinwrapper -@@ -15,6 +15,7 @@ export PLASMA_PLATFORM=phone - export QT_QUICK_CONTROLS_STYLE=Plasma - export QT_ENABLE_GLYPH_CACHE_WORKAROUND=1 - export QT_QUICK_CONTROLS_MOBILE=true -+export QT_VIRTUALKEYBOARD_STYLE=Plasma - - # work around to fix : https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1507584 - if [ -d /usr/lib/arm-linux-gnueabihf/libhybris-egl ]; then diff --git a/kde/plasma-phone-components/APKBUILD b/temp/plasma-phone-components/APKBUILD similarity index 67% rename from kde/plasma-phone-components/APKBUILD rename to temp/plasma-phone-components/APKBUILD index fbef1cf08..f5ae2e86f 100644 --- a/kde/plasma-phone-components/APKBUILD +++ b/temp/plasma-phone-components/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=plasma-phone-components -pkgver=0_git20191204 -pkgrel=1 -_commit="a7a5a3f0037ba3047da2d8a6f850137e9c04bc1e" +pkgver=5.18.0_git20200211 +pkgrel=0 +_commit="91c92f8fa1f5194a646df98dfeb5beb3d90ebe95" pkgdesc="Modules providing phone functionality for Plasma" arch="all !armhf" url="https://www.plasma-mobile.org/" @@ -13,24 +13,16 @@ makedepends="extra-cmake-modules kpeople-dev qt5-qtdeclarative-dev kactivities-d source=" $pkgname-$_commit.tar.gz::https://invent.kde.org/kde/plasma-phone-components/-/archive/$_commit/plasma-phone-components-$_commit.tar.gz set-postmarketos-wallpaper.patch - set-qt-virtualkeyboard-style.patch " options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" -prepare() { - default_prepare - - mkdir "$builddir"/build -} - build() { - cd "$builddir"/build - cmake "$builddir" \ + cmake -B "$builddir"/build \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib - make + make -C build } check() { @@ -39,9 +31,7 @@ check() { } package() { - cd "$builddir"/build - DESTDIR="$pkgdir" make install + DESTDIR="$pkgdir" make -C build install } -sha512sums="828ce22811571cc74d2caa5a3369d2f1d9f6eb5b578a6acf57344c70cf27bf5f1531a2b16bc3ca65f34630a0fac07d032a7118f1453ed4660ed90206dc6f03b8 plasma-phone-components-a7a5a3f0037ba3047da2d8a6f850137e9c04bc1e.tar.gz -5853e72077c356f8347ea1c8503d5e301505acaa39ccf2fa105abe054a3063e735f5bcb2db1c1357f53032714599bfbf687fff2cbe21a1743930b946900ff7cf set-postmarketos-wallpaper.patch -4ac627403b64029626e53d071af5dcedf29347cbc0a51788431cbc308efdafb61430fe812cf197bc55eba92a99c87857fcfc79c6ec35ad4997248a4e7c765bc1 set-qt-virtualkeyboard-style.patch" +sha512sums="17c277933aa1593d84f10b01f513a86d8b285f6dd5dff75de0c2c1c37c200a0557402181414232af12f0166ac1bfa1f232d04c7bce9df1f0cc7bd516b014f508 plasma-phone-components-91c92f8fa1f5194a646df98dfeb5beb3d90ebe95.tar.gz +5853e72077c356f8347ea1c8503d5e301505acaa39ccf2fa105abe054a3063e735f5bcb2db1c1357f53032714599bfbf687fff2cbe21a1743930b946900ff7cf set-postmarketos-wallpaper.patch" diff --git a/kde/plasma-phone-components/set-postmarketos-wallpaper.patch b/temp/plasma-phone-components/set-postmarketos-wallpaper.patch similarity index 100% rename from kde/plasma-phone-components/set-postmarketos-wallpaper.patch rename to temp/plasma-phone-components/set-postmarketos-wallpaper.patch