diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-04 05:48:38 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-04 05:48:38 -0500 |
| commit | bfd9c39e4712ebdb442d4ca0673061faed1e70e1 (patch) | |
| tree | 0d7a74b4463ee387f9cf9368ceb1b757f694f72a /gnome-base/libgtop | |
| parent | f716a9fe6455d39eef01e718aae68dae61c19704 (diff) | |
| download | baldeagleos-repo-bfd9c39e4712ebdb442d4ca0673061faed1e70e1.tar.gz baldeagleos-repo-bfd9c39e4712ebdb442d4ca0673061faed1e70e1.tar.xz baldeagleos-repo-bfd9c39e4712ebdb442d4ca0673061faed1e70e1.zip | |
Revert "Adding metadata"
This reverts commit f716a9fe6455d39eef01e718aae68dae61c19704.
Diffstat (limited to 'gnome-base/libgtop')
| -rw-r--r-- | gnome-base/libgtop/Manifest | 3 | ||||
| -rw-r--r-- | gnome-base/libgtop/files/2.40.0-clang.patch | 135 | ||||
| -rw-r--r-- | gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch | 27 | ||||
| -rw-r--r-- | gnome-base/libgtop/libgtop-2.40.0-r2.ebuild | 46 | ||||
| -rw-r--r-- | gnome-base/libgtop/libgtop-2.41.3.ebuild | 30 | ||||
| -rw-r--r-- | gnome-base/libgtop/metadata.xml | 11 |
6 files changed, 252 insertions, 0 deletions
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest new file mode 100644 index 000000000000..1ce6d4c6ad81 --- /dev/null +++ b/gnome-base/libgtop/Manifest @@ -0,0 +1,3 @@ +DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b +DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861 +DIST libgtop-2.41.3.tar.xz 754028 BLAKE2B 8a3d3a7d942d37eb532c889b14cc415324b975c136be28c985a3d047a174f5bfae3f862e3cdc8e0a49283c7be58dee9f38e8ceb260d848338d1000d58e8952e2 SHA512 17eca4214229b7b4e40ef572ea61feb60829f3db7870db2c474a813e59c4723d67da8e1c2d22be6ab3b19a6beeab05edbc4833a115196c2288f9a7a0de3d6ef2 diff --git a/gnome-base/libgtop/files/2.40.0-clang.patch b/gnome-base/libgtop/files/2.40.0-clang.patch new file mode 100644 index 000000000000..f36783e98d65 --- /dev/null +++ b/gnome-base/libgtop/files/2.40.0-clang.patch @@ -0,0 +1,135 @@ +https://bugs.gentoo.org/871051 +https://gitlab.gnome.org/GNOME/libgtop/-/commit/7e9fed1513a7937b62bae641b76cee405c6add5a +https://gitlab.gnome.org/GNOME/libgtop/-/commit/df6393ac0cd785727329a97f731a4067334c0ace + +From 7e9fed1513a7937b62bae641b76cee405c6add5a Mon Sep 17 00:00:00 2001 +From: Avinash Sonawane <rootkea@gmail.com> +Date: Mon, 20 Dec 2021 13:16:44 +0530 +Subject: [PATCH] Use correct format specifiers + +--- a/src/daemon/io.c ++++ b/src/daemon/io.c +@@ -27,7 +27,7 @@ void + do_output (int s, glibtop_response *resp, off_t offset, + size_t data_size, const void *data) + { +- glibtop_debug ("Really writing %d bytes at offset %lu.", ++ glibtop_debug ("Really writing %zu bytes at offset %lu.", + sizeof (glibtop_response), offset); + + resp->offset = offset; +@@ -42,7 +42,7 @@ do_output (int s, glibtop_response *resp, off_t offset, + } + + if (resp->data_size) { +- glibtop_debug ("Writing %d bytes of data.", resp->data_size); ++ glibtop_debug ("Writing %lu bytes of data.", resp->data_size); + + if (s == 0) { + if (write (1, data, resp->data_size) < 0) +@@ -84,7 +84,7 @@ do_read (int s, void *ptr, size_t total_size) + tmp_ptr += nread; + ptr = tmp_ptr; + +- glibtop_debug ("READ (%d): %d - %d - %d", ++ glibtop_debug ("READ (%d): %zu - %zu - %zu", + nread, already_read, remaining, total_size); + } + +--- a/src/daemon/main.c ++++ b/src/daemon/main.c +@@ -49,7 +49,7 @@ handle_parent_connection (int s) + glibtop_server_features); + + if (enable_debug) +- syslog_message (LOG_DEBUG, "SIZEOF: %u - %u - %u - %u - %u - %u", ++ syslog_message (LOG_DEBUG, "SIZEOF: %zu - %zu - %zu - %zu - %zu - %zu", + sizeof (glibtop_command), sizeof (glibtop_response), + sizeof (glibtop_mountentry), sizeof (glibtop_union), + sizeof (glibtop_sysdeps), +@@ -58,12 +58,12 @@ handle_parent_connection (int s) + while (do_read (s, cmnd, sizeof (glibtop_command))) { + if (enable_debug) + syslog_message (LOG_DEBUG, +- "Parent (%d) received command %llu from client.", ++ "Parent (%d) received command %lu from client.", + getpid (), cmnd->command); + + if (cmnd->data_size >= BUFSIZ) { + syslog_message (LOG_WARNING, +- "Client sent %llu bytes, but buffer is %lu", ++ "Client sent %lu bytes, but buffer is %lu", + cmnd->data_size, (unsigned long)BUFSIZ); + return; + } +@@ -74,7 +74,7 @@ handle_parent_connection (int s) + + if (cmnd->data_size) { + if (enable_debug) +- syslog_message (LOG_DEBUG, "Client has %llu bytes of data.", ++ syslog_message (LOG_DEBUG, "Client has %lu bytes of data.", + cmnd->data_size); + + do_read (s, parameter, cmnd->data_size); +@@ -244,7 +244,7 @@ handle_parent_connection (int s) + 0, NULL); + break; + default: +- syslog_message (LOG_ERR, "Parent received unknown command %llu.", ++ syslog_message (LOG_ERR, "Parent received unknown command %lu.", + cmnd->command); + break; + } +--- a/src/daemon/slave.c ++++ b/src/daemon/slave.c +@@ -42,10 +42,10 @@ handle_slave_connection (int input, int output) + + while (do_read (input, cmnd, sizeof (glibtop_command))) { + glibtop_debug ("Slave %d received command " +- "%llu from client.", getpid (), cmnd->command); ++ "%lu from client.", getpid (), cmnd->command); + + if (cmnd->data_size >= BUFSIZ) +- glibtop_error ("Client sent %llu bytes, " ++ glibtop_error ("Client sent %lu bytes, " + "but buffer is %lu", + cmnd->size, (unsigned long)BUFSIZ); + +@@ -54,7 +54,7 @@ handle_slave_connection (int input, int output) + memset (parameter, 0, sizeof (parameter)); + + if (cmnd->data_size) { +- glibtop_debug ("Client has %llu bytes of data.", ++ glibtop_debug ("Client has %lu bytes of data.", + cmnd->data_size); + + do_read (input, parameter, cmnd->data_size); +@@ -261,7 +261,7 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp, + break; + #endif + default: +- glibtop_error ("Child received unknown command %llu", ++ glibtop_error ("Child received unknown command %lu", + cmnd->command); + break; + } +GitLab +From df6393ac0cd785727329a97f731a4067334c0ace Mon Sep 17 00:00:00 2001 +From: Avinash Sonawane <rootkea@gmail.com> +Date: Mon, 20 Dec 2021 13:33:42 +0530 +Subject: [PATCH] Pass correct parameter + +--- a/src/daemon/main.c ++++ b/src/daemon/main.c +@@ -226,8 +226,9 @@ handle_parent_connection (int s) + 0, NULL); + break; + case GLIBTOP_CMND_PROC_IO: ++ memcpy (&pid, parameter, sizeof (pid_t)); + glibtop_get_proc_io_l +- (server, &resp->u.data.proc_io, parameter); ++ (server, &resp->u.data.proc_io, pid); + do_output (s, resp, _offset_data (proc_io), + 0, NULL); + break; +GitLab diff --git a/gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch b/gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch new file mode 100644 index 000000000000..86184f9d0a9b --- /dev/null +++ b/gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch @@ -0,0 +1,27 @@ +From 9a0067e0fa4636efa37212d7d56376f8ec02a802 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sat, 21 Mar 2020 18:40:09 +0200 +Subject: [PATCH] build: Workaround chmod on root filesystem sandbox issue + +Just delete this again, but keep the server enabling from +commit ec662d01dac16b81; the suid part has to be handled at +package level instead. +--- + libgtop-sysdeps.m4 | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4 +index b363dae0..81aa5350 100644 +--- a/libgtop-sysdeps.m4 ++++ b/libgtop-sysdeps.m4 +@@ -36,7 +36,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ + libgtop_need_server=yes + libgtop_sysdeps_private_mountlist=yes + libgtop_sysdeps_private_fsusage=yes +- libgtop_postinstall='chown root $(bindir)/libgtop_server2 && chmod 4755 $(bindir)/libgtop_server2' + ;; + netbsd*|bsdi*) + libgtop_sysdeps_dir=bsd +-- +2.20.1 + diff --git a/gnome-base/libgtop/libgtop-2.40.0-r2.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r2.ebuild new file mode 100644 index 000000000000..6c6e232ff74b --- /dev/null +++ b/gnome-base/libgtop/libgtop-2.40.0-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME2_EAUTORECONF="yes" +inherit flag-o-matic gnome2 + +DESCRIPTION="A library that provides top functionality to applications" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libgtop" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +LICENSE="GPL-2+" +SLOT="2/11" # libgtop soname version +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +IUSE="+introspection" + +RDEPEND=" + >=dev-libs/glib-2.26:2 + introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-build/gtk-doc-am-1.4 + >=sys-devel/gettext-0.19.6 + virtual/pkgconfig +" + +PATCHES=( + "${WORKDIR}"/patches # patches from master (not stable branch) that seem safe and fix potential eautoreconf problems + "${FILESDIR}"/${PV}-sandbox-workaround.patch # requires suid handling in ebuild - https://gitlab.gnome.org/GNOME/libgtop/issues/48 + "${FILESDIR}"/${PV}-clang.patch +) + +src_configure() { + # Add explicit stdc, bug #628256 + append-cflags "-std=c99" + + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) +} + +src_install() { + gnome2_src_install + chmod 4755 "${ED}"/usr/bin/libgtop_server2 || die +} diff --git a/gnome-base/libgtop/libgtop-2.41.3.ebuild b/gnome-base/libgtop/libgtop-2.41.3.ebuild new file mode 100644 index 000000000000..a414f4b7eb63 --- /dev/null +++ b/gnome-base/libgtop/libgtop-2.41.3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gnome2 + +DESCRIPTION="A library that provides top functionality to applications" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libgtop" + +LICENSE="GPL-2+" +SLOT="2/11" # libgtop soname version +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +IUSE="+introspection" + +RDEPEND=" + >=dev-libs/glib-2.26:2 + introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-build/gtk-doc-am-1.4 + >=sys-devel/gettext-0.19.6 + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) +} diff --git a/gnome-base/libgtop/metadata.xml b/gnome-base/libgtop/metadata.xml new file mode 100644 index 000000000000..6363c3b98f09 --- /dev/null +++ b/gnome-base/libgtop/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libgtop</remote-id> + </upstream> +</pkgmetadata> |
