<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/e3a2c3ba563111dd37607794b474f952d46483b9">https://github.com/macports/macports-ports/commit/e3a2c3ba563111dd37607794b474f952d46483b9</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 e3a2c3ba563 poedit: update to 3.0
</span>e3a2c3ba563 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e3a2c3ba563111dd37607794b474f952d46483b9
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sun Oct 3 09:31:56 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> poedit: update to 3.0
</span>---
editors/poedit/Portfile | 6 ++--
editors/poedit/files/patch-builtin_available.diff | 13 ++++++++
editors/poedit/files/patch-deps-tool-path.diff | 37 ++++++++++++-----------
editors/poedit/files/patch-remove-sparkle.diff | 26 ++++++++--------
4 files changed, 49 insertions(+), 33 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 bd49a04042b..52f0bb17cd0 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 2.4.3 v -oss
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup vslavik poedit 3.0 v -oss
</span> revision 0
categories editors
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,8 @@ long_description This program is GUI frontend to GNU gettext utilities \
</span> and catalogs editor/source code parser.
homepage https://poedit.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:gsed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsed \
</span> port:ninja
fetch.type git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +35,7 @@ post-fetch {
</span> }
patchfiles patch-deps-tool-path.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-builtin_available.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-builtin_available.diff b/editors/poedit/files/patch-builtin_available.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cc5bff8b9c7
</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/patch-builtin_available.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/manager.cpp src/manager.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a98d24fc0..49bf3111a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/manager.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/manager.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,7 +123,7 @@ ManagerFrame::ManagerFrame() :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_listPrj = new wxListBox(panel, wxID_ANY, wxDefaultPosition, wxSize(PX(200), -1), 0, nullptr, MSW_OR_OTHER(wxBORDER_SIMPLE, wxBORDER_SUNKEN));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __WXOSX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (@available(macOS 11.0, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (__builtin_available(macOS 11.0, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((NSTableView*)[((NSScrollView*)m_listPrj->GetHandle()) documentView]).style = NSTableViewStyleFullWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><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 5f77003817e..4da3a1b77c6 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,23 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git deps/build.vars.ninja deps/build.vars.ninja
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 36bf5820d..a9a311e0d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deps/build.vars.ninja
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deps/build.vars.ninja
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,7 @@ include build.vars.local.ninja
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Compiler etc. variables:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch = x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--sed = /usr/local/bin/gsed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sed = @@PREFIX@@/bin/gsed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yacc = /usr/local/opt/bison/bin/yacc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ncpu = `sysctl -n hw.ncpu`
</span> diff --git deps/build_deps.sh deps/build_deps.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c82bf2cde..e30d1a01b 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d8354c84d..09bf7cde0 100755
</span> --- deps/build_deps.sh
+++ deps/build_deps.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,4 +53,4 @@ EOT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # don't produce error if the build is stopped for other reasons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,8 +55,8 @@ SDKROOT = $SDKROOT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIGURATION = $CONFIGURATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-sed = $GSED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-yacc = $YACC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sed = @@PREFIX@@/bin/gsed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++yacc = @@PREFIX@@/bin/yacc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ top_srcdir = `pwd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builddir = $DEPS_BUILD_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,7 +72,7 @@ EOT
</span> trap 'exit 0' INT
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ninja $1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@@PREFIX@@/bin/ninja $1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ARCH in $ARCHS; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ninja -f build.$ARCH.ninja $1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @@PREFIX@@/bin/ninja -f build.$ARCH.ninja $1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../macos/merge-archs.sh "$DEPS_BUILD_DIR/$1"
</span><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 cae644eb66a..12216c3bfcc 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,8 +1,8 @@
</span> diff --git Poedit.xcodeproj/project.pbxproj Poedit.xcodeproj/project.pbxproj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 82a5f6f64..2d831d596 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ad97e27d8..373ae8ca4 100644
</span> --- Poedit.xcodeproj/project.pbxproj
+++ Poedit.xcodeproj/project.pbxproj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,9 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,9 +77,7 @@
</span> B24ACD8416F6263900399242 /* Poedit.iconset in Resources */ = {isa = PBXBuildFile; fileRef = B24ACD8316F6263900399242 /* Poedit.iconset */; };
B24D19691E84503B00C6DD8D /* StatusWarning.png in Resources */ = {isa = PBXBuildFile; fileRef = B24D19671E84503B00C6DD8D /* StatusWarning.png */; };
B24D196A1E84503B00C6DD8D /* StatusWarning@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B24D19681E84503B00C6DD8D /* StatusWarning@2x.png */; };
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ index 82a5f6f64..2d831d596 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;'>-@@ -264,17 +262,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,17 +270,6 @@
</span> name = "Copy Quicklook plugin";
runOnlyForDeploymentPostprocessing = 0;
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ index 82a5f6f64..2d831d596 100644
</span> /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -369,7 +356,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -375,7 +362,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,15 +38,15 @@ index 82a5f6f64..2d831d596 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;'>-@@ -617,7 +603,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- B2BF84BA170846290030AA22 /* OpenGL.framework in Frameworks */,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -639,7 +625,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ B2BF84C4170849D00030AA22 /* Carbon.framework in Frameworks */,
</span> B2BF84C1170847E60030AA22 /* IOKit.framework in Frameworks */,
B2284A55183BE68200E097C7 /* Security.framework in Frameworks */,
- B256797517075E6000C52BC5 /* Sparkle.framework in Frameworks */,
B2BF84BE170847220030AA22 /* libz.dylib in Frameworks */,
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ B2B6065525F100F3006186A9 /* WebKit.framework in Frameworks */,
</span> B21FB781179D51BE003F45AC /* libexpat.dylib in Frameworks */,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- B2D76A45181D027F0083C9D9 /* libLucenePlusPlus.a in Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -874,7 +859,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -913,7 +898,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 82a5f6f64..2d831d596 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;'>-@@ -1076,7 +1060,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1109,7 +1093,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 82a5f6f64..2d831d596 100644
</span> B23D1F72181446EF00E6B212 /* Copy Auxiliary Binaries */,
B2B7D470170DD91C00ED0AFE /* Copy Gettext bundle */,
B2CE6D2A1AD0096C007E6863 /* Copy Quicklook plugin */,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1857,7 +1840,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1898,7 +1881,7 @@
</span> "-licudata",
"-licui18n",
);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ index 82a5f6f64..2d831d596 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;'>-@@ -1880,7 +1863,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1921,7 +1904,7 @@
</span> "-licudata",
"-licui18n",
);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,10 +81,10 @@ index 82a5f6f64..2d831d596 100644
</span> PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
diff --git Poedit2.xcworkspace/contents.xcworkspacedata Poedit2.xcworkspace/contents.xcworkspacedata
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index eba85bc59..92cf9bc42 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 65b3f528f..d6629f9bd 100644
</span> --- Poedit2.xcworkspace/contents.xcworkspacedata
+++ Poedit2.xcworkspace/contents.xcworkspacedata
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,9 +19,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,9 +16,6 @@
</span> <FileRef
location = "group:deps/boost/Boost.xcodeproj">
</FileRef>
</pre><pre style='margin:0'>
</pre>