<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0ec59c5f1694a15ac5787991abcf99a59ef3352c">https://github.com/macports/macports-ports/commit/0ec59c5f1694a15ac5787991abcf99a59ef3352c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0ec59c5f1694a15ac5787991abcf99a59ef3352c
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Fri Feb 1 10:37:50 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> gkrellm: update commits from 2.3.10 onward from git master branch
</span>---
sysutils/gkrellm/Portfile | 2 +-
sysutils/gkrellm/files/patch-master-commits.diff | 61 ++++++++++++++++++++++--
2 files changed, 58 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gkrellm/Portfile b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a44b26f..83bfd79 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name gkrellm
version 2.3.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories sysutils
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gkrellm/files/patch-master-commits.diff b/sysutils/gkrellm/files/patch-master-commits.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e8f5f3..6ad1f21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gkrellm/files/patch-master-commits.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gkrellm/files/patch-master-commits.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,8 +233,33 @@ index bacd3cd..40d4198 100644
</span>
#ifdef BAT_ESTIMATE_DEBUG
fprintf(stderr, "eta = %.2f\t", eta);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/client.c b/src/client.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e644eba..8f9d5f8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/client.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/client.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1787,6 +1787,11 @@ read_server_setup(gint fd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_client_mode_disconnect(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (client_input_id != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gdk_input_remove(client_input_id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ client_input_id = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (client_fd >= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_debug(DEBUG_CLIENT, "gkrellm_client_mode_disconnect(); " \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1795,8 +1800,6 @@ gkrellm_client_mode_disconnect(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ client_fd = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ server_alive = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gdk_input_remove(client_input_id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- client_input_id = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span> diff --git a/src/fs.c b/src/fs.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 626bc74..6c73f41 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 626bc74..5db65b1 100644
</span> --- a/src/fs.c
+++ b/src/fs.c
@@ -460,7 +460,7 @@ fs_draw_decal_text(FSmon *fs, gint value)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,6 +271,15 @@ index 626bc74..6c73f41 100644
</span>
if (value == 0)
{
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -810,7 +810,7 @@ fs_update(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fs->blocks > 2147483648LL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs->krell_factor = 1024 * 1024;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (fs->blocks > 2097152LL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fs->krell_factor = 1024 * 1024;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fs->krell_factor = 1024;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs->krell_factor = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> diff --git a/src/gkrellm-sysdeps.h b/src/gkrellm-sysdeps.h
index 9a0f8fc..07295fb 100644
--- a/src/gkrellm-sysdeps.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -452,10 +486,29 @@ index c82dfaf..921cf63 100644
</span> cnt = sensors_nvidia_settings_ngpus();
ngpus_added = 0;
diff --git a/src/utils.c b/src/utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f5300df..0190ed8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f6162e9..0190ed8 100644
</span> --- a/src/utils.c
+++ b/src/utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -370,7 +370,8 @@ gkrellm_text_extents(PangoFontDescription *font_desc, gchar *text,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -276,13 +276,17 @@ gkrellm_format_size_abbrev(gchar *buf, size_t buflen, gfloat size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gfloat abs_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ abs_size = (size < 0.0) ? -size : size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < tbl_size - 1; ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (abs_size < tbl[i].limit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return snprintf(buf, buflen, tbl[i].format, size / tbl[i].divisor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = snprintf(buf, buflen, tbl[i].format, size / tbl[i].divisor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ret < 0 || ret >= buflen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -366,7 +370,8 @@ gkrellm_text_extents(PangoFontDescription *font_desc, gchar *text,
</span> else
{
utf8 = g_locale_to_utf8(text, -1, NULL, NULL, NULL);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -465,7 +518,7 @@ index f5300df..0190ed8 100644
</span> g_free(utf8);
}
iter = pango_layout_get_iter(layout);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -460,7 +461,8 @@ gkrellm_gdk_draw_text(GdkDrawable *drawable, PangoFontDescription *font_desc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -456,7 +461,8 @@ gkrellm_gdk_draw_text(GdkDrawable *drawable, PangoFontDescription *font_desc,
</span>
layout = gtk_widget_create_pango_layout(gkrellm_get_top_window(), NULL);
pango_layout_set_font_description(layout, font_desc);
</pre><pre style='margin:0'>
</pre>