summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--0001_add_merged.patch19
-rw-r--r--PKGBUILD8
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ac285fdd08f1..875d8e3cc30d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = acpi-unified-patch
pkgdesc = Client for battery, power, and thermal readings - patch to merge batteries by default
pkgver = 1.7
- pkgrel = 1
+ pkgrel = 2
url = https://sourceforge.net/projects/acpiclient/files/acpiclient/
arch = x86_64
license = GPL2
@@ -11,7 +11,7 @@ pkgbase = acpi-unified-patch
source = https://downloads.sourceforge.net/acpiclient/acpi-1.7.tar.gz
source = 0001_add_merged.patch
sha256sums = d7a504b61c716ae5b7e81a0c67a50a51f06c7326f197b66a4b823de076a35005
- sha256sums = 393b5ca7b59bda36daae9ca051a1bfdfb7ababae276fe276d6f456faec142bf5
+ sha256sums = df6737f2e76d0ee70eba2b4a7998864f266fc260b3ea24d4df7bf7a19c72120a
pkgname = acpi-unified-patch
diff --git a/0001_add_merged.patch b/0001_add_merged.patch
index 5d77589cf36d..01edb39692f6 100644
--- a/0001_add_merged.patch
+++ b/0001_add_merged.patch
@@ -169,3 +169,22 @@ diff -aur a/main.c b/main.c
}
if (show_ac_adapter) {
do_show_ac_adapter(acpi_path, show_empty_slots, proc_interface);
+--- a/acpi.c 2020-05-07 17:32:50.579352165 -0700
++++ b.acpi.c 2020-05-07 17:31:43.465878060 -0700
+@@ -368,6 +368,7 @@
+ if (present_rate > MIN_PRESENT_RATE) {
+ seconds = 3600 * (last_capacity - remaining_capacity) / present_rate;
+ poststr = " until charged";
++ total_present_rate += present_rate;
+ } else {
+ poststr = "charging at zero rate - will never fully charge.";
+ seconds = -1;
+@@ -376,6 +377,7 @@
+ if (present_rate > MIN_PRESENT_RATE) {
+ seconds = 3600 * remaining_capacity / present_rate;
+ poststr = " remaining";
++ total_present_rate -= present_rate;
+ } else {
+ poststr = "discharging at zero rate - will never fully discharge.";
+ seconds = -1;
+
diff --git a/PKGBUILD b/PKGBUILD
index 7fe88746bf01..006ebf650945 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_pkgbase=acpi
pkgname=${_pkgbase}-unified-patch
pkgver=1.7
-pkgrel=1
+pkgrel=2
pkgdesc='Client for battery, power, and thermal readings - patch to merge batteries by default'
arch=('x86_64')
url='https://sourceforge.net/projects/acpiclient/files/acpiclient/'
@@ -15,16 +15,16 @@ provides=('acpi')
conflicts=('acpi')
source=("https://downloads.sourceforge.net/acpiclient/${_pkgbase}-$pkgver.tar.gz" "0001_add_merged.patch")
sha256sums=('d7a504b61c716ae5b7e81a0c67a50a51f06c7326f197b66a4b823de076a35005'
- '393b5ca7b59bda36daae9ca051a1bfdfb7ababae276fe276d6f456faec142bf5')
+ 'df6737f2e76d0ee70eba2b4a7998864f266fc260b3ea24d4df7bf7a19c72120a')
prepare() {
- cd "${_pkgbase}-$pkgver"
+ cd "${srcdir}/${_pkgbase}-$pkgver"
patch -p1 -N <${srcdir}/0001_add_merged.patch
}
build() {
- cd "${_pkgbase}-$pkgver"
+ cd "${srcdir}/${_pkgbase}-$pkgver"
./configure --prefix=/usr
make