From e44c8f729a4ccf11caf176aecd3233d84b19f8d0 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Sat, 2 Apr 2022 17:51:22 +0200
Subject: [PATCH] community/asteroid-launcher: upgrade to 0_git20220331

---
 ...ttery-api-and-fix-deprecation-issues.patch | 65 -------------------
 testing/asteroid-launcher/APKBUILD            | 13 ++--
 2 files changed, 5 insertions(+), 73 deletions(-)
 delete mode 100644 testing/asteroid-launcher/0001-use-mce-battery-api-and-fix-deprecation-issues.patch

diff --git a/testing/asteroid-launcher/0001-use-mce-battery-api-and-fix-deprecation-issues.patch b/testing/asteroid-launcher/0001-use-mce-battery-api-and-fix-deprecation-issues.patch
deleted file mode 100644
index d9607490fd5..00000000000
--- a/testing/asteroid-launcher/0001-use-mce-battery-api-and-fix-deprecation-issues.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 59e072c0e2f2e3d848f08affed6d046cec801114 Mon Sep 17 00:00:00 2001
-From: MagneFire <IDaNLContact@gmail.com>
-Date: Sun, 4 Apr 2021 20:51:52 +0200
-Subject: [PATCH] QuickSettings: Use Mce for battery information.
-
----
- qml/quicksettings/QuickSettings.qml | 21 ++++++++-------------
- 1 file changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/qml/quicksettings/QuickSettings.qml b/qml/quicksettings/QuickSettings.qml
-index ee13e7c..344b72b 100644
---- a/qml/quicksettings/QuickSettings.qml
-+++ b/qml/quicksettings/QuickSettings.qml
-@@ -29,7 +29,7 @@
-  */
- 
- import QtQuick 2.9
--import org.freedesktop.contextkit 1.0
-+import Nemo.Mce 1.0
- import Nemo.DBus 2.0
- import org.nemomobile.systemsettings 1.0
- import Nemo.Ngf 1.0
-@@ -44,17 +44,12 @@ Item {
-     property bool forbidLeft:  true
-     property bool forbidRight: true
- 
--    ContextProperty {
-+    MceBatteryLevel {
-         id: batteryChargePercentage
--        key: "Battery.ChargePercentage"
--        value: "100"
--        Component.onCompleted: batteryChargePercentage.subscribe()
-     }
- 
--    ContextProperty {
--        id: batteryIsCharging
--        key: "Battery.IsCharging"
--        value: false
-+    MceBatteryState {
-+        id: batteryChargeState
-     }
- 
-     DBusInterface {
-@@ -149,9 +144,9 @@ Item {
-         Icon {
-             id: batteryIcon
-             name: {
--                if(batteryIsCharging.value)                 return "ios-battery-charging"
--                else if(batteryChargePercentage.value > 15) return "ios-battery-full"
--                else                                        return "ios-battery-dead"
-+                if(batteryChargeState.value == MceBatteryState.Charging) return "ios-battery-charging"
-+                else if(batteryChargePercentage.percent > 15)            return "ios-battery-full"
-+                else                                                     return "ios-battery-dead"
-             }
-             width:  parent.height/2
-             height: width
-@@ -161,7 +156,7 @@ Item {
-         Label {
-             id: batteryIndicator
-             font.pixelSize: parent.height/4
--            text: batteryChargePercentage.value + "%"
-+            text: batteryChargePercentage.percent + "%"
-             anchors.right: parent.right
-             anchors.verticalCenter: parent.verticalCenter
-         }
diff --git a/testing/asteroid-launcher/APKBUILD b/testing/asteroid-launcher/APKBUILD
index 48208302f56..9c0d044b7bc 100644
--- a/testing/asteroid-launcher/APKBUILD
+++ b/testing/asteroid-launcher/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=asteroid-launcher
-pkgver=0_git20211121
-pkgrel=5
-_commit="d616e47367704143fe29beacb1c4c0134c6262a9"
+pkgver=0_git20220331
+pkgrel=0
+_commit="3a1935426ae285a516dc82ab760da32e443199fb"
 pkgdesc="AsteroidOS launcher and Wayland compositor based on Qt5, QML and QtWayland via Lipstick"
 url="https://github.com/AsteroidOS/asteroid-launcher"
 arch="all !armhf" # blocked by nemo-qml-plugin-calendar
@@ -33,9 +33,7 @@ makedepends="
 	qt5-qtbase-dev
 	"
 subpackages="$pkgname-dbg"
-source="https://github.com/AsteroidOS/asteroid-launcher/archive/$_commit/asteroid-launcher-$_commit.tar.gz
-	0001-use-mce-battery-api-and-fix-deprecation-issues.patch
-	"
+source="https://github.com/AsteroidOS/asteroid-launcher/archive/$_commit/asteroid-launcher-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit"
 
 build() {
@@ -57,6 +55,5 @@ package() {
 }
 
 sha512sums="
-f39849291f0f36ca131189a4a4c3047d487c2489667a76550d842998354e9d2857b53ef4672e9bb98895c2303f38384297487cfba9e99f1d82cf059b40d199b9  asteroid-launcher-d616e47367704143fe29beacb1c4c0134c6262a9.tar.gz
-3e05448c78c98dfb2ad8085357ccb5a473baae561b03337dda53f2f031fa8b6069c2139ca6fd35ee4c7e69dd0765618ff01421ddc758072d54806723f6320c47  0001-use-mce-battery-api-and-fix-deprecation-issues.patch
+86bfaac065ca0974e2a124c2d434caf161809a9c4195050ee41598c6aa89ed59c88ce66c5851c883b7a0b9663d777049967975db741db4630c1ea6a1a01f7649  asteroid-launcher-3a1935426ae285a516dc82ab760da32e443199fb.tar.gz
 "