Control: tags 1024219 + patch
Control: tags 1024219 + pending
Dear maintainer,
I've prepared an NMU for cpu-x (versioned as 4.5.1-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Cheers
--
Sebastian Ramacher
diff -Nru cpu-x-4.5.1/debian/changelog cpu-x-4.5.1/debian/changelog
--- cpu-x-4.5.1/debian/changelog 2022-10-26 21:55:18.000000000 +0200
+++ cpu-x-4.5.1/debian/changelog 2022-12-24 13:03:04.000000000 +0100
@@ -1,3 +1,12 @@
+cpu-x (4.5.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches: Apply upstream patch to fix build with procps 4 (Closes:
+ #1024219)
+ * debian/control: Change libprocps-dev to libproc2-dev.
+
+ -- Sebastian Ramacher <sramac...@debian.org> Sat, 24 Dec 2022 13:03:04 +0100
+
cpu-x (4.5.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru cpu-x-4.5.1/debian/control cpu-x-4.5.1/debian/control
--- cpu-x-4.5.1/debian/control 2022-10-21 09:59:15.000000000 +0200
+++ cpu-x-4.5.1/debian/control 2022-12-24 13:03:01.000000000 +0100
@@ -15,7 +15,7 @@
libjson-c-dev,
libncurses-dev,
libpci-dev,
- libprocps-dev,
+ libproc2-dev,
libstatgrab-dev,
nasm,
pkg-config,
diff -Nru cpu-x-4.5.1/debian/patches/2765e68dc4650b7306255e0c10056508d5ab44f8.patch cpu-x-4.5.1/debian/patches/2765e68dc4650b7306255e0c10056508d5ab44f8.patch
--- cpu-x-4.5.1/debian/patches/2765e68dc4650b7306255e0c10056508d5ab44f8.patch 1970-01-01 01:00:00.000000000 +0100
+++ cpu-x-4.5.1/debian/patches/2765e68dc4650b7306255e0c10056508d5ab44f8.patch 2022-12-24 13:01:52.000000000 +0100
@@ -0,0 +1,39 @@
+From 2765e68dc4650b7306255e0c10056508d5ab44f8 Mon Sep 17 00:00:00 2001
+From: Xorg <xorgbrea...@gmail.com>
+Date: Tue, 25 Oct 2022 23:52:53 +0200
+Subject: [PATCH] Update for procps-ng 4.0.1rc3
+
+https://gitlab.com/procps-ng/procps/-/issues/239#note_1145660376
+---
+ src/CMakeLists.txt | 2 +-
+ src/core.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3d9e8394..3e00af35 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -97,7 +97,7 @@ endif(WITH_OPENCL)
+ set(LIBSYSTEM 0)
+ set(LIBPROC2 -1)
+ if(WITH_LIBPROCPS AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND NOT FORCE_LIBSTATGRAB)
+- pkg_check_modules(LIBPROC2 libproc-2)
++ pkg_check_modules(LIBPROC2 libproc2)
+ if(LIBPROC2_FOUND)
+ include_directories(${LIBPROC2_INCLUDE_DIRS})
+ link_directories(${LIBPROC2_LIBRARY_DIRS})
+diff --git a/src/core.c b/src/core.c
+index 54a785b9..663a83fb 100644
+--- a/src/core.c
++++ b/src/core.c
+@@ -60,8 +60,8 @@
+ #endif
+
+ #if HAS_LIBPROC2
+-# include <procps/meminfo.h>
+-# include <procps/misc.h>
++# include <libproc2/meminfo.h>
++# include <libproc2/misc.h>
+ #endif
+
+ #if HAS_LIBPROCPS
diff -Nru cpu-x-4.5.1/debian/patches/series cpu-x-4.5.1/debian/patches/series
--- cpu-x-4.5.1/debian/patches/series 2022-10-21 14:01:55.000000000 +0200
+++ cpu-x-4.5.1/debian/patches/series 2022-12-24 13:02:05.000000000 +0100
@@ -1,3 +1,4 @@
2001_build-with-PIE.patch
2002_avoid-format-security-compiler-flag.patch
1001_typo-fix.patch
+2765e68dc4650b7306255e0c10056508d5ab44f8.patch
