<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/65bd916c9ec3fdd70c77bc38014fd84642010608">https://github.com/macports/macports-ports/commit/65bd916c9ec3fdd70c77bc38014fd84642010608</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 65bd916c9ec unac: Include patches to fix build
</span>65bd916c9ec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 65bd916c9ec3fdd70c77bc38014fd84642010608
</span>Author: Keto <therealketo@gmail.com>
AuthorDate: Wed Nov 27 02:32:00 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> unac: Include patches to fix build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69904
</span>---
textproc/unac/Portfile | 25 ++++++++----
textproc/unac/files/gcc-4-fix-bug-556379.patch | 53 ++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/unac/Portfile b/textproc/unac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9bebdc18b55..e6a00b563fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/unac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/unac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span>
name unac
version 1.8.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories textproc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,23 +13,32 @@ description library that removes accents from characters
</span>
long_description ${name} is a ${description}.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.senga.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://ftp.de.debian.org/debian/pool/main/u/unac/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://savannah.nongnu.org/projects/unac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites debian:u/${name}
</span>
distname ${name}_${version}.orig
worksrcdir ${name}-${version}.orig
checksums rmd160 6cc899d4e55fe740ecaf96342a9904555601156b \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 29d316e5b74615d49237556929e95e0d68c4b77a0a0cfc346dc61cf0684b90bf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 29d316e5b74615d49237556929e95e0d68c4b77a0a0cfc346dc61cf0684b90bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 281807
</span>
patchfiles patch-configure.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append gcc-4-fix-bug-556379.patch
</span>
use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./autogen.sh
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:perl5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:perl5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libiconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libiconv
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- touch ${worksrcpath}/config.rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Provide missing configuration files to fix build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${prefix}/share/gettext/config.rpath ${worksrcpath}/config.rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|libtoolize|glibtoolize|" autogen.sh
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/unac/files/gcc-4-fix-bug-556379.patch b/textproc/unac/files/gcc-4-fix-bug-556379.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..09136d817b3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/unac/files/gcc-4-fix-bug-556379.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: fix building with GCC 4.4 and x86-64 architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Emmanuel Engelhart <emmanuel@engelhart.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: https://bugs.debian.org/556379
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2010-09-17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: type error in causes segfault
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Phil Armstrong <phil@kantaka.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: https://bugs.debian.org/623340
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2011-04-19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unac.c.orig Fri Sep 17 10:35:14 2010 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unac.c Fri Sep 17 10:36:07 2010 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13873,9 +13873,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *out_lengthp = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* utf16 = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int utf16_length = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t utf16_length = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* utf16_unaccented = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int utf16_unaccented_length = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t utf16_unaccented_length = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unaccent.c.orig Fri Sep 17 10:35:14 2010 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unaccent.c Fri Sep 17 10:40:34 2010 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* charset = argv[optind++];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* unaccented = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int unaccented_length = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t unaccented_length = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(optind >= argc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BUFFER_SIZE 10240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,7 +101,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perror("");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf("%.*s", unaccented_length, unaccented);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf("%.*s", (int)unaccented_length, unaccented);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* string = argv[optind++];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,7 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(debug_level > UNAC_DEBUG_NONE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, "unaccented version is ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf("%.*s\n", unaccented_length, unaccented);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf("%.*s\n", (int)unaccented_length, unaccented);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(optind < argc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* expected = argv[optind++];
</span></pre><pre style='margin:0'>
</pre>