<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/78f8dbbd898e04173bda83e9c1ac0f138cdda7fb">https://github.com/macports/macports-ports/commit/78f8dbbd898e04173bda83e9c1ac0f138cdda7fb</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 78f8dbbd898 gettext: fixed build on macOS 10.7 and 10.8
</span>78f8dbbd898 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 78f8dbbd898e04173bda83e9c1ac0f138cdda7fb
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Feb 26 13:10:08 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> gettext: fixed build on macOS 10.7 and 10.8
</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/64727
</span>---
devel/gettext/Portfile | 5 +
devel/gettext/files/patch-clang-before-34.diff | 105 +++++++++++++++++++++
.../gettext/files/patch-libtextstyle-libproc.diff | 8 +-
3 files changed, 114 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gettext/Portfile b/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7533840eb81..6899bb316e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +26,10 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
</span> clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The patch is applied to whole sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.dir ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-clang-before-34.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append ac_cv_prog_AWK=/usr/bin/awk \
ac_cv_path_GREP=/usr/bin/grep \
ac_cv_path_SED=/usr/bin/sed
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,6 +148,7 @@ subport ${name}-tools-libs {
</span> configure.dir ${worksrcpath}/${name}-tools
build.dir ${configure.dir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append --disable-openmp \
--with-included-libunistring \
--with-included-libxml \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gettext/files/patch-clang-before-34.diff b/devel/gettext/files/patch-clang-before-34.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..68ea0f24a89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gettext/files/patch-clang-before-34.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,105 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=605e20a698d3f7296cda18ac7dd84b1a8f388b50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d125d4f6d1a5d9845824aaf1d1c9dc69699bf2f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git gettext-runtime/config.h.in gettext-runtime/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aac8c45..f0c03c6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gettext-runtime/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gettext-runtime/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1084,7 +1084,11 @@
</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;'>+ /* Attributes. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __has_attribute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined __has_attribute \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && (!defined __clang_minor__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || (defined __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ? 6000000 <= __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : 3 < __clang_major__ + (5 <= __clang_minor__))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git gettext-runtime/libasprintf/config.h.in gettext-runtime/libasprintf/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e3865a4..18534ec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gettext-runtime/libasprintf/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gettext-runtime/libasprintf/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -209,7 +209,11 @@
</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;'>+ /* Attributes. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __has_attribute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined __has_attribute \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && (!defined __clang_minor__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || (defined __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ? 6000000 <= __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : 3 < __clang_major__ + (5 <= __clang_minor__))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git gettext-tools/config.h.in gettext-tools/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 030077b..147865e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gettext-tools/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gettext-tools/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2309,7 +2309,11 @@
</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;'>+ /* Attributes. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __has_attribute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined __has_attribute \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && (!defined __clang_minor__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || (defined __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ? 6000000 <= __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : 3 < __clang_major__ + (5 <= __clang_minor__))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git gettext-tools/gnulib-lib/cdefs.h gettext-tools/gnulib-lib/cdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d8e4a00..8a8faea 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gettext-tools/gnulib-lib/cdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gettext-tools/gnulib-lib/cdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -409,7 +409,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define __glibc_likely(cond) (cond)
</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;'>+-#ifdef __has_attribute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined __has_attribute \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && (!defined __clang_minor__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || (defined __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ? 6000000 <= __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : 3 < __clang_major__ + (5 <= __clang_minor__))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define __glibc_has_attribute(attr) __has_attribute (attr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define __glibc_has_attribute(attr) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git gettext-tools/libgrep/cdefs.h gettext-tools/libgrep/cdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d8e4a00..8a8faea 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gettext-tools/libgrep/cdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gettext-tools/libgrep/cdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -409,7 +409,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define __glibc_likely(cond) (cond)
</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;'>+-#ifdef __has_attribute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined __has_attribute \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && (!defined __clang_minor__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || (defined __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ? 6000000 <= __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : 3 < __clang_major__ + (5 <= __clang_minor__))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define __glibc_has_attribute(attr) __has_attribute (attr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define __glibc_has_attribute(attr) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libtextstyle/config.h.in libtextstyle/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4e317c8..589b68a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtextstyle/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtextstyle/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1053,7 +1053,11 @@
</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;'>+ /* Attributes. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __has_attribute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined __has_attribute \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && (!defined __clang_minor__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || (defined __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ? 6000000 <= __apple_build_version__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : 3 < __clang_major__ + (5 <= __clang_minor__))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gettext/files/patch-libtextstyle-libproc.diff b/devel/gettext/files/patch-libtextstyle-libproc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fd645e092b..963985383c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gettext/files/patch-libtextstyle-libproc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gettext/files/patch-libtextstyle-libproc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> Combination of:
https://github.com/coreutils/gnulib/commit/8e3d5944a4c6fca1ecf1d76f669da83861eb0ca0
https://github.com/coreutils/gnulib/commit/119622a83d47b01b5a9fb2af4542cdb45f4eb83b
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/get_ppid_of.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/get_ppid_of.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtextstyle/lib/get_ppid_of.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtextstyle/lib/get_ppid_of.c
</span> @@ -33,7 +33,19 @@
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,8 +75,8 @@ https://github.com/coreutils/gnulib/commit/119622a83d47b01b5a9fb2af4542cdb45f4eb
</span> #endif
#if defined _AIX /* AIX */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/get_progname_of.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/get_progname_of.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libtextstyle/lib/get_progname_of.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libtextstyle/lib/get_progname_of.c
</span> @@ -41,7 +41,19 @@
#endif
</pre><pre style='margin:0'>
</pre>