aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Inggs <ginggs@debian.org>2020-12-11 21:26:58 +0200
committerGraham Inggs <ginggs@debian.org>2020-12-11 21:26:58 +0200
commit02af5ad97f5def09e95d41203432816f50022534 (patch)
tree665f308b38e709bbc7ce4d055d3f7016f898cf37
parentcdb702fe5a9835245c5182050b4232ddaeb5ac73 (diff)
downloaddebian_htop-02af5ad97f5def09e95d41203432816f50022534.tar.gz
debian_htop-02af5ad97f5def09e95d41203432816f50022534.tar.bz2
debian_htop-02af5ad97f5def09e95d41203432816f50022534.zip
Fix kFreeBSD build
-rw-r--r--debian/changelog4
-rw-r--r--debian/control5
-rw-r--r--debian/patches/0003-Fix-kfreebsd-build.patch16
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules8
5 files changed, 29 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 452a374..951a3fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
htop (3.0.3-2) UNRELEASED; urgency=medium
+ [ Daniel Lange ]
* Fix display in tree mode
* Fix pausing screen updates (press Z key) in tree mode
+ [ Graham Inggs ]
+ * Fix kFreeBSD build
+
-- Daniel Lange <DLange@debian.org> Fri, 11 Dec 2020 18:22:00 +0100
htop (3.0.3-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index d018a9f..90f3af5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,13 @@ Uploaders: Eugene V. Lyubimkin <jackyf@debian.org>,
Graham Inggs <ginggs@debian.org>
Build-Depends: debhelper-compat (= 13),
dpkg-dev (>= 1.16.1.1),
+ libdevstat-dev [kfreebsd-any],
libhwloc-dev [!linux-any],
libkvm-dev [kfreebsd-any],
libncurses5-dev,
libncursesw5-dev,
- libnl-3-dev,
- libnl-genl-3-dev,
+ libnl-3-dev [linux-any],
+ libnl-genl-3-dev [linux-any],
libsensors4-dev,
pkg-config
Standards-Version: 4.5.1
diff --git a/debian/patches/0003-Fix-kfreebsd-build.patch b/debian/patches/0003-Fix-kfreebsd-build.patch
new file mode 100644
index 0000000..2e4a630
--- /dev/null
+++ b/debian/patches/0003-Fix-kfreebsd-build.patch
@@ -0,0 +1,16 @@
+Description: Fix kFreeBSD build
+ Drop redundant sys/dirent.h include
+Forwarded: https://github.com/htop-dev/htop/pull/386
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2020-12-11
+
+--- a/freebsd/FreeBSDProcessList.c
++++ b/freebsd/FreeBSDProcessList.c
+@@ -14,7 +14,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/_iovec.h>
+-#include <sys/dirent.h>
+ #include <sys/errno.h>
+ #include <sys/param.h> // needs to be included before <sys/jail.h> for MAXPATHLEN
+ #include <sys/jail.h>
diff --git a/debian/patches/series b/debian/patches/series
index c5991a0..57977ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Fix-broken-tree-display.patch
0002-Fix-paussing-in-tree-mode.patch
+0003-Fix-kfreebsd-build.patch
diff --git a/debian/rules b/debian/rules
index 8fedabd..e561e98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,12 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
ifeq (linux,$(DEB_HOST_ARCH_OS))
- ARCH_DEPENDENT_CONFIGURE_PARAMS = --enable-linux-affinity
+ ARCH_DEPENDENT_CONFIGURE_PARAMS = \
+ --enable-linux-affinity \
+ --enable-delayacct
else
- ARCH_DEPENDENT_CONFIGURE_PARAMS = --enable-hwloc
+ ARCH_DEPENDENT_CONFIGURE_PARAMS = \
+ --enable-hwloc
endif
%:
@@ -20,6 +23,5 @@ override_dh_auto_configure:
--enable-vserver \
--enable-cgroup \
--enable-unicode \
- --enable-delayacct \
--with-sensors \
$(ARCH_DEPENDENT_CONFIGURE_PARAMS)

© 2014-2024 Faster IT GmbH | imprint | privacy policy