From c00425cedfd877e9b3e3b09e0455e93a5d362419 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Tue, 28 Jul 2020 14:10:13 +0200 Subject: [PATCH] temp/plasma-phone-components: upgrade to 5.19.4_git20200728 (MR 1459) --- ...evert-new-look-for-the-search-applet.patch | 86 +++++++++++++++++++ temp/plasma-phone-components/APKBUILD | 10 ++- .../set-postmarketos-wallpaper.patch | 10 ++- 3 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 temp/plasma-phone-components/0001-Revert-new-look-for-the-search-applet.patch 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 new file mode 100644 index 000000000..0de468f40 --- /dev/null +++ b/temp/plasma-phone-components/0001-Revert-new-look-for-the-search-applet.patch @@ -0,0 +1,86 @@ +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 faa366e70..53d348381 100644 --- a/temp/plasma-phone-components/APKBUILD +++ b/temp/plasma-phone-components/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine to package newer commits pkgname=plasma-phone-components -pkgver=5.19.4_git20200626 +pkgver=5.19.4_git20200728 pkgrel=0 -_commit="d76fc145f924e06353e38defb088b4e9b32e0e52" +_commit="0d438d87d33d53030f19351105dff52f00022842" pkgdesc="Modules providing phone functionality for Plasma" arch="all !armhf !armv7 !x86" # armv7,x86: alpine#11807 url="https://www.plasma-mobile.org/" @@ -11,6 +11,7 @@ depends="plasma-nano qt5-qtquickcontrols2 plasma-workspace dbus-x11 kactivities 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" 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 " options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" @@ -39,5 +40,6 @@ vkbd_style() { amove usr/lib/qt5/qml/QtQuick/VirtualKeyboard/Styles/Plasma } -sha512sums="afc9e55324945dbee4f73693e31869fcc5326bda7a136f0fddaaa936cd88fccc7773d1360e85a183c548cbbdc84a376ddb85fb90a8f5351d4130f1ef998b1f6f plasma-phone-components-d76fc145f924e06353e38defb088b4e9b32e0e52.tar.gz -5853e72077c356f8347ea1c8503d5e301505acaa39ccf2fa105abe054a3063e735f5bcb2db1c1357f53032714599bfbf687fff2cbe21a1743930b946900ff7cf set-postmarketos-wallpaper.patch" +sha512sums="faa6d1cbbec775f1eac7c2cb158c0f04c2e4ce4fa1a774b7a8434e44d47a5f628c2a08f9669b3ffc5d57ea18ff1732e3c6122658ea9fe6147e9b0ea8aa9e383e plasma-phone-components-0d438d87d33d53030f19351105dff52f00022842.tar.gz +aef46ceb3cd4c49fe22b62a9821951bec366291e8ec060c7304d9db9c150a58311f545445c47605afc17dc061466b04bde0abe2d7a3791fa254ef0b7f4ec4e1e set-postmarketos-wallpaper.patch +7acec6223be2807d51bebc2969383c7c2d761793863b3818517c1685b7ba050b34a5172a0fe0a5efa2ff25ae610e9e92da643dd6d23049d266c2f0e675dff059 0001-Revert-new-look-for-the-search-applet.patch" diff --git a/temp/plasma-phone-components/set-postmarketos-wallpaper.patch b/temp/plasma-phone-components/set-postmarketos-wallpaper.patch index 9199744a7..6253dc9c8 100644 --- a/temp/plasma-phone-components/set-postmarketos-wallpaper.patch +++ b/temp/plasma-phone-components/set-postmarketos-wallpaper.patch @@ -1,13 +1,15 @@ diff --git a/look-and-feel/contents/plasmoidsetupscripts/org.kde.phone.homescreen.js b/look-and-feel/contents/plasmoidsetupscripts/org.kde.phone.homescreen.js -index 5955db9..32d8fcf 100644 +index aa5eb6f..3fab4b4 100644 --- a/look-and-feel/contents/plasmoidsetupscripts/org.kde.phone.homescreen.js +++ b/look-and-feel/contents/plasmoidsetupscripts/org.kde.phone.homescreen.js -@@ -1,5 +1,8 @@ +@@ -1,5 +1,10 @@ applet.wallpaperPlugin = 'org.kde.image' - applet.writeConfig("AppOrder", ["org.kde.phone.dialer.desktop", "org.kde.mobile.angelfish.desktop", "org.kde.phone.calindori.desktop", "org.kde.mobile.camera.desktop"]) - applet.writeConfig("Favorites", ["org.kde.phone.dialer.desktop", "org.kde.mobile.angelfish.desktop", "org.kde.phone.calindori.desktop", "org.kde.mobile.camera.desktop"]) + applet.writeConfig("AppOrder", ["org.kde.phone.dialer.desktop", "org.kde.phonebook.desktop", "org.kde.mobile.angelfish.desktop", "org.kde.mobile.camera.desktop"]) + applet.writeConfig("Favorites", ["org.kde.phone.dialer.desktop", "org.kde.phonebook.desktop", "org.kde.mobile.angelfish.desktop", "org.kde.mobile.camera.desktop"]) ++ +applet.currentConfigGroup = new Array ("Wallpaper", "org.kde.image", "General") +applet.writeConfig("Image", "file:///usr/share/wallpapers/postmarketos.jpg") +applet.writeConfig("FillMode", "2") ++ applet.reloadConfig()