<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fcb8c59d8d93e3d11db6be76784d0590b9d7ac2f">https://github.com/macports/macports-ports/commit/fcb8c59d8d93e3d11db6be76784d0590b9d7ac2f</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 fcb8c59d8d9 gnucash: update patchfile to fix build with latest glib
</span>fcb8c59d8d9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fcb8c59d8d93e3d11db6be76784d0590b9d7ac2f
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Sat Aug 21 13:26:41 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnucash: update patchfile to fix build with latest glib
</span>---
gnome/gnucash/files/patch-glibconfig.h.diff | 43 ++++++++++-------------------
1 file changed, 14 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-glibconfig.h.diff b/gnome/gnucash/files/patch-glibconfig.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cd8f232059c..51a5348ae5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/patch-glibconfig.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnucash/files/patch-glibconfig.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +1,41 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/glibconfig.h 2018-04-12 20:05:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/glibconfig.h 2017-12-18 17:18:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,42 +48,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_GUINT32_FORMAT "u"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/glibconfig.h 2021-08-14 06:13:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/glibconfig.h 2021-08-21 01:21:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,31 +58,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #define G_HAVE_GINT64 1 /* deprecated, always true */
-#ifdef __LP64__
-typedef signed long gint64;
-typedef unsigned long guint64;
-#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>--G_GNUC_EXTENSION typedef signed long long gint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--G_GNUC_EXTENSION typedef unsigned long long guint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_GNUC_EXTENSION typedef signed long long gint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_GNUC_EXTENSION typedef unsigned long long guint64;
</span> -#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef signed long long gint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef unsigned long long guint64;
</span>
-#ifdef __LP64__
-#define G_GINT64_CONSTANT(val) (val##L)
-#define G_GUINT64_CONSTANT(val) (val##UL)
-#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
</span> -#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -#ifdef __LP64__
-#define G_GINT64_MODIFIER "l"
-#define G_GINT64_FORMAT "li"
-#define G_GUINT64_FORMAT "lu"
-#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINT64_CONSTANT(val) (val##LL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GUINT64_CONSTANT(val) (val##ULL)
</span> #define G_GINT64_MODIFIER "ll"
#define G_GINT64_FORMAT "lli"
#define G_GUINT64_FORMAT "llu"
-#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __LP64__
</span> #define GLIB_SIZEOF_VOID_P 8
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GLIB_SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GLIB_SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GLIB_SIZEOF_SSIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLIB_SIZEOF_VOID_P 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLIB_SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLIB_SIZEOF_SIZE_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLIB_SIZEOF_SSIZE_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,39 +101,18 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef signed long gssize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned long gsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,39 +84,18 @@
</span> #define G_POLLFD_FORMAT "%d"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> -#ifdef __LP64__
-#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
-#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,6 +78,6 @@
</span> +#define G_GINTPTR_MODIFIER "I64"
+#define G_GINTPTR_FORMAT "I64i"
+#define G_GUINTPTR_FORMAT "I64u"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef G_DISABLE_DEPRECATED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define g_ATEXIT(proc) (atexit (proc))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_MAJOR_VERSION 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_MINOR_VERSION 62
</span></pre><pre style='margin:0'>
</pre>