<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a836306931940d410e240fdccf6e801052b36b6">https://github.com/macports/macports-ports/commit/9a836306931940d410e240fdccf6e801052b36b6</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 9a836306931 poedit: Defuzz gettext patch to fix macOS 13 build
</span>9a836306931 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a836306931940d410e240fdccf6e801052b36b6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Feb 7 12:50:30 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> poedit: Defuzz gettext patch to fix macOS 13 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/66858
</span>---
editors/poedit/Portfile | 2 +-
editors/poedit/files/update-gettext-patch.patch | 122 ++++++++++++++++++++++++
2 files changed, 123 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/poedit/Portfile b/editors/poedit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9ffb498d3d..41c98725a0a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/poedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/poedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,6 @@ PortGroup xcode 1.0
</span> github.setup vslavik poedit 3.2.2 v -oss
revision 0
categories editors
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> # bundles gettext
license MIT GPL-3+
maintainers {l2dy @l2dy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +35,7 @@ post-fetch {
</span> }
patchfiles patch-deps-tool-path.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ update-gettext-patch.patch \
</span> patch-remove-sparkle.diff
if {${configure.sdkroot} eq ""} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/poedit/files/update-gettext-patch.patch b/editors/poedit/files/update-gettext-patch.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0afa937c761
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/poedit/files/update-gettext-patch.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,122 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+De-fuzz the patch that the poedit build applies to its copy of gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to appease the picky patch program in macOS 13.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/vslavik/poedit/issues/781
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deps/gettext/gettext-macos-catalina-dont-touch-parent-dirs.patch.orig 2023-02-07 12:25:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deps/gettext/gettext-macos-catalina-dont-touch-parent-dirs.patch 2023-02-07 12:21:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,48 +3,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ happens to be in e.g. ~/Desktop or ~/Downloads. As we don't care for these
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ capabilities in gettext tools anyway, just disable them as the lesser evil.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-diff -ru gettext-0.20.2.orig/gettext-runtime/configure gettext-0.20.2/gettext-runtime/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---- gettext-0.20.2.orig/gettext-runtime/configure 2020-04-14 06:45:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-+++ gettext-0.20.2/gettext-runtime/configure 2020-05-07 19:27:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@@ -20727,7 +20727,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++diff -ru gettext-0.21.1.orig/gettext-runtime/configure gettext-0.21.1/gettext-runtime/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++--- gettext-0.21.1.orig/gettext-runtime/configure 2022-10-09 16:31:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++++ gettext-0.21.1/gettext-runtime/configure 2023-02-07 12:18:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@ -25602,7 +25602,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -#include <CoreFoundation/CFPreferences.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +#include <Disabled_CoreFoundation/CFPreferences.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@@ -20761,7 +20761,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@ -25638,7 +25638,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -#include <CoreFoundation/CFLocale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +#include <Disabled_CoreFoundation/CFLocale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@@ -21184,7 +21184,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@ -26149,7 +26149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -#include <CoreFoundation/CFPreferences.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +#include <Disabled_CoreFoundation/CFPreferences.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@@ -21218,7 +21218,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@ -26185,7 +26185,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -#include <CoreFoundation/CFLocale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +#include <Disabled_CoreFoundation/CFLocale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-diff -ru gettext-0.20.2.orig/gettext-runtime/m4/intlmacosx.m4 gettext-0.20.2/gettext-runtime/m4/intlmacosx.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---- gettext-0.20.2.orig/gettext-runtime/m4/intlmacosx.m4 2020-04-13 10:42:28.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-+++ gettext-0.20.2/gettext-runtime/m4/intlmacosx.m4 2020-05-07 19:27:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++diff -ru gettext-0.21.1.orig/gettext-runtime/m4/intlmacosx.m4 gettext-0.21.1/gettext-runtime/m4/intlmacosx.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++--- gettext-0.21.1.orig/gettext-runtime/m4/intlmacosx.m4 2022-10-08 21:35:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++++ gettext-0.21.1/gettext-runtime/m4/intlmacosx.m4 2023-02-07 12:18:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_LINK_IFELSE(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,42 +63,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[CFLocaleCopyPreferredLanguages();]])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-diff -ru gettext-0.20.2.orig/gettext-tools/configure gettext-0.20.2/gettext-tools/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---- gettext-0.20.2.orig/gettext-tools/configure 2020-04-14 03:34:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-+++ gettext-0.20.2/gettext-tools/configure 2020-05-07 19:27:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@@ -23270,7 +23270,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++diff -ru gettext-0.21.1.orig/gettext-tools/configure gettext-0.21.1/gettext-tools/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++--- gettext-0.21.1.orig/gettext-tools/configure 2022-10-09 16:32:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++++ gettext-0.21.1/gettext-tools/configure 2023-02-07 12:18:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@ -28356,7 +28356,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -#include <CoreFoundation/CFPreferences.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +#include <Disabled_CoreFoundation/CFPreferences.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@@ -23304,7 +23304,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@ -28392,7 +28392,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -#include <CoreFoundation/CFLocale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +#include <Disabled_CoreFoundation/CFLocale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@@ -23727,7 +23727,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@ -28903,7 +28903,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -#include <CoreFoundation/CFPreferences.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +#include <Disabled_CoreFoundation/CFPreferences.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@@ -23761,7 +23761,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@ -28939,7 +28939,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -#include <CoreFoundation/CFLocale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +#include <Disabled_CoreFoundation/CFLocale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>