fixes

7 files changed, 6 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4afb04182b38..d1d615c793e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = htop-temperature-rpi
 	pkgdesc = Interactive process viewer with added support for CPU temperature. Version for gathering Raspberry Pi CPU temperature from thermal_zone0
 	pkgver = 3.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://htop.dev/
 	arch = i686
 	arch = x86_64
@@ -18,7 +18,7 @@ pkgbase = htop-temperature-rpi
 	source = https://github.com/htop-dev/htop/archive/3.0.1/htop-3.0.1.tar.gz
 	source = htop-temperature-rpi.patch
 	sha256sums = 8465164bc085f5f1813e1d3f6c4b9b56bf4c95cc12226a5367e65794949b01ca
-	sha256sums = a8e2c2bf3f96c8d75d1e309c8056553b53c8dd23b5d1585cf63ff6166a91f4f6
+	sha256sums = aabf604ab3cf1094df1f7d5e375f2d796b8f631e169b48cd3fac63f8b2ae2a4d
 
 pkgname = htop-temperature-rpi
 
diff --git a/0001-Increae-the-size-of-sysfs-power-supply-path-buffers.patch b/0001-Increae-the-size-of-sysfs-power-supply-path-buffers.patch
deleted file mode 100644
index 45529c178c78..000000000000
--- a/0001-Increae-the-size-of-sysfs-power-supply-path-buffers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b992d52bcf8ff8c51c847cd4bbf33a7db441dbe9 Mon Sep 17 00:00:00 2001
-From: Nathan Scott <nathans@redhat.com>
-Date: Fri, 28 Aug 2020 16:57:21 +1000
-Subject: [PATCH] Increae the size of sysfs power supply path buffers
-
-Resolves https://github.com/htop-dev/htop/issues/15
----
- linux/Battery.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/linux/Battery.c b/linux/Battery.c
-index 4014a50..a8784da 100644
---- a/linux/Battery.c
-+++ b/linux/Battery.c
-@@ -107,7 +107,7 @@ static ACPresence procAcpiCheck() {
-       if (entryName[0] != 'A')
-          continue;
- 
--      char statePath[50];
-+      char statePath[256];
-       xSnprintf((char *) statePath, sizeof statePath, "%s/%s/state", power_supplyPath, entryName);
-       FILE* file = fopen(statePath, "r");
-       if (!file) {
-@@ -191,7 +191,7 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
-       if (!dirEntry)
-          break;
-       char* entryName = (char *) dirEntry->d_name;
--      const char filePath[50];
-+      const char filePath[256];
- 
-       xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/type", entryName);
-       int fd1 = open(filePath, O_RDONLY);
diff --git a/PKGBUILD b/PKGBUILD
index 3096fc378307..90cc797f41be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=htop
 pkgname=htop-temperature-rpi
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Interactive process viewer with added support for CPU temperature. Version for gathering Raspberry Pi CPU temperature from thermal_zone0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 url='https://htop.dev/'
@@ -15,7 +15,7 @@ options=('!emptydirs')
 source=("https://github.com/htop-dev/htop/archive/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
         'htop-temperature-rpi.patch')
 sha256sums=('8465164bc085f5f1813e1d3f6c4b9b56bf4c95cc12226a5367e65794949b01ca'
-            'a8e2c2bf3f96c8d75d1e309c8056553b53c8dd23b5d1585cf63ff6166a91f4f6')
+            'aabf604ab3cf1094df1f7d5e375f2d796b8f631e169b48cd3fac63f8b2ae2a4d')
 
 prepare() {
   cd "$_pkgname-$pkgver"
diff --git a/htop-3.0.0.tar.gz b/htop-3.0.0.tar.gz
deleted file mode 100644
index 1585f2435227..000000000000
--- a/htop-3.0.0.tar.gz
+++ /dev/null
diff --git a/htop-3.0.1.tar.gz b/htop-3.0.1.tar.gz
new file mode 100644
index 000000000000..71c0d601dbb4
--- /dev/null
+++ b/htop-3.0.1.tar.gz
diff --git a/htop-temperature-rpi-3.0.1-2-armv7h.pkg.tar.zst b/htop-temperature-rpi-3.0.1-2-armv7h.pkg.tar.zst
new file mode 100644
index 000000000000..c31f5230287d
--- /dev/null
+++ b/htop-temperature-rpi-3.0.1-2-armv7h.pkg.tar.zst
diff --git a/htop-temperature-rpi.patch b/htop-temperature-rpi.patch
index fceec3006802..80f4be1025b7 100644
--- a/htop-temperature-rpi.patch
+++ b/htop-temperature-rpi.patch
@@ -109,10 +109,10 @@ index d455b4d..2f6dd75 100644
  
 diff --git a/TemperatureMeter.c b/TemperatureMeter.c
 new file mode 100644
-index 0000000..d28169d
+index 0000000..18b198d
 --- /dev/null
 +++ b/TemperatureMeter.c
-@@ -0,0 +1,102 @@
+@@ -0,0 +1,87 @@
 +/*
 +htop - TemperatureMeter.c
 +(C) 2013 Ralf Stemmer