<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cfde34788924972b87c6d00086c5e849cbbf157d">https://github.com/macports/macports-ports/commit/cfde34788924972b87c6d00086c5e849cbbf157d</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 cfde3478892 poedit: update to 3.0.1
</span>cfde3478892 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cfde34788924972b87c6d00086c5e849cbbf157d
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Dec 11 17:30:13 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> poedit: update to 3.0.1
</span>---
editors/poedit/Portfile | 4 ++--
editors/poedit/files/patch-deps-tool-path.diff | 8 +++++---
editors/poedit/files/patch-remove-sparkle.diff | 16 ++++++++--------
editors/poedit/files/patch-xcode12-fix.diff | 25 -------------------------
4 files changed, 15 insertions(+), 38 deletions(-)
<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 62879db414f..cf848d0f58d 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup xcode 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup vslavik poedit 3.0 v -oss
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup vslavik poedit 3.0.1 v -oss
</span> revision 0
categories editors
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,6 +17,7 @@ long_description This program is GUI frontend to GNU gettext utilities \
</span> homepage https://poedit.net/
depends_build port:bison \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span> port:gsed \
port:ninja
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +36,6 @@ post-fetch {
</span> }
patchfiles patch-deps-tool-path.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-xcode12-fix.diff \
</span> patch-remove-sparkle.diff
if {${configure.sdkroot} eq ""} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/poedit/files/patch-deps-tool-path.diff b/editors/poedit/files/patch-deps-tool-path.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4da3a1b77c6..97089028e1d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/poedit/files/patch-deps-tool-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/poedit/files/patch-deps-tool-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,21 @@
</span> diff --git deps/build_deps.sh deps/build_deps.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d8354c84d..09bf7cde0 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 62cffaf6c..ff2e5903e 100755
</span> --- deps/build_deps.sh
+++ deps/build_deps.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,8 +55,8 @@ SDKROOT = $SDKROOT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,9 +63,9 @@ SDKROOT = $SDKROOT
</span> MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET
CONFIGURATION = $CONFIGURATION
-sed = $GSED
-yacc = $YACC
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-curl = $CURL
</span> +sed = @@PREFIX@@/bin/gsed
+yacc = @@PREFIX@@/bin/yacc
<span style='display:block; white-space:pre;background:#e0ffe0;'>++curl = @@PREFIX@@/bin/curl
</span>
top_srcdir = `pwd`
builddir = $DEPS_BUILD_DIR
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +72,7 @@ EOT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,7 @@ EOT
</span> trap 'exit 0' INT
for ARCH in $ARCHS; do
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/poedit/files/patch-remove-sparkle.diff b/editors/poedit/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 12216c3bfcc..331c0e65b3e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/poedit/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/poedit/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> diff --git Poedit.xcodeproj/project.pbxproj Poedit.xcodeproj/project.pbxproj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ad97e27d8..373ae8ca4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8042623c0..c67dd1395 100644
</span> --- Poedit.xcodeproj/project.pbxproj
+++ Poedit.xcodeproj/project.pbxproj
@@ -77,9 +77,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ index ad97e27d8..373ae8ca4 100644
</span> B2567977170763B700C52BC5 /* libwx_osx_cocoa_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2567976170763B700C52BC5 /* libwx_osx_cocoa_static.a */; };
B25D94941AE3D7E3003BC368 /* concurrency.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25D94921AE3D7E3003BC368 /* concurrency.cpp */; };
B25DB35D1E3E5102006D7228 /* ExtractorsGNUgettext.png in Resources */ = {isa = PBXBuildFile; fileRef = B25DB35B1E3E5102006D7228 /* ExtractorsGNUgettext.png */; };
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,17 +270,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,17 +265,6 @@
</span> name = "Copy Quicklook plugin";
runOnlyForDeploymentPostprocessing = 0;
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ index ad97e27d8..373ae8ca4 100644
</span> /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -375,7 +362,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -370,7 +357,6 @@
</span> B24F15811AF38E4500B0022B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
B25504A61A2201DC00EE2CEE /* main_toolbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main_toolbar.h; sourceTree = "<group>"; };
B25504A71A2201E800EE2CEE /* main_toolbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main_toolbar.cpp; path = wx/main_toolbar.cpp; sourceTree = "<group>"; };
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ index ad97e27d8..373ae8ca4 100644
</span> B2567976170763B700C52BC5 /* libwx_osx_cocoa_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwx_osx_cocoa_static.a; sourceTree = BUILT_PRODUCTS_DIR; };
B25D94921AE3D7E3003BC368 /* concurrency.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = concurrency.cpp; sourceTree = "<group>"; };
B25D94931AE3D7E3003BC368 /* concurrency.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = concurrency.h; sourceTree = "<group>"; };
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -639,7 +625,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -630,7 +616,6 @@
</span> B2BF84C4170849D00030AA22 /* Carbon.framework in Frameworks */,
B2BF84C1170847E60030AA22 /* IOKit.framework in Frameworks */,
B2284A55183BE68200E097C7 /* Security.framework in Frameworks */,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ index ad97e27d8..373ae8ca4 100644
</span> B2BF84BE170847220030AA22 /* libz.dylib in Frameworks */,
B2B6065525F100F3006186A9 /* WebKit.framework in Frameworks */,
B21FB781179D51BE003F45AC /* libexpat.dylib in Frameworks */,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -913,7 +898,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -904,7 +889,6 @@
</span> B2D76A44181D027F0083C9D9 /* libLucenePlusPlus.a */,
B21FB780179D51BE003F45AC /* libexpat.dylib */,
B2BF84BD170847220030AA22 /* libz.dylib */,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ index ad97e27d8..373ae8ca4 100644
</span> B2567976170763B700C52BC5 /* libwx_osx_cocoa_static.a */,
B2B7E8191AD94194007FC4EB /* libwx_osx_base_static.a */,
B2BF84C21708498B0030AA22 /* HIToolbox.framework */,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1109,7 +1093,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1100,7 +1084,6 @@
</span> B24ACD5816F6201F00399242 /* Frameworks */,
B24ACD5916F6201F00399242 /* Resources */,
B2CC62E117DB7E2D0097461B /* Set CFBundleVersion from git */,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ index ad97e27d8..373ae8ca4 100644
</span> B23D1F72181446EF00E6B212 /* Copy Auxiliary Binaries */,
B2B7D470170DD91C00ED0AFE /* Copy Gettext bundle */,
B2CE6D2A1AD0096C007E6863 /* Copy Quicklook plugin */,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1898,7 +1881,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1888,7 +1871,7 @@
</span> "-licudata",
"-licui18n",
);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ index ad97e27d8..373ae8ca4 100644
</span> PRODUCT_BUNDLE_IDENTIFIER = "net.poedit.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1921,7 +1904,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1911,7 +1894,7 @@
</span> "-licudata",
"-licui18n",
);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/poedit/files/patch-xcode12-fix.diff b/editors/poedit/files/patch-xcode12-fix.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fa9ac261358..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/poedit/files/patch-xcode12-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 07631894b149ba513f55cb9970c46ad57a078355 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 9 Oct 2021 18:25:25 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation with Xcode 12.5+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Mark manager.cpp as containing Objective-C++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes #717
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Poedit.xcodeproj/project.pbxproj | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Poedit.xcodeproj/project.pbxproj Poedit.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3e86f63862..944f1843bc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Poedit.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Poedit.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -450,7 +450,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- B28F1CC316F629D30018AF7E /* findframe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = findframe.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- B28F1CC416F629D30018AF7E /* gexecute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gexecute.cpp; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- B28F1CC516F629D30018AF7E /* gexecute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gexecute.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- B28F1CCA16F629D30018AF7E /* manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = manager.cpp; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ B28F1CCA16F629D30018AF7E /* manager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = manager.cpp; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- B28F1CCB16F629D30018AF7E /* manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = manager.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- B28F1CCC16F629D30018AF7E /* macos_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macos_helpers.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- B28F1CCD16F629D30018AF7E /* macos_helpers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = macos_helpers.mm; sourceTree = "<group>"; };
</span></pre><pre style='margin:0'>
</pre>