summaryrefslogtreecommitdiff
path: root/htop
diff options
context:
space:
mode:
authorMatt Housh <jaeger@crux.ninja>2020-07-20 10:23:16 -0500
committerMatt Housh <jaeger@crux.ninja>2020-07-20 10:23:16 -0500
commit17c4fffa1e162380fe3e9016d1d0a8a0014c6536 (patch)
treecb245b1ca626134e2e3ee75a8450da58d6dbcc17 /htop
parentc79887e54996b9bd45bd76d88e51bfb578a9bc02 (diff)
downloadopt-17c4fffa1e162380fe3e9016d1d0a8a0014c6536.tar.gz
opt-17c4fffa1e162380fe3e9016d1d0a8a0014c6536.tar.xz
htop: added patch for gcc 10
Diffstat (limited to 'htop')
-rw-r--r--htop/.signature5
-rw-r--r--htop/Pkgfile6
-rw-r--r--htop/gcc10.patch28
3 files changed, 35 insertions, 4 deletions
diff --git a/htop/.signature b/htop/.signature
index af829e15d..6d622925e 100644
--- a/htop/.signature
+++ b/htop/.signature
@@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/VyJxi846kY8mQgpfkDWc6zAdzBlTv8R/1na4keM4PEclGupPj6xdP0fzxQ2nTqEFZ4ubdndMyUUMcP9tGLpHQo=
-SHA256 (Pkgfile) = 808b193f8f89287cd5fd421ff942a95d597584cea1e04f7f7286ccb16b8e65aa
+RWSE3ohX2g5d/dEOow2YCmQMmIIhx7pkK/zAx+pa+HCMcAIY5pqx/1YvryJSOBw/wOmwcBE+KpupSfYedkPrVg0Tp0JLI9fOKwc=
+SHA256 (Pkgfile) = d4635e87ddba1ac5db3bb25733164967b0e6100451d1d44e30bc3b66156dc7d4
SHA256 (.footprint) = f11cf3a232e1f7885985d2d8ee00b4dbfbd263941e45f11afb4c6c56829b148f
SHA256 (htop-2.2.0.tar.gz) = d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57
+SHA256 (gcc10.patch) = 2a09f4fc7752edf4738ac17caa245ade1360f184cdbb92756b5ba5bf4647e1fd
diff --git a/htop/Pkgfile b/htop/Pkgfile
index c9d938741..2e0b2dc5f 100644
--- a/htop/Pkgfile
+++ b/htop/Pkgfile
@@ -6,11 +6,13 @@
name=htop
version=2.2.0
-release=1
-source=(https://hisham.hm/htop/releases/$version/htop-$version.tar.gz)
+release=2
+source=(https://hisham.hm/htop/releases/$version/htop-$version.tar.gz \
+ gcc10.patch)
build() {
cd $name-$version
+ patch -p1 -i $SRC/gcc10.patch
./configure --prefix=/usr
make
make DESTDIR=$PKG install
diff --git a/htop/gcc10.patch b/htop/gcc10.patch
new file mode 100644
index 000000000..4927b93dc
--- /dev/null
+++ b/htop/gcc10.patch
@@ -0,0 +1,28 @@
+diff -urN htop-2.2.0.orig/CRT.h htop-2.2.0/CRT.h
+--- htop-2.2.0.orig/CRT.h 2018-04-10 13:23:24.000000000 +0000
++++ htop-2.2.0/CRT.h 2020-07-14 19:46:33.328273400 +0000
+@@ -140,7 +140,7 @@
+
+ extern int CRT_delay;
+
+-int* CRT_colors;
++extern int* CRT_colors;
+
+ extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
+
+@@ -150,13 +150,13 @@
+
+ extern int CRT_scrollWheelVAmount;
+
+-char* CRT_termType;
++extern char* CRT_termType;
+
+ // TODO move color scheme to Settings, perhaps?
+
+ extern int CRT_colorScheme;
+
+-void *backtraceArray[128];
++extern void *backtraceArray[128];
+
+ #if HAVE_SETUID_ENABLED
+

Generated by cgit