<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4adcdabf66d166e5fc6dadc9f7f8a98fc3cc47b1">https://github.com/macports/macports-ports/commit/4adcdabf66d166e5fc6dadc9f7f8a98fc3cc47b1</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 4adcdabf66d libdazzle: Support for 10.4, 10.5, and PowerPC (#12250)
</span>4adcdabf66d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4adcdabf66d166e5fc6dadc9f7f8a98fc3cc47b1
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Thu Sep 16 11:00:20 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> libdazzle: Support for 10.4, 10.5, and PowerPC (#12250)
</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/63490
</span>---
gnome/libdazzle/Portfile | 16 +++++++++++++++
.../files/patch-libdazzle-gcc-powerpc-packed.diff | 23 ++++++++++++++++++++++
2 files changed, 39 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libdazzle/Portfile b/gnome/libdazzle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1be5f41489..bbf2daa03fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libdazzle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libdazzle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,10 @@
</span> PortSystem 1.0
PortGroup meson 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# posix_memalign
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 9
</span>
name libdazzle
version 3.38.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,4 +53,16 @@ if {${universal_possible} && [variant_isset universal]} {
</span> destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# PowerPC support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}] && ${os.arch} eq "powerpc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/63490
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libdazzle-gcc-powerpc-packed.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Work around some fstack-protector-strong link errors. We could patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # locally, but the same error affects the g-ir-scanner invocation, so it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # won't do any good until gnome.generate_gir is fixed in meson.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://gitlab.gnome.org/GNOME/libdazzle/-/merge_requests/56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --buildtype=plain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libdazzle/files/patch-libdazzle-gcc-powerpc-packed.diff b/gnome/libdazzle/files/patch-libdazzle-gcc-powerpc-packed.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f3cc2a8460b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libdazzle/files/patch-libdazzle-gcc-powerpc-packed.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+For some reason with GCC7 compiling on PPC, the "pack" pragmas still add
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+alignment padding at the end of the struct. This is not true of gcc-apple-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and earlier, nor is it true of __attribute__((packed)).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://trac.macports.org/ticket/63490
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/search/dzl-fuzzy-mutable-index.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/search/dzl-fuzzy-mutable-index.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,13 +59,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guint case_sensitive : 1;
</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;'>+-#pragma pack(push, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef struct __attribute__((packed))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guint64 id : 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guint64 pos : 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } DzlFuzzyMutableIndexItem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma pack(pop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_STATIC_ASSERT (sizeof(DzlFuzzyMutableIndexItem) == 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>