diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-11-18 06:58:04 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-18 06:58:04 +0000 |
commit | 070c77515d1406e762e9e344856546f0a15765b6 (patch) | |
tree | e9c59800869ff27454b82c6afa378a4fee0ef935 /gnome-base | |
parent | 6330245077f9f298a785e17756a8f59a843361a5 (diff) |
gentoo auto-resync : 18:11:2022 - 06:58:04
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/Manifest.gz | bin | 5031 -> 5029 bytes | |||
-rw-r--r-- | gnome-base/libgtop/Manifest | 2 | ||||
-rw-r--r-- | gnome-base/libgtop/files/2.40.0-clang.patch | 135 | ||||
-rw-r--r-- | gnome-base/libgtop/libgtop-2.40.0-r2.ebuild | 46 |
4 files changed, 183 insertions, 0 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex d35cac86f7bb..501e5d17a5e3 100644 --- a/gnome-base/Manifest.gz +++ b/gnome-base/Manifest.gz diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest index 2851b5957008..cf6078570beb 100644 --- a/gnome-base/libgtop/Manifest +++ b/gnome-base/libgtop/Manifest @@ -1,5 +1,7 @@ +AUX 2.40.0-clang.patch 4657 BLAKE2B 4a04d3f14bbc0f255b4f243f5e482b4e5aff7a1c25eab768e6c8578b05e00c5121530cbf5bcae61f15dc13a40f8d25ad9eeee3ddcccbad3b447de8b31b8eb6b8 SHA512 a4ca3d760539625af5cea8c5014674cad4758bea43a5faa80c70657c26f9a7cf179f37d5bd7b9ac7f95df69c6b9ad9004006d4a778e95148eb942644b6a064b5 AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6 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 EBUILD libgtop-2.40.0-r1.ebuild 1237 BLAKE2B fa027c28549b2458b8beb9db18ed4f2de24aff23d88e5ee11c99225bfe4dc4bcc9494d6cd304f98bb119401e06ce91ce1bbe81f8ebb3edb111939502dc35b4a0 SHA512 073209f56c4fa66b5f2f57ed0b913d686b4e5e6e9cb694ca22c169685f0c77436664defee690e2bbfc27b6f20a78ff80892c11df40205653fad143fa78314f65 +EBUILD libgtop-2.40.0-r2.ebuild 1277 BLAKE2B dc40ac3aeee156dfca4e7295f61b4f396879503d4233e6eca58d35c78adbd540c87c1020e500e8e48864b3ab31bd3ae6a5883fb75cf65f91e920c74eb9828955 SHA512 e4905af2f0da7fd2e695f13f01b08298919522c56b43c0d3068cac6b8e1426cda17fb60ba6be8dc6b1e74f4a15d885dcf93ee102ab21f61e41b67a6ec7ac7a88 MISC metadata.xml 348 BLAKE2B a3b76adccaf7cac9d18f004f987e5931ad391a4c73b16dd18ea008761d1ab8d0d343b50281278a27ec1a621c211babdf72db28513bec173916488a64b7b1cb26 SHA512 b99cbbcdb86b81c8280e14ba5d31e396ba6de133334ebeb827113c34a24f03a365c0e40934f6dc39ecfb76be17452e4c50694e1ef3b0358853708dfda040c28c 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/libgtop-2.40.0-r2.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r2.ebuild new file mode 100644 index 000000000000..4f35b7e77763 --- /dev/null +++ b/gnome-base/libgtop/libgtop-2.40.0-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+introspection" + +RDEPEND=" + >=dev-libs/glib-2.26:2 + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/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 +} |