[gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/
commit: 01e3da75ac69c4e0b67ec637cf0af31f9cc37dc7
Author: Sam James gentoo org>
AuthorDate: Fri Feb 3 09:59:07 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 3 09:59:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e3da75
app-admin/gkrellm: fix various warnings
Closes: https://bugs.gentoo.org/881957
Thanks-to: A Schenck users.sourceforge.net>
Signed-off-by: Sam James gentoo.org>
.../gkrellm/files/gkrellm-2.3.11-clang16.patch | 540 +
app-admin/gkrellm/gkrellm-2.3.11-r3.ebuild | 142 ++
2 files changed, 682 insertions(+)
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.11-clang16.patch
b/app-admin/gkrellm/files/gkrellm-2.3.11-clang16.patch
new file mode 100644
index ..ac71405e8f20
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.11-clang16.patch
@@ -0,0 +1,540 @@
+From 7df25a85ccbd28e22dee437272202fe966f861d1 Mon Sep 17 00:00:00 2001
+From: A Schenck
+Date: Fri, 27 Jan 2023 15:09:58 -0800
+Subject: [PATCH] Declare arguments on function pointers
+
+Solves the errors with -Werror=implicit-function-declaration
-Werror=implicit-int -Werror=incompatible-function-pointer-types
-Werror=deprecated-non-prototype
+--- a/server/mail.c
b/server/mail.c
+@@ -42,12 +42,13 @@
+ #define MBOX_MH_DIR 2
+
+
+-typedef struct
++typedef struct Mailbox Mailbox;
++struct Mailbox
+ {
+ gchar *path;
+ gchar *homedir_path;
+ gintmboxtype;
+- gboolean(*check_func)();
++ gboolean(*check_func)(Mailbox *mbox);
+ gintmail_count;
+ gintnew_mail_count;
+ gintold_mail_count;
+@@ -57,8 +58,7 @@ typedef struct
+ off_t last_size;
+ gbooleanis_internal;/* Internal mail message (ie:
localmachine) */
+ gbooleanchanged;
+- }
+- Mailbox;
++ };
+
+ static GList *mailbox_list;
+
+--- a/src/alerts.c
b/src/alerts.c
+@@ -765,7 +765,7 @@ gkrellm_alert_plugin_add(GkrellmMonitor *mon, gchar *name)
+ void
+ gkrellm_alert_plugin_alert_connect(GkrellmAlertPlugin *gap,
+ void (*alarm_func)(), void (*warn_func)(),
+- void (*update_func)(), void (*check_func)(),
++ void (*update_func)(), void (*check_func)(GkrellmAlert*
alert, gpointer data, gfloat value),
+ void (*destroy_func)())
+ {
+ gap->alarm_func = alarm_func;
+--- a/src/chart.c
b/src/chart.c
+@@ -2107,7 +2107,7 @@
gkrellm_get_chartconfig_grid_resolution(GkrellmChartconfig *cf)
+
+ void
+ gkrellm_chartconfig_grid_resolution_connect(GkrellmChartconfig *cf,
+- void (*func)(gpointer), gpointer data)
++ void (*func)(GkrellmChartconfig *, gpointer), gpointer
data)
+ {
+ if (!cf)
+ return;
+@@ -2206,7 +2206,7 @@ gkrellm_get_chartconfig_fixed_grids(GkrellmChartconfig
*cf)
+
+ void
+ gkrellm_chartconfig_fixed_grids_connect(GkrellmChartconfig *cf,
+- void (*func)(gpointer), gpointer data)
++ void (*func)(GkrellmChartconfig*, gpointer), gpointer
data)
+ {
+ if (!cf)
+ return;
+@@ -2224,7 +2224,7 @@ gkrellm_get_chartconfig_height(GkrellmChartconfig *cf)
+
+ void
+ gkrellm_chartconfig_height_connect(GkrellmChartconfig *cf,
+- void (*func)(gpointer), gpointer data)
++ void (*func)(GkrellmChartconfig*, gpointer), gpointer
data)
+ {
+ if (!cf)
+ return;
+--- a/src/cpu.c
b/src/cpu.c
+@@ -50,7 +50,8 @@ static void cb_alert_config_create(GkrellmAlert *ap,
GtkWidget *vbox,
+ #endif
+
+
+-typedef struct
++typedef struct CpuMon CpuMon;
++struct CpuMon
+ {
+ gchar *name;
+ gchar *panel_label;
+@@ -87,8 +88,7 @@ typedef struct
+ nice,
+ sys,
+ idle;
+- }
+- CpuMon;
++ };
+
+
+ static GkrellmMonitor
+@@ -575,7 +575,7 @@ cb_cpu_extra(GtkWidget *widget, GdkEventButton *ev)
+ }
+
+ static void
+-setup_cpu_scaling(GkrellmChartconfig *cf)
++setup_cpu_scaling(GkrellmChartconfig *cf, gpointer data)
+ {
+ gintgrids;
+
+@@ -741,7 +741,7 @@ static gchar *nice_color_string,
+ *nice_grid_color_string;
+
+ static void
+-cb_height(GkrellmChartconfig *cf, CpuMon *cpu)
++cb_height(GkrellmChartconfig *cf, gpointer data)
+ {
+ GList *list;
+ GkrellmChart*cp;
+@@ -879,7 +879,7 @@ create_cpu(GtkWidget *vbox, gint first_create)
+ gkrellm_chartconfig_fixed_grids_connect(cp->config,
+ setup_cpu_scaling, NULL);
+
[gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/
commit: 44ced7fbb5916662cdbd7d17aa3206343fd3fe06
Author: Lars Wendler gentoo org>
AuthorDate: Sat Jan 5 21:13:40 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Jan 5 21:14:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44ced7fb
app-admin/gkrellm: Revbump to get rid of superfluous patch.
Also bumped to EAPI-7
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch | 24 --
...m-2.3.10-r1.ebuild => gkrellm-2.3.10-r2.ebuild} | 20 ++
2 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
deleted file mode 100644
index fa35ef67279..000
--- a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
gkrellm-2.3.5.old/server/monitor.c 2010-10-06 03:46:59.0 +1100
-+++ gkrellm-2.3.5/server/monitor.c 2011-11-24 02:01:30.871402778 +1100
-@@ -1329,7 +1329,8 @@
- static gchar *remote_fs_types[] =
- {
- "nfs",
-- "smbfs"
-+ "smbfs",
-+ "cifs"
- };
-
- void
gkrellm-2.3.5.old/src/fs.c 2010-09-15 02:25:51.0 +1000
-+++ gkrellm-2.3.5/src/fs.c 2011-11-24 02:00:17.347088370 +1100
-@@ -163,7 +163,8 @@
- static gchar *remote_fs_types[] =
- {
- "nfs",
-- "smbfs"
-+ "smbfs",
-+ "cifs"
- };
-
-
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
similarity index 94%
rename from app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
rename to app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
index b921679f6f1..472c7e81c4b 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils multilib user systemd toolchain-funcs
+inherit desktop multilib user systemd toolchain-funcs
MY_P="${P/_/-}"
DESCRIPTION="Single process stack of various system monitors"
HOMEPAGE="http://www.gkrellm.net/;
-# Upstream named their xz compressed tarball tar.bz2 (*sigh*)
SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2;
LICENSE="GPL-3"
@@ -39,11 +38,13 @@ RDEPEND="
x11-libs/pango
)"
DEPEND="${RDEPEND}
- virtual/pkgconfig
nls? ( sys-devel/gettext )"
+BDEPEND="
+ virtual/pkgconfig
+"
+
PATCHES=(
- "${FILESDIR}"/${PN}-2.3.5-cifs.patch
"${FILESDIR}"/${PN}-2.3.5-config.patch
"${FILESDIR}"/${PN}-2.3.5-width.patch
"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
@@ -61,8 +62,6 @@ pkg_pretend() {
}
pkg_setup() {
- enewgroup gkrellmd
- enewuser gkrellmd -1 -1 -1 gkrellmd
TARGET=
use kernel_FreeBSD && TARGET="freebsd"
}
@@ -140,3 +139,8 @@ src_install() {
einstalldocs
}
+
+pkg_preinst() {
+ enewgroup gkrellmd
+ enewuser gkrellmd -1 -1 -1 gkrellmd
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/
commit: 6cd8f758eb5dbd4b1d47fc4564cd402f4a11db52
Author: Lars Wendler gentoo org>
AuthorDate: Sat Jun 4 16:05:52 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Jun 4 16:11:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd8f758
app-admin/gkrellm: Bump to version 2.3.7
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler gentoo.org>
app-admin/gkrellm/Manifest | 1 +
.../gkrellm-2.3.7-pkgconfig_fix_newlines.patch | 11 ++
app-admin/gkrellm/gkrellm-2.3.7.ebuild | 145 +
3 files changed, 157 insertions(+)
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 33dcea7..1795513 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,3 +1,4 @@
DIST gkrellm-2.3.5.tar.bz2 765011 SHA256
702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512
9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc
WHIRLPOOL
3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
DIST gkrellm-2.3.6-rc1.tar.bz2 784934 SHA256
abeeb0c04a8f911db5f07a95a98e4044326a657f65986013d36a736ba4e47ae8 SHA512
2004c6e57dc5dba9dbbd4c713caa29f5b59e4926b1ce4a3cfb47840096d6d93d66633d15d5588bc22e31df88241248d7910645da75de39278f1fd68255b88517
WHIRLPOOL
f3506e88dc19e3eebe313b5f57a5d605d6b011808391036ff5332140c53061f8ee99b942b2b287cb7f645e9f2491e654623759b4a01fa454c785883355141319
DIST gkrellm-2.3.6_rc1-update_german_translation.patch.xz 18184 SHA256
cb90522c99135736ac3073b7e688fbcb0da31f6594ce3fc851df87c9be10f2df SHA512
c79feb4b740b303e5e6e2ccf84694770bac746b375a0a09918ef1ac67b2700f3a7796251cd4224958ca50a8f81a501bf468dc7a78844218074130758a8248150
WHIRLPOOL
ea3d532aa670b7344cc2dd6c5fd4dda6ec27832c039547ace0772b4a3002baaeb598003d81bf2231b2506de1e22d2b83959e4f1bc7ec13b56b2366c43101ace0
+DIST gkrellm-2.3.7.tar.bz2 777841 SHA256
f7a4642d2cc6b61242215e58e1bd8fe394e6fd984cd3c3f8964c1c554029735d SHA512
832353d245966a5d64ccbacd619905fe437b347c2654e279ec47b56aa1ef559a166b4791d63e151a5481c55c1d3775906e52213f42e5d7071fd15f00f8cecaa5
WHIRLPOOL
3fd8b51a1be5174308fe1dbbb1c1d83df0685c12e71cf410533f97439fb5cf001553c462e15b9971c55c6ea87b28429136fe0025d39c443cb9d215fcf7620f46
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
b/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
new file mode 100644
index 000..a699b80
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
@@ -0,0 +1,11 @@
+--- gkrellm-2.3.7/Makefile
gkrellm-2.3.7/Makefile
+@@ -131,7 +131,7 @@
+ (cd server && ${MAKE} gkrellmd)
+
+ gkrellm.pc: Makefile
+- echo 'prefix=$(INSTALLROOT)\n'\
++ printf 'prefix=$(INSTALLROOT)\n'\
+ 'Name: GKrellM\n'\
+ 'Description: Extensible GTK system monitoring application\n'\
+ 'Version: $(VERSION)\n'\
diff --git a/app-admin/gkrellm/gkrellm-2.3.7.ebuild
b/app-admin/gkrellm/gkrellm-2.3.7.ebuild
new file mode 100644
index 000..49eca4b
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.7.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib user systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/;
+SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2;
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+ dev-libs/glib:2
+ hddtemp? ( app-admin/hddtemp )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+ lm_sensors? ( sys-apps/lm_sensors )
+ nls? ( virtual/libintl )
+ ntlm? ( net-libs/libntlm )
+ X? (
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/pango
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.5-cifs.patch
+ "${FILESDIR}"/${PN}-2.3.5-config.patch
+ "${FILESDIR}"/${PN}-2.3.5-width.patch
+ "${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+ "${FILESDIR}"/${P}-pkgconfig_fix_newlines.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog CREDITS README )
+
+pkg_setup() {
+ enewgroup gkrellmd
+ enewuser gkrellmd -1 -1 -1 gkrellmd
+ TARGET=
+
[gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/
commit: 1a1f3bd13a4e84aa1adbe3f77f26cfff3d6982e7
Author: Lars Wendler gentoo org>
AuthorDate: Fri Sep 11 11:11:46 2015 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Sep 11 11:12:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1f3bd1
app-admin/gkrellm: Bump to version 2.3.6_rc1
Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler gentoo.org>
app-admin/gkrellm/Manifest | 1 +
...krellm-2.3.6_rc1-avoid_possible_busy_loop.patch | 65 ++
.../gkrellm-2.3.6_rc1-fix_copypaste_error.patch| 24
...llm-2.3.6_rc1-fix_gtk_deprecation_warning.patch | 29 +
...lm-2.3.6_rc1-update_german_translation.patch.xz | Bin 0 -> 18184 bytes
app-admin/gkrellm/files/gkrellmd.initd | 16 +++
app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild | 136 +
7 files changed, 271 insertions(+)
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 8faa1e1..e9e4ff7 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1 +1,2 @@
DIST gkrellm-2.3.5.tar.bz2 765011 SHA256
702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512
9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc
WHIRLPOOL
3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
+DIST gkrellm-2.3.6-rc1.tar.bz2 784934 SHA256
abeeb0c04a8f911db5f07a95a98e4044326a657f65986013d36a736ba4e47ae8 SHA512
2004c6e57dc5dba9dbbd4c713caa29f5b59e4926b1ce4a3cfb47840096d6d93d66633d15d5588bc22e31df88241248d7910645da75de39278f1fd68255b88517
WHIRLPOOL
f3506e88dc19e3eebe313b5f57a5d605d6b011808391036ff5332140c53061f8ee99b942b2b287cb7f645e9f2491e654623759b4a01fa454c785883355141319
diff --git
a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-avoid_possible_busy_loop.patch
b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-avoid_possible_busy_loop.patch
new file mode 100644
index 000..b6843b6
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-avoid_possible_busy_loop.patch
@@ -0,0 +1,65 @@
+From 285adc8acd22892f86435edd84bf9b22c915b349 Mon Sep 17 00:00:00 2001
+From: Bill Wilson
+Date: Wed, 5 Nov 2014 17:46:37 -0600
+Subject: Avoid possible busy loop in read_server_setup()
+
+A patch from Joe Garcia. A ssh tunnel can be up but possibly not
+connected to anything in which case gkrellm_getline() can return 0.
+This patch prevents a busy loop by limiting the 0 return retries.
+
+diff --git a/src/client.c b/src/client.c
+index e7c5116..0eb2924 100644
+--- a/src/client.c
b/src/client.c
+@@ -1712,8 +1712,10 @@ process_server_line(KeyTable *table, gint table_size,
gchar *line)
+ static gboolean
+ read_server_setup(gint fd)
+ {
+- gchar buf[4097]; /* TODO: Use dynamic receive buffer
*/
+- ginttable_size;
++ gchar buf[4097]; /* TODO: Use dynamic receive buffer */
++ ginttable_size;
++ gintrs;
++ gintretries = 10;
+
+ gkrellm_debug(DEBUG_CLIENT, "read_server_setup()\n");
+
+@@ -1726,13 +1728,18 @@ read_server_setup(gint fd)
+
+ gkrellm_free_glist_and_data(_plugin_setup_line_list);
+
+-gint rs;
+-
+ while (1)
+ {
+ rs = gkrellm_getline(fd, buf, sizeof(buf));
+-if (rs < 0)
+-return FALSE;
++ if (rs < 0)
++ return FALSE;
++ if (rs == 0)
++ {
++ if (--retries)
++ usleep(1);
++ else
++ return FALSE;
++ }
+ if (!strcmp(buf, ""))
+ break;
+ process_server_line(_table[0], table_size, buf);
+@@ -1751,6 +1758,12 @@ read_server_setup(gint fd)
+ rs = gkrellm_getline(fd, buf, sizeof(buf));
+ if (rs < 0)
+ return FALSE;
++if (rs==0){
++ if(--retries)
++ usleep(1);
++ else
++ return FALSE;
++}
+ if (!strcmp(buf, ""))
+ break;
+ process_server_line(_table[0], table_size, buf);
+--
+cgit v0.10.2-6-g49f6
+
diff --git
a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_copypaste_error.patch
b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_copypaste_error.patch
new file mode 100644
index 000..d5348e2
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_copypaste_error.patch
@@ -0,0 +1,24 @@
+From f3f67b79195cb9dbb6f7c2401ffe17d3e3b8321b Mon Sep 17 00:00:00 2001
+From: Jindřich Makovička
+Date: Sun, 26 Oct 2014 17:15:49 +0100
+Subject: fix copy/paste error
+
+This regression was introduced by commit
+6365d18ad0ab6f3646e220bfc493bb2422c6f9aa
+
+diff --git a/src/plugins.c
