<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8f6ed7741d3e1ddfb6abe6a1653683388a324786">https://github.com/macports/macports-ports/commit/8f6ed7741d3e1ddfb6abe6a1653683388a324786</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8f6ed77 gnome-system-monitor: update to version 3.24.0, dependencies
</span>8f6ed77 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8f6ed7741d3e1ddfb6abe6a1653683388a324786
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Jul 16 08:42:20 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-system-monitor: update to version 3.24.0, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * apply upstream bugfix
</span><span style='display:block; white-space:pre;color:#404040;'> * disable broken wnck option as recommended by developers
</span>---
gnome/gnome-system-monitor/Portfile | 12 +-
.../files/patch-create-gresource-as-bundle.diff | 124 +++++++++++++++++++++
2 files changed, 130 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-system-monitor/Portfile b/gnome/gnome-system-monitor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f374d74..fb595db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-system-monitor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-system-monitor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
# As of 3.17.90 requires C++11 to build when using gtkmm3 > 3.16.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
name gnome-system-monitor
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.22.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.24.0
</span> license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description A system monitor.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +22,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5ca21c02f2e2f3527b7150735600013286b0e543 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 68a5b097157a6e445fc2467cbaecfede77d00b774c93e8aa69b6f784055dc982
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5a17f11e35d56315f4cf43ba1f84d06dd9340973 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4
</span>
depends_build port:pkgconfig \
port:intltool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,12 +39,13 @@ depends_lib port:desktop-file-utils \
</span> port:gtkmm3 \
port:libgtop \
port:librsvg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libwnck3 \
</span> port:libxml2
depends_run port:gnome-themes-standard \
port:yelp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-create-gresource-as-bundle.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +59,6 @@ configure.cmd ./autogen.sh
</span>
configure.args --disable-silent-rules \
--enable-compile-warnings=no \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-wnck \
</span> --disable-systemd \
--disable-schemas-compile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-system-monitor/files/patch-create-gresource-as-bundle.diff b/gnome/gnome-system-monitor/files/patch-create-gresource-as-bundle.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4906304
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-system-monitor/files/patch-create-gresource-as-bundle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,124 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d147bdf584d2f174e5e3d8081b1ecc470dcab635 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= <bdejean@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 30 Apr 2017 17:07:17 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Do not compile the GResource to C but create bundle instead. Load it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in GsmApplication. Install it in .../share/gnome-system-monitor.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugzilla.gnome.org/show_bug.cgi?id=779812
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Makefile.am | 12 ++++++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/application.cpp | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/application.h | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/legacy/Makefile.am | 15 +--------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 19 insertions(+), 18 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/Makefile.am b/src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0d8c4fa..52dfeaa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CPPFLAGS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGSM_LIBEXEC_DIR=\""$(pkglibexecdir)"\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -DGSM_RESOURCE_FILE=\""$(gsmsharedir)/$(gsmshare_DATA)"\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GSM_CFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SYSTEMD_CFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(WNCK_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,9 +45,7 @@ gnome_system_monitor_SOURCES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(gnome_system_monitor_cpp_files) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# See legacy/Makefile.am for explanation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDADD = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- legacy/gsm-resources.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacy/libgsmlegacy.la \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GSM_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SYSTEMD_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,8 +63,13 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dist_noinst_DATA = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(gsettings_in_file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTRA_DIST = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gsm.gresource.xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gsm.gresource: $(top_srcdir)/src/gsm.gresource.xml $(shell glib-compile-resources --sourcedir=$(top_srcdir) --generate-dependencies $(top_srcdir)/src/gsm.gresource.xml)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(top_srcdir) $(top_srcdir)/src/gsm.gresource.xml
</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;'>++gsmsharedir = $(datadir)/@PACKAGE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gsmshare_DATA = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gsm.gresource
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLEANFILES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(gsettings_SCHEMAS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/application.cpp b/src/application.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d5a5e57..eb66e58 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/application.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/application.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,6 +364,8 @@ void GsmApplication::on_startup()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Gtk::Application::on_startup();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ load_resources ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Glib::RefPtr<Gio::SimpleAction> action;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action = Gio::SimpleAction::create("quit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -416,3 +418,10 @@ void GsmApplication::on_startup()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_widget_show (GTK_WIDGET (main_window));
</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;'>++void GsmApplication::load_resources()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto res = Gio::Resource::create_from_file(GSM_RESOURCE_FILE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ res->register_global();
</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;'>+diff --git a/src/application.h b/src/application.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5542de4..50550d6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/application.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/application.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,6 +187,7 @@ class GsmApplication : public Gtk::Application, private procman::NonCopyable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void load_settings();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void load_resources();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void on_preferences_activate(const Glib::VariantBase&);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void on_lsof_activate(const Glib::VariantBase&);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/legacy/Makefile.am b/src/legacy/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8b557d0..8af126f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/legacy/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/legacy/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,12 +5,6 @@ AM_CPPFLAGS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SYSTEMD_CFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(WNCK_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Build the file here to have the proper CFLAGS but manually link the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# file from above otherwise (and I don't understand why) the linker is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# not able to load the objects. even when referencing it, even
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# gsm_get_resource so it's also not getting the ELF section.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BUILT_SOURCES = gsm-resources.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgsmlegacy_c_files = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e_date.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gsm_color_button.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,15 +16,8 @@ libgsmlegacy_h_files = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ noinst_LTLIBRARIES = libgsmlegacy.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgsmlegacy_la_SOURCES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(libgsmlegacy_c_files) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(libgsmlegacy_h_files) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(BUILT_SOURCES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gsm-resources.c: $(top_srcdir)/src/gsm.gresource.xml $(shell glib-compile-resources --sourcedir=$(top_srcdir) --generate-dependencies $(top_srcdir)/src/gsm.gresource.xml)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(top_srcdir) --generate-source $(top_srcdir)/src/gsm.gresource.xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(libgsmlegacy_h_files)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CLEANFILES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(BUILT_SOURCES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -include $(top_srcdir)/git.mk
</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;'>+cgit v0.12
</span></pre><pre style='margin:0'>
</pre>