<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0649cd876cf9341107883482f9488ba63072e207">https://github.com/macports/macports-ports/commit/0649cd876cf9341107883482f9488ba63072e207</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 0649cd876cf ht: Don't pack struct ht_tag_flags_s
</span>0649cd876cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0649cd876cf9341107883482f9488ba63072e207
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Nov 19 15:55:28 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> ht: Don't pack struct ht_tag_flags_s
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes build failure on arm64.
</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/67790
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/71286
</span>---
devel/ht/Portfile | 7 ++++---
devel/ht/files/httag.h.patch | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ht/Portfile b/devel/ht/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c89fd6590d..de81bf8cb2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ht/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ht/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,13 +2,12 @@ PortSystem 1.0
</span>
name ht
version 2.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel editors
license GPL-2
maintainers nomaintainer
description HT is a file editor/viewer/analyzer for executables.
homepage http://hte.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
long_description HT is a file editor/viewer/analyzer for executables. The \
goal is to combine the low-level functionality of a debugger \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,12 +17,14 @@ master_sites sourceforge:project/hte/ht-source
</span>
use_bzip2 yes
checksums rmd160 665e20a70a4735acf2102521b49074f94a28fba6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 31f5e8e2ca7f85d40bb18ef518bf1a105a6f602918a0755bc649f3f407b75d70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 31f5e8e2ca7f85d40bb18ef518bf1a105a6f602918a0755bc649f3f407b75d70 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 884139
</span>
depends_lib port:ncurses port:lzo2 port:xorg-libX11
patchfiles configure.patch
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ httag.h.patch \
</span> htapp.cc.patch
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ht/files/httag.h.patch b/devel/ht/files/httag.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5e6aa7be8aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ht/files/httag.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove PACKED from ht_tag_flags_s struct.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Some architectures like Apple Silicon do not allow unaligned pointers; this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fixes compilation on them. I could also not find a reason why this struct would
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+need to be packed, and the resulting code seems to work fine without.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ld: pointer not aligned in '_coff_characteristics'+0x1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/sebastianbiallas/ht/pull/31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- httag.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ httag.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,7 @@ struct ht_tag_flags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct ht_tag_flags_s {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char bitidx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *desc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} PACKED;
</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;'>+ /* GROUP-TAG */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HT_TAG_GROUP 0x03
</span></pre><pre style='margin:0'>
</pre>