Merge ~uralt/ubuntu/+source/libgtop2:merge-lp2130086-resolute into ubuntu/+source/libgtop2:debian/sid

[Ural Tunaboyu]

Builds in PPA: https://launchpad.net/~uralt/+archive/ubuntu/resolute-merges/+builds?build_text=libgtop2&build_state=built

There are no autopkgtests available, but tested upgrading from existing version and installing new version from scratch and both work as expected.

[Nadzeya Hutsko (nadzeya)]

Looks like a pretty straightforward merge, so nothing much to complain about. I also left a comment regarding the number in the changelog; please verify that everything is correct there. Thanks!

question: Should the patch be forwarded to upstream, or is model gathering something we need only in Ubuntu?

nitpick: Commit 970a186 can be squashed with 844a733

review: Needs Information

0d25df4... by Ural Tunaboyu on 2025-12-10

merge-changelogs

8b14a28... by Ural Tunaboyu on 2025-12-10

reconstruct-changelog

1a317f6... by Ural Tunaboyu on 2025-12-10

update-maintainer

[Ural Tunaboyu (uralt)]

Oh oops, thanks for the catch. Updated things now.

[Nadzeya Hutsko (nadzeya)]

Looks good, thanks for addressing the changes. Unfortunately I cannot sponsor the upload, but I think it's upload ready

review: Approve

[Nick Rosbrook (enr0n)]

Looks good, sponsoring.

review: Approve

Unmerged commits

1a317f6... by Ural Tunaboyu on 2025-12-10

update-maintainer

8b14a28... by Ural Tunaboyu on 2025-12-10

reconstruct-changelog

0d25df4... by Ural Tunaboyu on 2025-12-10

merge-changelogs

24865c1... by Ural Tunaboyu on 2025-12-03

d/p/add-model-name-gathering-from-lscpu.patch: add patch

Expand fields with data from lscpu (LP #2116763).

diff --git a/debian/changelog b/debian/changelog
index 9884518..49f6300 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libgtop2 (2.41.3-2ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2130086). Remaining changes:
+    - d/p/add-model-name-gathering-from-lscpu.patch: add patch to expand
+    fields with data from lscpu (LP #2116763).
+
+ -- Ural Tunaboyu <[e-mail]>  Wed, 10 Dec 2025 07:59:30 -0800
+
 libgtop2 (2.41.3-2) unstable; urgency=medium
 
   * Team upload
@@ -26,6 +34,38 @@ libgtop2 (2.41.3-2) unstable; urgency=medium
 
  -- Simon McVittie <[e-mail]>  Tue, 02 Sep 2025 10:55:40 +0100
 
+libgtop2 (2.41.3-1ubuntu1) questing; urgency=medium
+
+  [ Andreas Glinserer ]
+  * d/p/add-model-name-gathering-from-lscpu.patch
+    - Expand fields with data from lscpu (LP: #2116763)
+
+ -- Andreas Glinserer <[e-mail]>  Thu, 04 Sep 2025 14:52:42 +0200
+
+libgtop2 (2.41.3-1build4) noble; urgency=medium
+
+  * No-change rebuild to restore i386 binaries.
+
+ -- Matthias Klose <[e-mail]>  Wed, 17 Apr 2024 13:30:12 +0200
+
+libgtop2 (2.41.3-1build3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <[e-mail]>  Sun, 31 Mar 2024 02:01:26 +0000
+
+libgtop2 (2.41.3-1build2) noble; urgency=medium
+
+  * No-change rebuild against libglib2.0-0t64
+
+ -- Steve Langasek <[e-mail]>  Mon, 11 Mar 2024 23:02:27 +0000
+
+libgtop2 (2.41.3-1build1) noble; urgency=medium
+
+  * No-change rebuild against libglib2.0-0t64
+
+ -- Steve Langasek <[e-mail]>  Fri, 08 Mar 2024 05:23:37 +0000
+
 libgtop2 (2.41.3-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index c0aac7c..c9cdfee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libgtop2
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Emilio Pozuelo Monfort <[e-mail]>,
            Jeremy Bícha <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
diff --git a/debian/patches/add-model-name-gathering-from-lscpu.patch b/debian/patches/add-model-name-gathering-from-lscpu.patch
new file mode 100644
index 0000000..c1ebcaa
--- /dev/null
+++ b/debian/patches/add-model-name-gathering-from-lscpu.patch
@@ -0,0 +1,86 @@
+From: Andreas Glinserer <[e-mail]>
+Date: Mon, 11 Aug 2025 12:34:29 +0200
+Subject: add model name gathering from lscpu
+
+Co-authored-by: Marco Trevisan <[e-mail]>
+---
+ sysdeps/linux/sysinfo.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 59 insertions(+)
+
+diff --git a/sysdeps/linux/sysinfo.c b/sysdeps/linux/sysinfo.c
+index 7dbd5ee..a0d4e5a 100644
+--- a/sysdeps/linux/sysinfo.c
++++ b/sysdeps/linux/sysinfo.c
+@@ -33,6 +33,64 @@ static const unsigned long _glibtop_sysdeps_sysinfo =
+ 
+ static glibtop_sysinfo sysinfo = { .flags = 0 };
+ 
++static void
++extend_sysinfo (glibtop *server)
++{
++	/* expand the already retrieved information by augmenting the output of lscpu into it */
++	const char* key = "model name";
++	g_autofree char *output = NULL;
++	g_autofree char *lscpu = NULL;
++	gint exit_status;
++	g_autoptr (GError) error = NULL;
++	g_auto (GStrv) lines = NULL;
++	g_auto (GStrv) fields = NULL;
++	guint i;
++	const char *command = "lscpu --parse=cpu,MODELNAME";
++
++	if (g_spawn_command_line_sync (command, &output, NULL, &exit_status, &error)) {
++		if (!g_spawn_check_wait_status (exit_status, &error)) {
++			glibtop_warn_r (server, "Could not execute \"%s\" (%i)", command, exit_status);
++			return;
++		}
++	} else {
++		glibtop_warn_r (server, "Failed to spawn \"lscpu\"");
++	}
++
++	/* use output form here on */
++	if (output == NULL)
++		return;
++
++	lines = g_strsplit (output, "\n", 0);
++	char *model;
++	model = NULL;
++
++	for (i = 0; lines[i]; i++) {
++		if (*lines[i] == '#')
++			continue;
++
++		fields = g_strsplit (lines[i], ",", 3);
++		if (g_strv_length (fields) < 2) {
++			continue;
++		}
++
++		/* parse cpu number and model name */
++		guint cpu_num = g_ascii_strtoull (fields[0], NULL, 0);
++
++		if (cpu_num >= sysinfo.ncpu) {
++			continue;
++		}
++
++		/* check if model name field is already present */
++		glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[cpu_num];
++		model = g_hash_table_lookup (cpuinfo->values, key);
++
++		if (model == NULL) {
++			g_ptr_array_add (cpuinfo->labels, key);
++			g_hash_table_insert (cpuinfo->values, g_strdup (key), g_strdup (fields[1]));
++		}
++	}
++}
++
+ static void
+ init_sysinfo (glibtop *server)
+ {
+@@ -100,6 +158,7 @@ init_sysinfo (glibtop *server)
+ 	}
+ 
+ 	g_strfreev(processors);
++	extend_sysinfo (server);
+ 
+ 	sysinfo.flags = _glibtop_sysdeps_sysinfo;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..0bde4a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add-model-name-gathering-from-lscpu.patch