<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/2fb78c309ac966a69d3e0bc6224d372c5291f438">https://github.com/macports/macports-ports/commit/2fb78c309ac966a69d3e0bc6224d372c5291f438</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2fb78c309ac966a69d3e0bc6224d372c5291f438
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Mar 15 14:15:29 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-control-center: update to version 3.22.2
</span>---
gnome/gnome-control-center/Portfile | 10 ++++---
.../patch-fix-build-when-wayland-is-disabled.diff | 34 ++++++++++++++++++++++
.../files/patch-fix-crash-renderer-not-set.diff | 30 +++++++++++++++++++
3 files changed, 70 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-control-center/Portfile b/gnome/gnome-control-center/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b93d1f..8249c2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-control-center/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-control-center/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name gnome-control-center
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.22.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.22.2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
description GNOME's main interface for configuration of the various \
aspects of your desktop.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +17,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 400d8591fe1f1dd15ac48eef7b28a613fc8b1855 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d8225856cd1ae92933830b78462252d50b15504c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7512ff3e256c1d43a746752e90a8079d0b064aae35283cfe863e19706ce22f92
</span>
depends_build port:pkgconfig \
port:intltool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,9 @@ depends_run port:gnome-keyring \
</span> # color panel disabled by patch, dependency colord requires libudev
patchfiles patch-disable-color-panel.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-panels-user-accounts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-panels-user-accounts.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-build-when-wayland-is-disabled.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-crash-renderer-not-set.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-control-center/files/patch-fix-build-when-wayland-is-disabled.diff b/gnome/gnome-control-center/files/patch-fix-build-when-wayland-is-disabled.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6704298
</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-control-center/files/patch-fix-build-when-wayland-is-disabled.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4825881b129bdde0eaa5419ece6198ebda420825 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ting-Wei Lan <lantw@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 10 Nov 2016 22:27:11 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: info: Fix build when Wayland is disabled
</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=774324
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panels/info/cc-info-panel.c | 11 +++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 9 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4584766..1d596a3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- panels/info/cc-info-panel.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ panels/info/cc-info-panel.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,8 +351,15 @@ get_graphics_data (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ display = gdk_display_get_default ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (GDK_IS_X11_DISPLAY (display) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GDK_IS_WAYLAND_DISPLAY (display))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gboolean x11_or_wayland = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x11_or_wayland = GDK_IS_X11_DISPLAY (display);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef GDK_WINDOWING_WAYLAND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x11_or_wayland = x11_or_wayland || GDK_IS_WAYLAND_DISPLAY (display);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x11_or_wayland)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *discrete_renderer = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *renderer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-control-center/files/patch-fix-crash-renderer-not-set.diff b/gnome/gnome-control-center/files/patch-fix-crash-renderer-not-set.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cac6c74
</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-control-center/files/patch-fix-crash-renderer-not-set.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 97e4d87ae8a123d5b1711ddbaba6bc0d3a0a39a8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ondrej Holy <oholy@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 5 Dec 2016 10:15:12 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: info: Do not crash if Renderer is not set by SessionManager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This regression has been introduced by commit 52da4da. The
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+info panel crashes if prettify_info() returns NULL. This happens
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if Renderer property from SessionManager is empty.
</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=774240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panels/info/info-cleanup.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/panels/info/info-cleanup.c b/panels/info/info-cleanup.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 20243ec..bb47493 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- panels/info/info-cleanup.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ panels/info/info-cleanup.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,6 +99,9 @@ remove_duplicate_whitespace (const char *old)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GRegex *re;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GError *error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (old == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ re = g_regex_new ("[ \t\n\r]+", G_REGEX_MULTILINE, 0, &error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (re == NULL)
</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>