diff --git a/temp/plasma-phone-components/0001-Revert-new-look-for-the-search-applet.patch b/temp/plasma-phone-components/0001-Revert-new-look-for-the-search-applet.patch deleted file mode 100644 index 0de468f40..000000000 --- a/temp/plasma-phone-components/0001-Revert-new-look-for-the-search-applet.patch +++ /dev/null @@ -1,86 +0,0 @@ -This commit requires Kirigami 2.14 which isn't released yet. -The patch is obsolete when kirigami2 5.73.0 hits the repositories - -From f005174010a58b039dc0b71942386195a97a0cfa Mon Sep 17 00:00:00 2001 -From: Bart Ribbers -Date: Tue, 28 Jul 2020 14:16:50 +0200 -Subject: [PATCH] Revert "new look for the search applet" - -This reverts commit e18f7b4560d54e39ed4eccd76780f5772c60bb02. ---- - applets/krunner/contents/ui/main.qml | 34 ++++------------------------ - applets/krunner/metadata.desktop | 2 +- - 2 files changed, 6 insertions(+), 30 deletions(-) - -diff --git a/applets/krunner/contents/ui/main.qml b/applets/krunner/contents/ui/main.qml -index 51c8281..3c12bb5 100644 ---- a/applets/krunner/contents/ui/main.qml -+++ b/applets/krunner/contents/ui/main.qml -@@ -25,46 +25,22 @@ import QtQuick.Layouts 1.1 - import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 3.0 as PlasmaComponents --import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.milou 0.1 as Milou --import org.kde.kirigami 2.14 as Kirigami -+import org.kde.kirigami 2.10 as Kirigami - - Item { - PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup - Plasmoid.backgroundHints: PlasmaCore.Types.ShadowBackground | PlasmaCore.Types.ConfigurableBackground - Layout.minimumWidth: Math.min(plasmoid.availableScreenRect.width, plasmoid.availableScreenRect.height) - Kirigami.Units.gridUnit * 2 - -- Rectangle { -- id: background -+ PlasmaComponents.TextField { -+ id: bigClock - - anchors { -- left: parent.left -- right: parent.right -- verticalCenter: parent.verticalCenter -+ fill: parent - margins: units.gridUnit - } -- radius: height/2 -- height: layout.implicitHeight + units.gridUnit -- color: Qt.rgba(1,1,1, 0.3) -- -- RowLayout { -- id: layout -- anchors { -- left: parent.left -- verticalCenter: parent.verticalCenter -- margins: background.radius/2 -- } -- Kirigami.Icon { -- source: "search" -- Layout.fillHeight: true -- Layout.preferredWidth: height -- color: "white" -- } -- PlasmaExtras.Heading { -- level: 2 -- text: i18n("Search...") -- } -- } -+ text: i18n("Search...") - MouseArea { - anchors.fill: parent - onClicked: window.showMaximized() -diff --git a/applets/krunner/metadata.desktop b/applets/krunner/metadata.desktop -index e120883..6e1e655 100644 ---- a/applets/krunner/metadata.desktop -+++ b/applets/krunner/metadata.desktop -@@ -56,7 +56,7 @@ Comment[x-test]=xxSearch and run Applications and servicesxx - Comment[zh_CN]=搜索和运行应用程序及服务 - Comment[zh_TW]=搜尋並執行應用程式及服務 - --Icon=search -+Icon=preferences-system-time - Type=Service - X-KDE-ParentApp= - X-KDE-PluginInfo-Author=Marco Martin --- -2.28.0 - diff --git a/temp/plasma-phone-components/APKBUILD b/temp/plasma-phone-components/APKBUILD index 17a0bd308..35d968873 100644 --- a/temp/plasma-phone-components/APKBUILD +++ b/temp/plasma-phone-components/APKBUILD @@ -1,21 +1,57 @@ # Forked from Alpine to package newer commits pkgname=plasma-phone-components -pkgver=5.19.5_git20200728 +pkgver=5.20.1_git20201019 pkgrel=0 -_commit="0d438d87d33d53030f19351105dff52f00022842" +_commit="f326853971f45d610e47ea70ff274ba64a28cf61" pkgdesc="Modules providing phone functionality for Plasma" -arch="all !armhf" +arch="all !armhf !x86" # x86 blocked by maliit-keyboard url="https://www.plasma-mobile.org/" license="GPL-2.0-or-later AND LGPL-2.1-or-later" -depends="plasma-nano qt5-qtquickcontrols2 plasma-workspace dbus-x11 kactivities plasma-pa plasma-nm libqofono breeze-icons plasma-settings telepathy-ofono $pkgname-vkbd-style" -makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kactivities-dev plasma-framework-dev kservice-dev ki18n-dev kio-dev kcoreaddons-dev kconfig-dev kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev kpackage-dev kwindowsystem-dev kwayland-dev gst-plugins-base-dev" +depends=" + breeze-icons + dbus-x11 + kactivities + libqofono + maliit-keyboard + plasma-nano + plasma-nm + plasma-pa + plasma-settings + plasma-workspace + qt5-qtquickcontrols2 + telepathy-ofono + " +makedepends=" + extra-cmake-modules + gst-plugins-base-dev + kactivities-dev + kauth-dev + kbookmarks-dev + kcodecs-dev + kcompletion-dev + kconfig-dev + kconfigwidgets-dev + kcoreaddons-dev + ki18n-dev + kio-dev + kitemviews-dev + kjobwidgets-dev + kpackage-dev + kservice-dev + kwayland-dev + kwidgetsaddons-dev + kwindowsystem-dev + kxmlgui-dev + plasma-framework-dev + qt5-qtbase-dev + qt5-qtdeclarative-dev + solid-dev + " source="https://invent.kde.org/plasma/plasma-phone-components/-/archive/$_commit/plasma-phone-components-$_commit.tar.gz - set-postmarketos-wallpaper.patch - 0001-Revert-new-look-for-the-search-applet.patch + set-postmarketos-wallpaper.patch " options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" -subpackages="$pkgname-vkbd-style:vkbd_style:noarch" build() { cmake -B build \ @@ -34,12 +70,5 @@ package() { DESTDIR="$pkgdir" cmake --build build --target install } -vkbd_style() { - depends="" - pkgdesc="Plasma Mobile style for QT virtual keyboard" - - amove usr/lib/qt5/qml/QtQuick/VirtualKeyboard/Styles/Plasma -} -sha512sums="faa6d1cbbec775f1eac7c2cb158c0f04c2e4ce4fa1a774b7a8434e44d47a5f628c2a08f9669b3ffc5d57ea18ff1732e3c6122658ea9fe6147e9b0ea8aa9e383e plasma-phone-components-0d438d87d33d53030f19351105dff52f00022842.tar.gz -aef46ceb3cd4c49fe22b62a9821951bec366291e8ec060c7304d9db9c150a58311f545445c47605afc17dc061466b04bde0abe2d7a3791fa254ef0b7f4ec4e1e set-postmarketos-wallpaper.patch -7acec6223be2807d51bebc2969383c7c2d761793863b3818517c1685b7ba050b34a5172a0fe0a5efa2ff25ae610e9e92da643dd6d23049d266c2f0e675dff059 0001-Revert-new-look-for-the-search-applet.patch" +sha512sums="44e92fabebc62ad8419977d1501cec68453756729d430922ab8844d9221b4ce6bbb982c9b401ddb1a44363f133ffb2419a8537f535f64b705639771fe000409a plasma-phone-components-f326853971f45d610e47ea70ff274ba64a28cf61.tar.gz +aef46ceb3cd4c49fe22b62a9821951bec366291e8ec060c7304d9db9c150a58311f545445c47605afc17dc061466b04bde0abe2d7a3791fa254ef0b7f4ec4e1e set-postmarketos-wallpaper.patch"