aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lange <DLange@git.local>2021-01-20 09:00:24 +0100
committerDaniel Lange <DLange@git.local>2021-01-20 09:07:41 +0100
commit74161a1ac61365760db1c01fb4f7121650bde78e (patch)
tree6fa1e5d496addc84d4e469f5627814db2d117740
parent520f53ae811a43b77c5515147786ce81099a7352 (diff)
downloaddebian_htop-74161a1ac61365760db1c01fb4f7121650bde78e.tar.gz
debian_htop-74161a1ac61365760db1c01fb4f7121650bde78e.tar.bz2
debian_htop-74161a1ac61365760db1c01fb4f7121650bde78e.zip
Backport fix for kFreeBSD compiler warnings
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/0004-fix-kfreebsd-build.patch25
-rw-r--r--debian/patches/series1
3 files changed, 28 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ddeedf1..da30ec3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,12 @@ htop (3.0.5-3) UNRELEASED; urgency=medium
* Another update to the hurd patch
* Fix PROCDIR for the hurd build
* Disable sensors for hurd build (no libsensors-dev available)
+ * Add patch to silence kFreeBSD compiler warnings
[ Graham Inggs ]
* Add lm-sensors to Suggests
- -- Daniel Lange <DLange@debian.org> Sun, 17 Jan 2021 19:00:00 +0100
+ -- Daniel Lange <DLange@debian.org> Wed, 20 Jan 2021 09:00:00 +0100
htop (3.0.5-2) unstable; urgency=medium
diff --git a/debian/patches/0004-fix-kfreebsd-build.patch b/debian/patches/0004-fix-kfreebsd-build.patch
new file mode 100644
index 0000000..b81be10
--- /dev/null
+++ b/debian/patches/0004-fix-kfreebsd-build.patch
@@ -0,0 +1,25 @@
+Backport of upstream commits 47cebaf and 78b993d
+
+Fix kfreeBSD build warnings
+--- a/freebsd/FreeBSDProcessList.c
++++ b/freebsd/FreeBSDProcessList.c
+@@ -5,6 +5,8 @@
+ in the source distribution for its full text.
+ */
+
++#include "config.h" // IWYU pragma: keep
++
+ #include "FreeBSDProcessList.h"
+
+ #include <assert.h>
+--- a/freebsd/Platform.c
++++ b/freebsd/Platform.c
+@@ -5,6 +5,8 @@
+ in the source distribution for its full text.
+ */
+
++#include "config.h" // IWYU pragma: keep
++
+ #include "Platform.h"
+
+ #include <devstat.h>
diff --git a/debian/patches/series b/debian/patches/series
index 4bde4ca..dec45a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-reset-cached-values.patch
0002-fix-ncurses-field-padding.patch
0003-fix-hurd-build.patch
+0004-fix-kfreebsd-build.patch

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