From a9db58ba9f8d63ce61b7957c5e9e2f4032d7666a Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Wed, 31 Mar 2021 12:47:44 +0200 Subject: [PATCH] main/postmarketos-ui-plasma-mobile: install pre-configured kdewallet (MR 2118) The dialog to set a kwallet password is currently broken and unusable if you try to set a password. To prevent this, just install a pre-configured wallet without a password. Not a great solution, but better than having the functionality be broken for now. Proper fix would be upstream fixing the virtual keyboard so users can enter values in the right boxes. Once that is fixed, we can (and should) revert this Note by ollieparanoid: this patch was originally added as MR 2079 to v21.03, instead of to master first and then getting cherry-picked to edge as the process should be. --- main/postmarketos-ui-plasma-mobile/APKBUILD | 14 ++++++++++++-- main/postmarketos-ui-plasma-mobile/kdewallet.kwl | Bin 0 -> 148 bytes main/postmarketos-ui-plasma-mobile/kdewallet.salt | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 main/postmarketos-ui-plasma-mobile/kdewallet.kwl create mode 100644 main/postmarketos-ui-plasma-mobile/kdewallet.salt diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index ff79d1b17..f92c5f283 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-mobile pkgver=3.3 -pkgrel=3 +pkgrel=4 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration, allows only numeric passwords!)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807 @@ -67,6 +67,8 @@ source=" maliit-plasmamobile.json qtlogging.ini unlock-plasma + kdewallet.kwl + kdewallet.salt " subpackages="$pkgname-extras" options="!check" @@ -92,6 +94,12 @@ package() { install -Dm644 "$srcdir"/maliit-plasmamobile.json \ "$pkgdir"/usr/share/maliit/keyboard2/devices/plasmamobile.json + + # TODO: remove once keyboard input bug is fixed + # https://bugs.kde.org/show_bug.cgi?id=435183 + install -Dm600 -t "$pkgdir"/etc/skel/.local/share/kwalletd \ + "$srcdir"/kdewallet.kwl \ + "$srcdir"/kdewallet.salt } extras() { @@ -121,4 +129,6 @@ sha512sums="591529f147f161f5e97c979a9ad4b9f3a65e6d3b87a7bdbd020ec928155cfe5fd561 4ae28ff92e2ae2f78cc4841249941ad02b1ed0447a5be2e7c6d9080fa47e22471ade584a328deb3a1cb22e1a5d7a81f961b9d92fbc9103a092dfeabf2c1ba45c kwinrc 70ee87860842057b557a433a9ae7d54653f076a612b3d9de2d413d598806d23ec19390262eaa398cddf39437f1213d14922402a8d978878e5e98f3767ce0b9eb maliit-plasmamobile.json 341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb qtlogging.ini -e5dcc82c0e58288fd7a8f805e60fa777fab71c68355f085a0e4f25b05526491476fdb6decbc7c0495626d6736a53bfc8e8f34a3231210858998e19cd6fbc89a0 unlock-plasma" +e5dcc82c0e58288fd7a8f805e60fa777fab71c68355f085a0e4f25b05526491476fdb6decbc7c0495626d6736a53bfc8e8f34a3231210858998e19cd6fbc89a0 unlock-plasma +923309f71ee0840ae49d610ab5c11260432f462709eee7148ee5a4703872b9926a3267b16b524162c1560e0798c63fe392a161a57be5c6000bbb1e3f0c947e25 kdewallet.kwl +f3fdaaaf13e985166b86158d5a60098aa45195ea078a4cab7fbf12d3aa428000af3e46ec011dbdc38a4c00faeac5f9a3b5bc2765a6afdd0f1ee58616e31e7429 kdewallet.salt" diff --git a/main/postmarketos-ui-plasma-mobile/kdewallet.kwl b/main/postmarketos-ui-plasma-mobile/kdewallet.kwl new file mode 100644 index 0000000000000000000000000000000000000000..539188bafdfa58f1759dc0e24da43ac8477fd5a0 GIT binary patch literal 148 zcmeYccl7ab4dLQt;N@aqWM*PuU|@O^I{(Df7iY@f^Z4f9|GM`y0|NuY!@g%lMj?Sk zoHh@F*Ui-_28pRU>qW08B{X* zNjUvKH>oX#`^TTS{ecb63ul}?SF^_8og-tJ;Nyxo*AT7d D?h0kY 69 0ŕ6JoL0X \ No newline at end of file