From 1c42df37691e56cd0f54550bb4179cfbb9271fd3 Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Fri, 11 Nov 2022 00:12:46 -0500 Subject: [PATCH] main/postmarketos-ui-plasma-mobile: Sync configuration with upstream (MR 3634) [ci:skip-build]: already built successfully in CI --- main/postmarketos-ui-plasma-mobile/APKBUILD | 10 +++--- main/postmarketos-ui-plasma-mobile/kdeglobals | 18 ++++------ .../kscreenlockerrc | 3 ++ main/postmarketos-ui-plasma-mobile/kwinrc | 34 +++++-------------- 4 files changed, 23 insertions(+), 42 deletions(-) diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 436c499df..fc4befc01 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -1,8 +1,8 @@ # Reference: https://postmarketos.org/uipkg # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-mobile -pkgver=3.8 -pkgrel=6 +pkgver=3.9 +pkgrel=0 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807 @@ -154,11 +154,11 @@ extras() { sha512sums=" 591529f147f161f5e97c979a9ad4b9f3a65e6d3b87a7bdbd020ec928155cfe5fd561cae6582c4b2831b452fe9b0a03168731771b77020fb66e09f81552ba421e 000-gschema.override 57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179 gtk-app-wayland.sh -54d197a1e29b9e6cfea50b6ad9728639c5e8951519fd70f066acaff92c94126c88657a104851046a2af955d830fd7831a42adde7f193793a933cead6be18c9aa kdeglobals +a1923ecd21ce3c5eacee18f7a64750072ef9cd4aea7b9a0092d23b8445d37d9e70a3ac873c0c50b748e32adc4c3b75169a6737f3aea06ef85bc1fc95a67bb3ce kdeglobals 923309f71ee0840ae49d610ab5c11260432f462709eee7148ee5a4703872b9926a3267b16b524162c1560e0798c63fe392a161a57be5c6000bbb1e3f0c947e25 kdewallet.kwl f3fdaaaf13e985166b86158d5a60098aa45195ea078a4cab7fbf12d3aa428000af3e46ec011dbdc38a4c00faeac5f9a3b5bc2765a6afdd0f1ee58616e31e7429 kdewallet.salt -20cdb856fb46b024d8368d469e9e0a9c45724fb6f27514edca9b733ea84b63644b6d0328780879285b4e649f7a02ea8761f6b607e127fb7b055b753bfd3ee3d2 kscreenlockerrc -4e78dc2dc67ec7b45a7b0bb897b042a661e854d6a3546076740e6f0d46cfd4e4d71b504bb95c8838f332e5e52af7921eb17c6abde5b92196ac7e7e5b664d6fc2 kwinrc +b3aa8ee26c01de103c0c0af23532bf232f7071fdd02c53bd787d78e5974faa5662fc5776ce9be417392214ae73334b0eb0d073fe24f616a0ce99081f30b9158c kscreenlockerrc +f483e351781ad879deb3bca81d023098b780f0f95129ec20aa263836f0482f720cd46fee3980b088afde4e6c89bbe126eb7fb673fab65744153a7568ca3c8720 kwinrc 70ee87860842057b557a433a9ae7d54653f076a612b3d9de2d413d598806d23ec19390262eaa398cddf39437f1213d14922402a8d978878e5e98f3767ce0b9eb maliit-plasmamobile.json 50dbb5e0b1550776ca6fc5b91468412b23d49aa502af77cf7d5d15af11eaf61b1632b205f42eac3274bf28a0b7b278a4d6bfc98c6c12ea29830fd258bad5107d org.kde.phone.homescreen.js 341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb qtlogging.ini diff --git a/main/postmarketos-ui-plasma-mobile/kdeglobals b/main/postmarketos-ui-plasma-mobile/kdeglobals index 7d2e07bd7..6252310bf 100644 --- a/main/postmarketos-ui-plasma-mobile/kdeglobals +++ b/main/postmarketos-ui-plasma-mobile/kdeglobals @@ -1,14 +1,8 @@ -[KDE] -StartDragDist=10 -LookAndFeelPackage=org.kde.plasma.phone - -[Icons] -Theme=breeze +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 [General] -BrowserApplication[$e]=!webbrowser-app -ColorScheme=Breeze -Name=Breeze -XftHintStyle= -XftSubPixel=none -shadeSortColumn=true +BrowserApplication[$e]=!angelfish + +[KDE] +LookAndFeelPackage=org.kde.plasma.phone diff --git a/main/postmarketos-ui-plasma-mobile/kscreenlockerrc b/main/postmarketos-ui-plasma-mobile/kscreenlockerrc index d4deffe96..cea08cfda 100644 --- a/main/postmarketos-ui-plasma-mobile/kscreenlockerrc +++ b/main/postmarketos-ui-plasma-mobile/kscreenlockerrc @@ -1,2 +1,5 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + [Daemon] LockOnStart=true diff --git a/main/postmarketos-ui-plasma-mobile/kwinrc b/main/postmarketos-ui-plasma-mobile/kwinrc index 659bedb75..bd74ef1f5 100644 --- a/main/postmarketos-ui-plasma-mobile/kwinrc +++ b/main/postmarketos-ui-plasma-mobile/kwinrc @@ -1,27 +1,11 @@ -[Plugins] -org.kde.phone.multitaskingEnabled=false -kwin4_effect_eyeonscreenEnabled=false -kwin4_effect_windowapertureEnabled=false -blurEnabled=false -contrastEnabled=false - -[Windows] -Placement=Maximizing - -[TabBox] -TouchBorderActivate=9 -TouchBorderAlternativeActivate=9 -BorderActivate=9 - -[Effect-PresentWindows] -BorderActivateAll=9 - -[org.kde.kdecoration2] -NoPlugin=true - -[TouchEdges] -Left=None -Right=None +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 [Wayland] -InputMethod=/usr/share/applications/com.github.maliit.keyboard.desktop +InputMethod[$e]=/usr/share/applications/com.github.maliit.keyboard.desktop +VirtualKeyboardEnabled=true + +# This is here for legacy purposes since look-and-feel packages don't have an upgrade path +# If the device came installed with Plasma 5.26 or newer, then this is not needed +[org.kde.kdecoration2] +NoPlugin=true