From 7ce088067b70fb158ea6bf478a8ce12aada2b733 Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Fri, 6 May 2022 12:38:54 +0200 Subject: [PATCH 1/2] Fix error when updating via discover Discover has for a long time displayed an error after completing offline updates. There has been sevaral attempts to fix this before, but seems it has been unsuccesful. The issue is unique to our Plasma Mobile images: 1. There is no error on updating with Discover on Arch Linux x64. 2. There is no error on updating with Discover on Manjaro x64. 3. There is no error on updating with Discover on Manjaro ARM on Plasma Desktop. 4. Error notification is present on any of our Plasma Mobile images. So I tried simply removing the PK_OFFLINE_UPDATE variable on one of our images and updated it via Discover. Success. So remove the file that exports the variable, so we get a working Discover application on Plasma Mobile. This disables the ability to do Offline Updates, but I figure there most be a reason for Arch to disable that KCM in their Discover package. Likely because it does not work correctly with libalpm. Closes https://gitlab.manjaro.org/manjaro-arm/issues/pinephone/plasma-mobile/-/issues/192 Signed-off-by: Dan Johansen --- PKGBUILD | 3 --- packagekit-offline.sh | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 packagekit-offline.sh diff --git a/PKGBUILD b/PKGBUILD index c4b8436..debb7aa 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,6 @@ source=('applications-blacklistrc' 'kwinrc' 'startkderc' 'sddm.conf' - 'packagekit-offline.sh' 'ofono-fast-dormancy.sh' '91_plasma-mobile.gschema.override' 'drkonqi-coredump-launcher.desktop' @@ -31,7 +30,6 @@ sha256sums=('db89a855aa5e6070fcfbe659f40497e048ec8a7e8624ee02e9a0bb967eaaf488' '1da8a74dbeb58cfe2be26788e1a70da72085da28677f49354dd37fcf8d16b034' 'bf14819bb36a95cbb465169ca3640d8a93f9a648881f9f52f6315a1ba40d273c' '97200b73d2ff5c989f0b94d9d1189a81b4e54a6746420b389067a62934c148ad' - 'e879ca7b637199e9ab5edd04c1b0c0da6b775ee925c21435f14fad426abe7e62' '187bd69ff45ddedb5a2f2152792bd65c0c46ee0082239e86a0d0aab654327617' 'fd5a89ce81197a912a9879aa5aa33daf68c8f80a4b70192fff89364ef9d18734' '21e9614f3d09bd9b0f5912a2d79c77fd37092326abde36073d9a79624f101d6a' @@ -53,7 +51,6 @@ package() { install -Dm644 kwinrc $xdg/kwinrc install -Dm644 startkderc $xdg/startkderc install -Dm644 sddm.conf $pkgdir/etc/sddm.conf.d/00-default.conf - install -Dm755 packagekit-offline.sh $pkgdir/etc/profile.d/packagekit-offline.sh install -Dm755 ofono-fast-dormancy.sh $pkgdir/usr/lib/systemd/system-sleep/ofono-fast-dormancy.sh install -Dm644 "${srcdir}/91_plasma-mobile.gschema.override" -t "${pkgdir}/usr/share/glib-2.0/schemas" install -Dm644 "${srcdir}/plasmamobile.json" -t "${pkgdir}/usr/share/maliit/keyboard2/devices/" diff --git a/packagekit-offline.sh b/packagekit-offline.sh deleted file mode 100644 index 5815f11..0000000 --- a/packagekit-offline.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -export PK_OFFLINE_UPDATE=1 -- GitLab From 0e8966ded584e9f8705cc75437f720099ceafc6d Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Tue, 28 Jun 2022 15:45:12 +0200 Subject: [PATCH 2/2] remove packagekit-offline file again after wrongful conflict resolving Signed-off-by: Dan Johansen --- PKGBUILD | 3 --- 1 file changed, 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 8e8a941..5f5a4ac 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,7 +17,6 @@ source=('applications-blacklistrc' 'mimeapps.list' 'startkderc' 'sddm.conf' - 'packagekit-offline.sh' '91_plasma-mobile.gschema.override' 'drkonqi-coredump-launcher.desktop' 'plasmamobile.json' @@ -32,7 +31,6 @@ sha256sums=('db89a855aa5e6070fcfbe659f40497e048ec8a7e8624ee02e9a0bb967eaaf488' 'd5fc3b3d88d9cdbe15bf724ece4382cd4ae95b1f7ebfe7c748f8d89a120c4b7f' 'bf14819bb36a95cbb465169ca3640d8a93f9a648881f9f52f6315a1ba40d273c' '97200b73d2ff5c989f0b94d9d1189a81b4e54a6746420b389067a62934c148ad' - 'e879ca7b637199e9ab5edd04c1b0c0da6b775ee925c21435f14fad426abe7e62' 'fd5a89ce81197a912a9879aa5aa33daf68c8f80a4b70192fff89364ef9d18734' '21e9614f3d09bd9b0f5912a2d79c77fd37092326abde36073d9a79624f101d6a' '42db6e099ab56aa4f6c01107fe83897a059bc371a389379cd3c260d4ab8fd2bc' @@ -53,7 +51,6 @@ package() { install -Dm644 kwinrc $xdg/kwinrc install -Dm644 startkderc $xdg/startkderc install -Dm644 sddm.conf $pkgdir/etc/sddm.conf.d/00-default.conf - install -Dm755 packagekit-offline.sh $pkgdir/etc/profile.d/packagekit-offline.sh install -Dm644 "${srcdir}/91_plasma-mobile.gschema.override" -t "${pkgdir}/usr/share/glib-2.0/schemas" install -Dm644 "${srcdir}/plasmamobile.json" -t "${pkgdir}/usr/share/maliit/keyboard2/devices/" install -Dm644 "${srcdir}/settings.ini" -t "${pkgdir}/etc/skel/.config/gtk-3.0/" -- GitLab