summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDX372018-04-12 12:37:12 +0700
committerDX372018-04-12 12:37:12 +0700
commit873c95d0ba34d315f4f53ed1748fa85d5f96c74f (patch)
treea5f5db93b5f7fb68a2f357431a5b20664bee84af
parentbbc49d0a2efc4634d1c68c6fe89a7f76222da5f4 (diff)
downloadaur-873c95d0ba34d315f4f53ed1748fa85d5f96c74f.tar.gz
Update to 2.2.0; Add archs
-rw-r--r--.SRCINFO15
-rw-r--r--0001-fix-option-string.patch115
-rw-r--r--PKGBUILD32
-rw-r--r--htop-temperature.patch43
4 files changed, 166 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3974f796689..0600f0b0740 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,13 @@
pkgbase = htop-temperature
pkgdesc = Interactive process viewer with added support for CPU temperature
- pkgver = 2.1.0
- pkgrel = 2
+ pkgver = 2.2.0
+ pkgrel = 1
url = http://hisham.hm/htop/
arch = i686
arch = x86_64
+ arch = aarch64
+ arch = armv7h
+ arch = armv6h
license = GPL
makedepends = python
depends = ncurses
@@ -15,10 +18,12 @@ pkgbase = htop-temperature
provides = htop
conflicts = htop
options = !emptydirs
- source = http://hisham.hm/htop/releases/2.1.0/htop-2.1.0.tar.gz
+ source = http://hisham.hm/htop/releases/2.2.0/htop-2.2.0.tar.gz
source = htop-temperature.patch
- sha256sums = 3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748
- sha256sums = 68a96dc51a9cb847e40ad95ecf91a80979ca377f6b947e5cc9b2ef2c7dcb333e
+ source = 0001-fix-option-string.patch
+ sha256sums = d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57
+ sha256sums = a4c9dfbc3c2f7e08904656b53b9c08d19014cf6238fb75f1ed5ecbef2905964c
+ sha256sums = 550c2806ccae779203ec610b73d2c5b977df3f963ad79675a611da48accf6e0d
pkgname = htop-temperature
diff --git a/0001-fix-option-string.patch b/0001-fix-option-string.patch
new file mode 100644
index 00000000000..ee3b22bfd5c
--- /dev/null
+++ b/0001-fix-option-string.patch
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+<title>0001-fix-option-string.patch\trunk - svntogit/packages.git - Git clone of the 'packages' repository
+</title>
+<meta name='generator' content='cgit v0.12'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='https://git.archlinux.org/svntogit/packages.git/atom/trunk/0001-fix-option-string.patch?h=packages/htop' type='application/atom+xml'/>
+<link rel='vcs-git' href='https://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
+<link rel='vcs-git' href='git://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
+<link rel='vcs-git' href='ssh://git.archlinux.org/srv/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
+</head>
+<body>
+ <div id="archnavbar"><!-- Arch Linux global navigation bar -->
+ <div id="archnavbarlogo">
+ <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>
+ </div>
+ <div id="archnavbarmenu">
+ <ul id="archnavbarlist">
+ <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>
+ <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>
+ <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
+ <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
+ <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>
+ <li id="anb-sec"><a href="https://security.archlinux.org/" title="Security Tracker">Security</a></li>
+ <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
+ <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
+ </ul>
+ </div>
+ </div><!-- #archnavbar -->
+<div id='cgit'><table id='header'>
+<tr>
+<td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>
+<tr><td class='sub'>Git clone of the 'packages' repository
+</td><td class='sub right'></td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/svntogit/packages.git/?h=packages/htop'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/htop&amp;id=e1359571e24850f3ac08f8bd463aaa921751a71b'>refs</a><a href='/svntogit/packages.git/log/trunk/0001-fix-option-string.patch?h=packages/htop'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/0001-fix-option-string.patch?h=packages/htop&amp;id=e1359571e24850f3ac08f8bd463aaa921751a71b'>tree</a><a href='/svntogit/packages.git/commit/trunk/0001-fix-option-string.patch?h=packages/htop&amp;id=e1359571e24850f3ac08f8bd463aaa921751a71b'>commit</a><a href='/svntogit/packages.git/diff/trunk/0001-fix-option-string.patch?h=packages/htop&amp;id=e1359571e24850f3ac08f8bd463aaa921751a71b'>diff</a><a href='/svntogit/packages.git/stats/trunk/0001-fix-option-string.patch?h=packages/htop'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/0001-fix-option-string.patch'>
+<input type='hidden' name='h' value='packages/htop'/><input type='hidden' name='id' value='e1359571e24850f3ac08f8bd463aaa921751a71b'/><select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/htop&amp;id=e1359571e24850f3ac08f8bd463aaa921751a71b'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/htop&amp;id=e1359571e24850f3ac08f8bd463aaa921751a71b'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/0001-fix-option-string.patch?h=packages/htop&amp;id=e1359571e24850f3ac08f8bd463aaa921751a71b'>0001-fix-option-string.patch</a></div><div class='content'>blob: d877e03ef91bed57c04f13a7367d2f70250ebf68 (<a href='/svntogit/packages.git/plain/trunk/0001-fix-option-string.patch?h=packages/htop&amp;id=e1359571e24850f3ac08f8bd463aaa921751a71b'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
+<a id='n2' href='#n2'>2</a>
+<a id='n3' href='#n3'>3</a>
+<a id='n4' href='#n4'>4</a>
+<a id='n5' href='#n5'>5</a>
+<a id='n6' href='#n6'>6</a>
+<a id='n7' href='#n7'>7</a>
+<a id='n8' href='#n8'>8</a>
+<a id='n9' href='#n9'>9</a>
+<a id='n10' href='#n10'>10</a>
+<a id='n11' href='#n11'>11</a>
+<a id='n12' href='#n12'>12</a>
+<a id='n13' href='#n13'>13</a>
+<a id='n14' href='#n14'>14</a>
+<a id='n15' href='#n15'>15</a>
+<a id='n16' href='#n16'>16</a>
+<a id='n17' href='#n17'>17</a>
+<a id='n18' href='#n18'>18</a>
+<a id='n19' href='#n19'>19</a>
+<a id='n20' href='#n20'>20</a>
+<a id='n21' href='#n21'>21</a>
+<a id='n22' href='#n22'>22</a>
+<a id='n23' href='#n23'>23</a>
+<a id='n24' href='#n24'>24</a>
+<a id='n25' href='#n25'>25</a>
+</pre></td>
+<td class='lines'><pre><code>From 731acc8bced18c90fbe0e18381c32f007f71e0d9 Mon Sep 17 00:00:00 2001
+From: Christian Hesse &lt;mail&#64;eworm.de&gt;
+Date: Tue, 10 Apr 2018 16:21:46 +0200
+Subject: [PATCH 1/1] fix option string
+
+This broke with commit db05ba61065f64b59d0014518be0786b5439e54c.
+
+Signed-off-by: Christian Hesse &lt;mail&#64;eworm.de&gt;
+<span class="hl kwb">---</span>
+ htop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/htop.c b/htop.c
+index 6db81dd..678a3b8 100644
+<span class="hl kwb">--- a/htop.c</span>
+<span class="hl kwa">+++ b/htop.c</span>
+&#64;&#64; -93,7 +93,7 &#64;&#64; static CommandLineSettings parseArguments(int argc, char** argv) {
+
+ int opt, opti=0;
+ /* Parse arguments */
+<span class="hl kwb">- while ((opt = getopt_long(argc, argv, &quot;hvCst::d:u:p:i&quot;, long_opts, &amp;opti))) {</span>
+<span class="hl kwa">+ while ((opt = getopt_long(argc, argv, &quot;hvCs:td:u:p:i&quot;, long_opts, &amp;opti))) {</span>
+ if (opt == EOF) break;
+ switch (opt) {
+ case &apos;h&apos;:
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class="foot" style="padding-left:1em;padding-right:1em;">
+<p>Copyright &copy; 2002-2017 <a href="mailto:jvinet@zeroflux.org"
+title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
+title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo
+are recognized trademarks. Some rights reserved. The registered trademark
+Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee
+of Linus Torvalds, owner of the mark on a world-wide basis.</p>
+</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
diff --git a/PKGBUILD b/PKGBUILD
index 27610b63fb1..076992e2b1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,39 @@
# Maintainer: Maxim Kurnosenko <asusx2@mail.ru>
# Contributor: Blair Bonnett <blair.bonnett at gmail dot com>
+_pkgname=htop
pkgname=htop-temperature
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
pkgdesc="Interactive process viewer with added support for CPU temperature"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
url="http://hisham.hm/htop/"
license=('GPL')
depends=('ncurses' 'libnl' 'lm_sensors')
makedepends=('python')
optdepends=('lsof: show files opened by a process'
'strace: attach to a running process')
-provides=('htop')
-conflicts=('htop')
+provides=($_pkgname)
+conflicts=($_pkgname)
options=('!emptydirs')
-source=("http://hisham.hm/htop/releases/$pkgver/htop-$pkgver.tar.gz"
- "htop-temperature.patch")
-sha256sums=('3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748'
- '68a96dc51a9cb847e40ad95ecf91a80979ca377f6b947e5cc9b2ef2c7dcb333e')
+source=("http://hisham.hm/$_pkgname/releases/$pkgver/$_pkgname-$pkgver.tar.gz"
+ "htop-temperature.patch"
+ "0001-fix-option-string.patch")
+sha256sums=('d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57'
+ 'a4c9dfbc3c2f7e08904656b53b9c08d19014cf6238fb75f1ed5ecbef2905964c'
+ '550c2806ccae779203ec610b73d2c5b977df3f963ad79675a611da48accf6e0d')
prepare() {
- cd "htop-$pkgver"
+ cd "$_pkgname-$pkgver"
+
+ patch -Np1 < "$srcdir"/0001-fix-option-string.patch
# Add CPU temperature patch.
- patch -p1 -N < ../htop-temperature.patch
+ patch -Np1 < "$srcdir"/htop-temperature.patch
}
build() {
- cd "htop-$pkgver"
+ cd "$_pkgname-$pkgver"
./autogen.sh
./configure \
@@ -40,10 +45,9 @@ build() {
--enable-unicode \
--enable-vserver
-
make $MAKEFLAGS
}
package() {
- make -C "htop-$pkgver" DESTDIR="$pkgdir" install
+ make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install
}
diff --git a/htop-temperature.patch b/htop-temperature.patch
index 1c5dd870898..e57f326c7ce 100644
--- a/htop-temperature.patch
+++ b/htop-temperature.patch
@@ -86,25 +86,6 @@ index fb82413..bda5318 100644
SWAP,
PROCESS,
PROCESS_SHADOW,
-diff --git a/Makefile.am b/Makefile.am
-index 19c9eb4..3398b9b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -37,12 +37,12 @@ AffinityPanel.h HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h \
- EnvScreen.h InfoScreen.h XAlloc.h
-
- if HTOP_LINUX
- htop_CFLAGS += -rdynamic
- myhtopplatsources = linux/Platform.c linux/IOPriorityPanel.c linux/IOPriority.c \
--linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c
-+linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c TemperatureMeter.c
-
- myhtopplatheaders = linux/Platform.h linux/IOPriorityPanel.h linux/IOPriority.h \
--linux/LinuxProcess.h linux/LinuxProcessList.h linux/LinuxCRT.h linux/Battery.h
-+linux/LinuxProcess.h linux/LinuxProcessList.h linux/LinuxCRT.h linux/Battery.h TemperatureMeter.h
- endif
-
- if HTOP_FREEBSD
diff --git a/TemperatureMeter.c b/TemperatureMeter.c
new file mode 100644
index 0000000..9ee9185
@@ -245,7 +226,7 @@ index de7bb84..a8e8a6f 100644
#include "HostnameMeter.h"
#include "LinuxProcess.h"
+#include "TemperatureMeter.h"
-
+
#include <math.h>
#include <assert.h>
@@ -116,6 +117,7 @@ MeterClass* Platform_meterTypes[] = {
@@ -256,3 +237,25 @@ index de7bb84..a8e8a6f 100644
&UptimeMeter_class,
&BatteryMeter_class,
&HostnameMeter_class,
+diff --git a/Makefile.am b/Makefile.am
+index cd5209c..c700e34 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -48,14 +48,15 @@ linux_platform_headers = \
+ linux/LinuxProcess.h \
+ linux/LinuxProcessList.h \
+ linux/LinuxCRT.h \
+- linux/Battery.h
++ linux/Battery.h \
++ TemperatureMeter.h
+
+ all_platform_headers += $(linux_platform_headers)
+
+ if HTOP_LINUX
+ AM_CFLAGS += -rdynamic
+ myhtopplatsources = linux/Platform.c linux/IOPriorityPanel.c linux/IOPriority.c \
+-linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c
++linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c TemperatureMeter.c
+
+ myhtopplatheaders = $(linux_platform_headers)
+ endif