<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/7e837e629bb6d90c04a9573009e32ebec44c97f8">https://github.com/macports/macports-ports/commit/7e837e629bb6d90c04a9573009e32ebec44c97f8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7e837e629bb6d90c04a9573009e32ebec44c97f8
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Sep 17 12:47:41 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-desktop: apply upstream build fix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream PR https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/85 (@chrstphrchvz thanks)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/61179
</span>---
gnome/gnome-desktop/Portfile | 7 +--
.../files/patch-use-glib-fixed-width-types.diff | 60 ++++++++++++++++++++++
2 files changed, 64 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-desktop/Portfile b/gnome/gnome-desktop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 95fd31c7ee7..9bcf5dd6e8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-desktop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-desktop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,19 +44,20 @@ depends_lib port:desktop-file-utils \
</span> port:xorg-libXrandr \
port:xkeyboard-config
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-disable-broken-tests.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-disable-broken-tests.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-use-glib-fixed-width-types.diff
</span>
# portions of this port are strictly X11 specific
# so a +quartz build is not possible (fails in configure if X11 is absent)
require_active_variants port:gtk3 x11
configure.args -Dgnome_distributor=MacPorts \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Ddesktop_docs=true \
</span> -Dudev=disabled \
-Dsystemd=disabled \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddesktop_docs=true \
</span> -Dgtk_doc=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# gobject-introspection uses g-ir-scanner, which uses $CC from env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# uses g-ir-scanner, which uses $CC from env
</span> if {[variant_isset universal]} {
foreach arch ${configure.universal_archs} {
lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-desktop/files/patch-use-glib-fixed-width-types.diff b/gnome/gnome-desktop/files/patch-use-glib-fixed-width-types.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0bdcfe856f4
</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-desktop/files/patch-use-glib-fixed-width-types.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 65c0d7911bb19b0f0534b2845838b0cc87f39c59 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Christopher Chavez <chrischavez@gmx.us>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 16 Sep 2020 07:47:49 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Use GLib fixed-width types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+…instead of C99 fixed-width types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: #168
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgnome-desktop/gnome-desktop-thumbnail-script.c | 8 ++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgnome-desktop/gnome-rr.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 5 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 02776cd2..cfbbad04 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgnome-desktop/gnome-desktop-thumbnail-script.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgnome-desktop/gnome-desktop-thumbnail-script.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,10 +238,10 @@ flatpak_get_arch (void)
</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;'>+ /* From https://github.com/flatpak/flatpak/blob/master/common/flatpak-run.c */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const uint32_t seccomp_x86_64_extra_arches[] = { SCMP_ARCH_X86, 0, };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const guint32 seccomp_x86_64_extra_arches[] = { SCMP_ARCH_X86, 0, };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SCMP_ARCH_AARCH64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const uint32_t seccomp_aarch64_extra_arches[] = { SCMP_ARCH_ARM, 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const guint32 seccomp_aarch64_extra_arches[] = { SCMP_ARCH_ARM, 0 };
</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;'>+ static inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -379,8 +379,8 @@ setup_seccomp (GPtrArray *argv_array,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (arch != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t arch_id = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const uint32_t *extra_arches = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint32 arch_id = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const guint32 *extra_arches = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (strcmp (arch, "i386") == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libgnome-desktop/gnome-rr.h b/libgnome-desktop/gnome-rr.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 111bab3f..7b5c92d4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgnome-desktop/gnome-rr.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgnome-desktop/gnome-rr.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Conversion matrix in S31.32 sign-magnitude (not two's complement!)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * format.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint64_t matrix[9];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint64 matrix[9];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } GnomeRRCTM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Error codes */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>