* [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/
@ 2015-09-11 11:12 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2015-09-11 11:12 UTC (permalink / raw
To: gentoo-commits
commit: 1a1f3bd13a4e84aa1adbe3f77f26cfff3d6982e7
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 11:11:46 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 11:12:02 2015 +0000
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 <polynomial-c <AT> 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 0000000..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 */
+- gint table_size;
++ gchar buf[4097]; /* TODO: Use dynamic receive buffer */
++ gint table_size;
++ gint rs;
++ gint retries = 10;
+
+ gkrellm_debug(DEBUG_CLIENT, "read_server_setup()\n");
+
+@@ -1726,13 +1728,18 @@ read_server_setup(gint fd)
+
+ gkrellm_free_glist_and_data(&client_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(10000);
++ else
++ return FALSE;
++ }
+ if (!strcmp(buf, "</gkrellmd_setup>"))
+ break;
+ process_server_line(&setup_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(10000);
++ else
++ return FALSE;
++ }
+ if (!strcmp(buf, "</initial_update>"))
+ break;
+ process_server_line(&update_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 0000000..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 b/src/plugins.c
+index 18278fa..55cd157 100644
+--- a/src/plugins.c
++++ b/src/plugins.c
+@@ -1349,7 +1349,7 @@ replace_plugins()
+ {
+ gtk_box_pack_start(GTK_BOX(gkrellm_monitor_vbox()),
+ mon->privat->main_vbox, FALSE, FALSE, 0);
+- g_object_ref(G_OBJECT(mon->privat->main_vbox));
++ g_object_unref(G_OBJECT(mon->privat->main_vbox));
+ }
+ }
+ }
+--
+cgit v0.10.2-6-g49f6
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_gtk_deprecation_warning.patch b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_gtk_deprecation_warning.patch
new file mode 100644
index 0000000..1f40e2c
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_gtk_deprecation_warning.patch
@@ -0,0 +1,29 @@
+From e15c0d4a029e14e8fbd03f2773b8504d7e090ced Mon Sep 17 00:00:00 2001
+From: Bill Wilson
+Date: Tue, 21 Oct 2014 18:49:41 -0500
+Subject: Fix deprecated allow-shring & allow-grow warnings
+
+Reported by Troy Engel, avoid recent GTK version deprecated warnings
+by using gtk_window_set_resizable().
+
+diff --git a/src/main.c b/src/main.c
+index 205f462..d130d81 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -1553,9 +1553,10 @@ create_widget_tree()
+
+ gtk_widget_realize(gtree.window);
+
+- /* gtk_window_set_resizable() */
+- g_object_set(G_OBJECT(gtree.window), "allow_shrink", FALSE, NULL);
+- g_object_set(G_OBJECT(gtree.window), "allow_grow", FALSE, NULL);
++ /* Set the toplevel window size handling to be under program control.
++ */
++ gtk_window_set_resizable((GtkWindow *) gtree.window, FALSE);
++
+ if (!decorated)
+ gtk_window_set_decorated((GtkWindow *) gtree.window, FALSE);
+
+--
+cgit v0.10.2-6-g49f6
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-update_german_translation.patch.xz b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-update_german_translation.patch.xz
new file mode 100644
index 0000000..993f27e
Binary files /dev/null and b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-update_german_translation.patch.xz differ
diff --git a/app-admin/gkrellm/files/gkrellmd.initd b/app-admin/gkrellm/files/gkrellmd.initd
new file mode 100644
index 0000000..2a3bd69
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="gkrell system monitor daemon"
+pidfile="/var/run/gkrellmd.pid"
+command="/usr/bin/gkrellmd"
+command_args="${GKRELLMD_OPTS}"
+command_background="true"
+
+depend() {
+ need net
+ after lm_sensors
+ after hddtemp
+}
diff --git a/app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild b/app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild
new file mode 100644
index 0000000..e2149f4
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+ dev-libs/glib:2
+ hddtemp? ( app-admin/hddtemp )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( ssl? ( dev-libs/openssl:0= ) )
+ lm_sensors? ( sys-apps/lm_sensors )
+ nls? ( virtual/libintl )
+ ntlm? ( net-libs/libntlm )
+ X? (
+ x11-libs/gtk+:2
+ 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}-fix_gtk_deprecation_warning.patch
+ "${FILESDIR}"/${P}-fix_copypaste_error.patch
+ "${FILESDIR}"/${P}-avoid_possible_busy_loop.patch
+ "${FILESDIR}"/${P}-update_german_translation.patch.xz
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup gkrellmd
+ enewuser gkrellmd -1 -1 -1 gkrellmd
+ TARGET=
+ use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+ sed -e 's:-O2 ::' \
+ -e 's:override CC:CFLAGS:' \
+ -e 's:-L/usr/X11R6/lib::' \
+ -i */Makefile || die "sed Makefile(s) failed"
+
+ sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+ -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+ -i src/${PN}.h || die "sed ${PN}.h failed"
+
+ epatch ${PATCHES[@]}
+}
+
+src_compile() {
+ if use X ; then
+ local sslopt=""
+ if use gnutls; then
+ sslopt="without-ssl=yes"
+ elif use ssl; then
+ sslopt="without-gnutls=yes"
+ else
+ sslopt="without-ssl=yes without-gnutls=yes"
+ fi
+
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ STRIP="" \
+ INSTALLROOT="${EPREFIX}/usr" \
+ INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+ LOCALEDIR="${EPREFIX}/usr/share/locale" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes") \
+ $(usex ntlm "" "without-ntlm=yes") \
+ ${sslopt}
+ else
+ cd server || die
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ LINK_FLAGS="$LDFLAGS -Wl,-E" \
+ STRIP="" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes")
+ fi
+}
+
+src_install() {
+ if use X ; then
+ emake \
+ install${TARGET:+_}${TARGET} \
+ $(usex nls "" "enable_nls=0") \
+ STRIP="" \
+ INSTALLDIR="${ED}/usr/bin" \
+ INCLUDEDIR="${ED}/usr/include" \
+ LOCALEDIR="${ED}/usr/share/locale" \
+ PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+ MANDIR="${ED}/usr/share/man/man1"
+
+ dohtml *.html
+
+ newicon src/icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} GKrellM ${PN}
+ else
+ dobin server/gkrellmd
+
+ insinto /usr/include/gkrellm2
+ doins server/gkrellmd.h
+ doins shared/log.h
+ fi
+
+ newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+ newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+ systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+ insinto /etc
+ doins server/gkrellmd.conf
+
+ dodoc Changelog CREDITS README
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/
@ 2016-06-04 16:11 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2016-06-04 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 6cd8f758eb5dbd4b1d47fc4564cd402f4a11db52
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 16:05:52 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 16:11:27 2016 +0000
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 <polynomial-c <AT> 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 0000000..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 0000000..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=
+ use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+ sed -e 's:-O2 ::' \
+ -e 's:override CC:CFLAGS:' \
+ -e 's:-L/usr/X11R6/lib::' \
+ -i */Makefile || die "sed Makefile(s) failed"
+
+ sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+ -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+ -i src/${PN}.h || die "sed ${PN}.h failed"
+
+ default
+}
+
+src_compile() {
+ if use X ; then
+ local sslopt=""
+ if use gnutls; then
+ sslopt="without-ssl=yes"
+ elif use ssl; then
+ sslopt="without-gnutls=yes"
+ else
+ sslopt="without-ssl=yes without-gnutls=yes"
+ fi
+
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ STRIP="" \
+ INSTALLROOT="${EPREFIX}/usr" \
+ INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+ LOCALEDIR="${EPREFIX}/usr/share/locale" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes") \
+ $(usex ntlm "" "without-ntlm=yes") \
+ ${sslopt}
+ else
+ cd server || die
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ LINK_FLAGS="$LDFLAGS -Wl,-E" \
+ STRIP="" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes")
+ fi
+}
+
+src_install() {
+ if use X ; then
+ emake \
+ install${TARGET:+_}${TARGET} \
+ $(usex nls "" "enable_nls=0") \
+ STRIP="" \
+ INSTALLDIR="${ED}/usr/bin" \
+ INCLUDEDIR="${ED}/usr/include" \
+ LOCALEDIR="${ED}/usr/share/locale" \
+ PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+ MANDIR="${ED}/usr/share/man/man1"
+
+ docinto html
+ dodoc *.html
+
+ newicon src/icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} GKrellM ${PN}
+ else
+ dobin server/gkrellmd
+
+ insinto /usr/include/gkrellm2
+ doins server/gkrellmd.h
+ doins shared/log.h
+ fi
+
+ newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+ newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+ systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+ insinto /etc
+ doins server/gkrellmd.conf
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/
@ 2019-01-05 21:14 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2019-01-05 21:14 UTC (permalink / raw
To: gentoo-commits
commit: 44ced7fbb5916662cdbd7d17aa3206343fd3fe06
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 5 21:13:40 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 5 21:14:17 2019 +0000
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 <polynomial-c <AT> 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..00000000000
--- 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.000000000 +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.000000000 +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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/
@ 2023-02-03 9:59 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-02-03 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 01e3da75ac69c4e0b67ec637cf0af31f9cc37dc7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 09:59:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 09:59:07 2023 +0000
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 <galiven <AT> users.sourceforge.net>
Signed-off-by: Sam James <sam <AT> 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 000000000000..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 <galiven@users.sourceforge.net>
+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;
+ gint mboxtype;
+- gboolean (*check_func)();
++ gboolean (*check_func)(Mailbox *mbox);
+ gint mail_count;
+ gint new_mail_count;
+ gint old_mail_count;
+@@ -57,8 +58,7 @@ typedef struct
+ off_t last_size;
+ gboolean is_internal; /* Internal mail message (ie: localmachine) */
+ gboolean changed;
+- }
+- 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)
+ {
+ gint grids;
+
+@@ -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);
+ gkrellm_chartconfig_height_connect(cp->config, cb_height, cpu);
+- setup_cpu_scaling(cp->config);
++ setup_cpu_scaling(cp->config, NULL);
+
+ cpu->sensor_decal = cpu->fan_decal = NULL;
+ if (show_panel_labels)
+--- a/src/disk.c
++++ b/src/disk.c
+@@ -104,8 +104,8 @@ static gboolean sys_handles_composite_reset;
+ static gboolean units_are_blocks;
+
+ static void (*read_disk_data)();
+-static gchar *(*name_from_device)();
+-static gint (*order_from_name)();
++static gchar *(*name_from_device)(gint device_number, gint uint_number, gint *order);
++static gint (*order_from_name)(const gchar *name);
+
+
+
+@@ -703,9 +703,10 @@ cb_disk_extra(GtkWidget *widget, GdkEventButton *ev)
+ }
+
+ static void
+-setup_disk_scaling(GkrellmChartconfig *cf, GkrellmChart *cp)
++setup_disk_scaling(GkrellmChartconfig *cf, gpointer data)
+ {
+ gint grids, res;
++ GkrellmChart *cp = (GkrellmChart*)data;
+
+ grids = gkrellm_get_chartconfig_fixed_grids(cf);
+ if (!grids)
+--- a/src/fs.c
++++ b/src/fs.c
+@@ -115,7 +115,7 @@ static GList *fstab_list;
+ static gint uid;
+
+ void (*get_mounts_list)(),
+- (*get_fsusage)(),
++ (*get_fsusage)(gpointer mon, gchar *dir),
+ (*get_fstab_list)();
+ gboolean (*get_fstab_modified)();
+
+@@ -123,8 +123,8 @@ gboolean (*get_fstab_modified)();
+ /* If ejecting is available via an ioctl() or if there is an eject command,
+ | set these up in gkrellm_sys_fs_init() by calling gkrellm_fs_setup_eject().
+ */
+-void (*eject_cdrom_func)(),
+- (*close_cdrom_func)();
++void (*eject_cdrom_func)(gchar *dev),
++ (*close_cdrom_func)(gchar *dev);
+ static gchar *eject_cdrom_command,
+ *close_cdrom_command;
+ static gboolean cdrom_thread_busy; /* for the cdrom_funcs */
+@@ -1536,7 +1536,7 @@ static GtkWidget *alert_button;
+
+ static GtkWidget *data_format_combo_box;
+
+-static gboolean (*original_row_drop_possible)();
++static gboolean (*original_row_drop_possible)(GtkTreeDragDest *dest, GtkTreePath *path, GtkSelectionData *selection_data);
+
+
+ static void
+--- a/src/gkrellm-public-proto.h
++++ b/src/gkrellm-public-proto.h
+@@ -116,8 +116,8 @@ void gkrellm_chartconfig_grid_resolution_adjustment(
+ void gkrellm_set_chartconfig_grid_resolution(GkrellmChartconfig *,
+ gint);
+ gint gkrellm_get_chartconfig_grid_resolution(GkrellmChartconfig *);
+-void gkrellm_chartconfig_grid_resolution_connect(
+- GkrellmChartconfig *, void (*fn)(), gpointer);
++void gkrellm_chartconfig_grid_resolution_connect(GkrellmChartconfig* cf,
++ void (*fn)(GkrellmChartconfig*, gpointer), gpointer);
+ void gkrellm_set_chartconfig_flags(GkrellmChartconfig *, gint);
+
+ void gkrellm_chartconfig_grid_resolution_label(
+@@ -131,10 +131,10 @@ void gkrellm_set_chartconfig_sequence_125(GkrellmChartconfig *,
+ void gkrellm_set_chartconfig_fixed_grids(GkrellmChartconfig *, gint);
+ gint gkrellm_get_chartconfig_fixed_grids(GkrellmChartconfig *);
+ void gkrellm_chartconfig_fixed_grids_connect(GkrellmChartconfig *,
+- void (*fn)(), gpointer);
++ void (*fn)(GkrellmChartconfig*, gpointer), gpointer);
+ gint gkrellm_get_chartconfig_height(GkrellmChartconfig *);
+-void gkrellm_chartconfig_height_connect(GkrellmChartconfig *,
+- void (*fn)(), gpointer);
++void gkrellm_chartconfig_height_connect(GkrellmChartconfig* cf,
++ void (*fn)(GkrellmChartconfig*, gpointer), gpointer);
+ void gkrellm_chartconfig_callback_block(GkrellmChartconfig *, gboolean);
+ void gkrellm_save_chartconfig(FILE *, GkrellmChartconfig *,
+ gchar *, gchar *);
+@@ -274,7 +274,7 @@ GkrellmDecalbutton *gkrellm_make_scaled_button(GkrellmPanel *p,
+ GkrellmDecalbutton *gkrellm_decal_is_button(GkrellmDecal *);
+ void gkrellm_set_in_button_callback(GkrellmDecalbutton *,
+ gint (*func)(), gpointer data);
+-gboolean gkrellm_in_button(GkrellmDecalbutton *button, GdkEventButton *);
++gboolean gkrellm_in_button(GkrellmDecalbutton *button, GdkEventButton *, gpointer data);
+ gboolean gkrellm_in_decal(GkrellmDecal *, GdkEventButton *);
+ void gkrellm_decal_button_connect(GkrellmDecalbutton *, void (*func)(),
+ void *);
+@@ -415,7 +415,7 @@ GkrellmAlertPlugin *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)());
+ void gkrellm_alert_plugin_config_connect(GkrellmAlertPlugin *gap,
+ gchar *tab_name,
+--- a/src/gkrellm.h
++++ b/src/gkrellm.h
+@@ -546,14 +546,15 @@ typedef struct
+ #define NO_CONFIG_AUTO_GRID_RESOLUTION 1
+ #define NO_CONFIG_FIXED_GRIDS 2
+
+-typedef struct
++typedef struct GkrellmChartconfig GkrellmChartconfig;
++struct GkrellmChartconfig
+ {
+ gint flags;
+ gboolean config_loaded;
+ gboolean log;
+
+ gint h;
+- void (*cb_height)();
++ void (*cb_height)(GkrellmChartconfig *config, gpointer data);
+ gpointer cb_height_data;
+ GtkWidget *height_spin_button;
+
+@@ -566,7 +567,7 @@ typedef struct
+ gboolean auto_grid_resolution;
+ gboolean auto_resolution_stick;
+ gboolean sequence_125;
+- void (*cb_grid_resolution)();
++ void (*cb_grid_resolution)(GkrellmChartconfig *config, gpointer data);
+ gpointer cb_grid_resolution_data;
+ GtkWidget *grid_resolution_spin_button;
+ GtkWidget *auto_resolution_control_menubar;
+@@ -583,7 +584,7 @@ typedef struct
+ width;
+
+ gboolean fixed_grids;
+- void (*cb_fixed_grids)();
++ void (*cb_fixed_grids)(GkrellmChartconfig *config, gpointer data);
+ gpointer cb_fixed_grids_data;
+ GtkWidget *fixed_grids_spin_button;
+
+@@ -591,8 +592,7 @@ typedef struct
+ GList **chart_cd_list;
+
+ gboolean cb_block;
+- }
+- GkrellmChartconfig;
++ };
+
+ /* GkrellmCharts are drawn in layers and each data value drawn has its own
+ | layer (the GkrellmChartdata struct -> image/color of the drawn data and
+@@ -750,13 +750,14 @@ typedef struct
+ GkrellmChartdata;
+
+
+-typedef struct
++typedef struct GkrellmDecalbutton GkrellmDecalbutton;
++struct GkrellmDecalbutton
+ {
+ GkrellmPanel *panel;
+ GkrellmDecal *decal;
+- void (*cb_button_click)();
++ void (*cb_button_click)(GkrellmDecalbutton *b, gpointer data);
+ gpointer data;
+- gint (*cb_in_button)();
++ gint (*cb_in_button)(GkrellmDecalbutton *b, GdkEventButton *ev, gpointer data);
+ gpointer in_button_data;
+ gpointer privat;
+ gint cur_index;
+@@ -764,10 +765,9 @@ typedef struct
+ gint saved_index;
+ gint sensitive;
+ gint type;
+- void (*cb_button_right_click)();
++ void (*cb_button_right_click)(GkrellmDecalbutton *b, gpointer data);
+ gpointer right_data;
+- }
+- GkrellmDecalbutton;
++ };
+
+
+
+@@ -791,20 +791,21 @@ typedef struct
+ /* ------- Alerts ------- */
+ #define GKRELLM_ALERTCONFIG_KEYWORD "alert_config"
+
++typedef struct GkrellmAlert GkrellmAlert;
+ typedef struct
+ {
+ struct _GkrellmMonitor *mon;
+ gchar *name,
+ *tab_name;
+- void (*warn_func)(),
+- (*alarm_func)(),
+- (*update_func)(),
+- (*check_func)(),
+- (*destroy_func)();
+- void (*config_create_func)(),
+- (*config_apply_func)(),
+- (*config_save_func)(),
+- (*config_load_func)();
++ void (*warn_func)(GkrellmAlert *alert, gpointer data, gboolean state),
++ (*alarm_func)(GkrellmAlert *alert, gpointer data, gboolean state),
++ (*update_func)(GkrellmAlert *alert, gpointer data),
++ (*check_func)(GkrellmAlert *alert, gpointer data, gfloat value),
++ (*destroy_func)(GkrellmAlert *alert, gpointer data);
++ void (*config_create_func)(GtkWidget *vbox, GkrellmAlert *alert, gpointer data),
++ (*config_apply_func)(GkrellmAlert *alert, gpointer data, gboolean closing),
++ (*config_save_func)(GkrellmAlert *alert, gpointer data, FILE *f, gchar *p, gchar *id),
++ (*config_load_func)(GkrellmAlert *alert, gchar *config_id, gchar *alert_id);
+ }
+ GkrellmAlertPlugin;
+
+@@ -847,7 +848,7 @@ typedef struct
+ }
+ GkrellmAlertkrell;
+
+-typedef struct
++struct GkrellmAlert
+ {
+ GkrellmPanel *panel;
+ gchar *name,
+@@ -870,15 +871,15 @@ typedef struct
+ alarm_repeat;
+ gint delay;
+
+- void (*cb_trigger)();
++ void (*cb_trigger)(GkrellmAlert *alert, gpointer data);
+ gpointer cb_trigger_data;
+ void (*cb_stop)();
+ gpointer cb_stop_data;
+- void (*cb_config)();
++ void (*cb_config)(GkrellmAlert *alert, gpointer data);
+ gpointer cb_config_data;
+- void (*cb_config_create)();
++ void (*cb_config_create)(GkrellmAlert *alert, GtkWidget *vbox1, gpointer data);
+ gpointer cb_config_create_data;
+- void (*cb_command_process)();
++ void (*cb_command_process)(GkrellmAlert *alert, gchar *src, gchar *buf, gint size, void* target);
+ gpointer cb_command_process_data;
+
+ GtkWidget *config_window,
+@@ -910,8 +911,7 @@ typedef struct
+
+ gchar *id_string; /* For unique alert names for alert plugins */
+ GList *plugin_list;
+- }
+- GkrellmAlert;
++ };
+
+ /* ------------------------ */
+
+--- a/src/inet.c
++++ b/src/inet.c
+@@ -36,7 +36,8 @@
+ #include "gkrellm-sysdeps.h"
+ #include "inet.h"
+
+-typedef struct
++typedef struct InetMon InetMon;
++struct InetMon
+ {
+ GtkWidget *vbox;
+ gchar *name;
+@@ -87,8 +88,7 @@ typedef struct
+ port1_1;
+
+ gulong krell_hits;
+- }
+- InetMon;
++ };
+
+ static GkrellmMonitor *mon_inet;
+
+@@ -824,9 +824,10 @@ cb_panel_press(GtkWidget *widget, GdkEventButton *ev)
+ /* Lock the hour and minute heights together.
+ */
+ static void
+-cb_inet_height(GkrellmChartconfig *cf, InetMon *in)
++cb_inet_height(GkrellmChartconfig *cf, gpointer data)
+ {
+ gint h;
++ InetMon *in = (InetMon*) data;
+
+ h = gkrellm_get_chartconfig_height(cf);
+ if (in->chart_minute->h != h)
+--- a/src/krell.c
++++ b/src/krell.c
+@@ -1483,7 +1483,7 @@ gkrellm_show_button(GkrellmDecalbutton *b)
+ }
+
+ gboolean
+-gkrellm_in_button(GkrellmDecalbutton *b, GdkEventButton *ev)
++gkrellm_in_button(GkrellmDecalbutton *b, GdkEventButton *ev, gpointer data)
+ {
+ return gkrellm_in_decal(b->decal, ev);
+ }
+--- a/src/mail.c
++++ b/src/mail.c
+@@ -255,12 +255,13 @@ typedef struct
+ }
+ MailAccount;
+
+-typedef struct
++typedef struct Mailbox Mailbox;
++struct Mailbox
+ {
+ MailAccount *account;
+ gboolean busy;
+ GString *tcp_in;
+- gboolean (*check_func)();
++ gboolean (*check_func)(Mailbox *mbox);
+ gpointer data; /* For external mailboxes (in plugins) */
+ GThread* thread;
+ gint mail_count;
+@@ -277,8 +278,7 @@ typedef struct
+ gchar *uidl;
+ gboolean warned;
+ void *private;
+- }
+- Mailbox;
++ };
+
+ static GList *mailbox_list;
+
+@@ -2309,9 +2309,8 @@ reset_mail_fetch(void)
+ }
+
+ static gboolean
+-run_fetch_program(void)
++run_fetch_program(Mailbox *mbox)
+ {
+- Mailbox *mbox;
+ Mailproc *mp = (Mailproc *) mail_fetch->private;
+ GList *list;
+
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -662,8 +662,9 @@ cb_panel_motion(GtkWidget *widget, GdkEventButton *ev)
+ }
+
+ static void
+-setup_scaling(GkrellmChartconfig *cf, MeminfoChart *mc)
++setup_scaling(GkrellmChartconfig *cf, gpointer data)
+ {
++ MeminfoChart* mc = (MeminfoChart*)data;
+ GkrellmChart *cp = mc->chart;
+ gint res = DEFAULT_GRID_RES,
+ grids = FULL_SCALE_GRIDS;
+--- a/src/net.c
++++ b/src/net.c
+@@ -1165,8 +1165,9 @@ grid_resolution_default(NetMon *net)
+ }
+
+ static void
+-setup_net_scaling(GkrellmChartconfig *cf, NetMon *net)
++setup_net_scaling(GkrellmChartconfig *cf, gpointer data)
+ {
++ NetMon *net = (NetMon*)data;
+ GkrellmChart *cp = net->chart;
+ gint grids, res;
+
+--- a/src/proc.c
++++ b/src/proc.c
+@@ -333,7 +333,7 @@ cb_proc_extra(GtkWidget *widget, GdkEventButton *ev)
+ }
+
+ static void
+-setup_proc_scaling(void)
++setup_proc_scaling(GkrellmChartconfig *config, gpointer data)
+ {
+ GkrellmChart *cp = proc.chart;
+ gint grids, res, new_fork_scaling;
+@@ -567,7 +567,7 @@ create_proc_monitor(GtkWidget *vbox, gint first_create)
+ _("Average process load per minute"));
+
+ gkrellm_alloc_chartdata(cp);
+- setup_proc_scaling();
++ setup_proc_scaling(NULL, NULL);
+
+ /* I put motherboard temp on Proc panel (if temperature sensors found)
+ */
+--- a/src/sensors.c
++++ b/src/sensors.c
+@@ -1985,7 +1985,7 @@ static Sensor *dragged_sensor;
+
+ static gint sensor_last_group;
+
+-static gboolean (*original_row_drop_possible)();
++static gboolean (*original_row_drop_possible)(GtkTreeDragDest *drag_dest, GtkTreePath *path, GtkSelectionData *selection_data);
+
+
+
+--- a/src/sysdeps-unix.c
++++ b/src/sysdeps-unix.c
+@@ -89,7 +89,7 @@
+ #endif
+
+ #if !defined(SENSORS_COMMON) && !defined(WIN32)
+-static gboolean (*mbmon_check_func)();
++static gboolean (*mbmon_check_func)(gboolean);
+ #endif
+
+ gchar *
+--- a/src/sysdeps/sensors-common.c
++++ b/src/sysdeps/sensors-common.c
+@@ -54,7 +54,7 @@ static gchar gkrellm_decimal_point,
+ mbmon_decimal_point;
+ static gboolean mbmon_need_decimal_point_fix;
+
+-static gboolean (*mbmon_check_func)();
++static gboolean (*mbmon_check_func)(gboolean);
+
+ static gboolean
+ mbmon_decimal_point_fix(gchar *buf)
+--
+2.39.1
+
+
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r3.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r3.ebuild
new file mode 100644
index 000000000000..9f6a1d9ebe6c
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop systemd toolchain-funcs
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://gkrellm.srcbox.net/"
+if [[ "${PV}" == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
+else
+ SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-3+"
+SLOT="2"
+IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X"
+
+RDEPEND="
+ acct-group/gkrellmd
+ acct-user/gkrellmd
+ dev-libs/glib:2
+ hddtemp? ( app-admin/hddtemp )
+ ssl? (
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ dev-libs/openssl: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}
+ x11-base/xorg-proto
+ nls? ( sys-devel/gettext )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.5-config.patch"
+ "${FILESDIR}/${PN}-2.3.5-width.patch"
+ "${FILESDIR}/${PN}-2.3.5-sansfont.patch"
+ "${FILESDIR}/${PN}-2.3.11-clang16.patch"
+)
+
+DOCS=( Changelog CREDITS README )
+
+pkg_pretend() {
+ if use gnutls && ! use ssl ; then
+ ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
+ ewarn "No ssl backend will be built!"
+ fi
+}
+
+src_prepare() {
+ sed -e 's:-O2 ::' \
+ -e 's:override CC:CFLAGS:' \
+ -e 's:-L/usr/X11R6/lib::' \
+ -i */Makefile || die "sed Makefile(s) failed"
+
+ sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+ -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+ -i src/${PN}.h || die "sed ${PN}.h failed"
+
+ default
+}
+
+src_compile() {
+ TARGET=
+
+ if use X ; then
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ STRIP="" \
+ INSTALLROOT="${EPREFIX}/usr" \
+ INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+ LOCALEDIR="${EPREFIX}/usr/share/locale" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm-sensors "" "without-libsensors=yes") \
+ $(usex ntlm "" "without-ntlm=yes") \
+ $(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
+ else
+ cd server || die
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ LINK_FLAGS="$LDFLAGS -Wl,-E" \
+ STRIP="" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm-sensors "" "without-libsensors=yes")
+ fi
+}
+
+src_install() {
+ if use X ; then
+ emake \
+ install${TARGET:+_}${TARGET} \
+ $(usex nls "" "enable_nls=0") \
+ STRIP="" \
+ INSTALLDIR="${ED}/usr/bin" \
+ INCLUDEDIR="${ED}/usr/include" \
+ LOCALEDIR="${ED}/usr/share/locale" \
+ PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+ MANDIR="${ED}/usr/share/man/man1"
+
+ docinto html
+ dodoc *.html
+
+ newicon src/icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} GKrellM ${PN}
+ else
+ dobin server/gkrellmd
+
+ insinto /usr/include/gkrellm2
+ doins server/gkrellmd.h
+ doins shared/log.h
+ fi
+
+ newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+ newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+ systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+ insinto /etc
+ doins server/gkrellmd.conf
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-03 10:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-05 21:14 [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2023-02-03 9:59 Sam James
2016-06-04 16:11 Lars Wendler
2015-09-11 11:12 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox