<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/74bc88890cac732258a09df7028b93985931603e">https://github.com/macports/macports-ports/commit/74bc88890cac732258a09df7028b93985931603e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 74bc88890cac732258a09df7028b93985931603e
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Dec 27 16:32:07 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> textmate2: Update to 2.0.23, fix livecheck
</span>---
editors/textmate2/Portfile | 99 +++++-----------------
...dd-missing-link-dependency-to-Preferences.patch | 27 ------
editors/textmate2/files/local.rave | 5 ++
..._RMateServer.mm-non-objc-ptr-cast-with-arc.diff | 60 +++++++++++++
.../files/patch-Applications_commit_target.diff | 15 ----
...plist_src_ascii.rl-work-around-ragel7-bugs.diff | 49 -----------
...in__gen_build-avoid-endless-configure-loop.diff | 27 ------
.../files/patch-configure-versionnumber.diff | 18 ----
.../patch-workaround-missing-capnp-dependency.diff | 24 ------
9 files changed, 87 insertions(+), 237 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/Portfile b/editors/textmate2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8091240dd83..f657b858446 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/textmate2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
epoch 5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup textmate textmate 2.0.6 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup textmate textmate 2.0.23 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
maintainers {cal @neverpanic} openmaintainer
name textmate2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,7 @@ long_description ${description}\
</span> TextMate is well-known for its large number of bundles adding support, snippets, completions \
and commands for a huge number of file types.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin >= 18}
</span> license GPL-3+
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,27 +29,9 @@ post-fetch {
</span> system -W ${worksrcpath} "${git.cmd} submodule update --init"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Applications_commit_target.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-versionnumber.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Frameworks_plist_src_ascii.rl-work-around-ragel7-bugs.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-workaround-missing-capnp-dependency.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/@VERSION@/${version}/" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse file ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file tail ${file}] == "target"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "/TESTS *=/d" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "/TEST_SOURCES *=/d" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|xcrun clang\\+\\+|${configure.cxx}|g" ${worksrcpath}/bin/gen_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|xcrun clang|${configure.cc}|g" ${worksrcpath}/bin/gen_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append path:lib/libssl.dylib:openssl \
path:share/curl/curl-ca-bundle.crt:curl-ca-bundle \
port:boost \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:capnproto \
</span> port:multimarkdown \
port:ninja \
port:proctools \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,79 +40,43 @@ depends_build-append path:lib/libssl.dylib:openssl \
</span>
depends_skip_archcheck ninja ragel proctools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:capnproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span> port:libiconv \
port:sqlite3 \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} ne "darwin" || ${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fails to build on 10.13:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "_NSAppearanceNameDarkAqua", referenced from:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -[OakToolTip init] in lto.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} @${version} only works with macOS 10.14 Mojave or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible Mac OS X version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Needs support for -std=c++2a.
compiler.blacklist {clang < 920}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Release notes say "SDK: (requires 10.12)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${configure.sdk_version} 10.12] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version 10.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {set configure.sdkroot} sdkroot] || $sdkroot eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid error in dependency adding callback, https://trac.macports.org/ticket/60465
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} @${version} requires the OS X 10.12 SDK or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible SDK version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![catch {set configure.sdkroot} sdkroot] && $sdkroot ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The configure script only passes along CC/CXX, not *FLAGS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc-append -isysroot${sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx-append -isysroot${sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # The build system forces the use of libc++. This is ok because the port
# doesn't provide any C++ libraries nor use any C++ libraries from deps.
configure.cxx_stdlib libc++
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append boostdir=${prefix}/include/boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builddir=${worksrcpath}/build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- capnp_prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libressl_prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sparsedir=${prefix}/include/sparsehash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch needed during build for download of bundles; will revert later and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# rebuild
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Frameworks__io__src__path.cc-use-home-from-env.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Applications__TextMate__src__RMateServer.mm-non-objc-ptr-cast-with-arc.diff
</span>
pre-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/local.rave ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/local.rave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # the textmate build expects this to be present
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir $env(HOME)/Library/Caches/com.macromates.TextMate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch the code to use $HOME from env rather than from getpwent(3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "patch -p0 <${filespath}/patch-Frameworks__io__src__path.cc-use-home-from-env.diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # revert the patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "patch -R -p0 <${filespath}/patch-Frameworks__io__src__path.cc-use-home-from-env.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir $env(HOME)/Library/Caches/com.macromates.TextMate/Bundles
</span> }
build.cmd ninja
build.args -v -j${build.jobs}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target TextMate mate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target TextMate
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/build/Applications/TextMate/TextMate.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/build/Applications/mate/mate ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Revert the patch, retrigger the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "patch -R -p0 <${filespath}/patch-Frameworks__io__src__path.cc-use-home-from-env.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command_exec build
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "^(.\*)\$"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://api.textmate.org/releases/release/version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.version $version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy [glob ${workpath}/.home/build/textmate-*/release/Applications/TextMate/TextMate.app] ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/TextMate.app/Contents/MacOS/mate ${destroot}${prefix}/bin/mate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/0001-Add-missing-link-dependency-to-Preferences.patch b/editors/textmate2/files/0001-Add-missing-link-dependency-to-Preferences.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ab036dff3e3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/0001-Add-missing-link-dependency-to-Preferences.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d891ce4bc4c63f294a79eb603771002b52384f24 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Clemens Lang <neverpanic@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 24 Jun 2018 16:44:05 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Add missing link dependency to Preferences
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The Preferences framework uses kUserDefaultsDisableTabBarCollapsingKey
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-from OakTabBarView and hence needs to link against it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Pending
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Frameworks/Preferences/target | 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 ./Frameworks/Preferences/target ./Frameworks/Preferences/target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 28a8ea74..180f2522 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./Frameworks/Preferences/target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Frameworks/Preferences/target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES = src/*.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPORT = src/{Preferences,Keys,TerminalPreferences,PreferencesPane}.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CP_Resources = resources/* icons/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LINK = BundlesManager MASPreferences MGScopeBar OakAppKit OakFoundation SoftwareUpdate bundles io ns regexp settings text version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LINK = BundlesManager MASPreferences MGScopeBar OakAppKit OakFoundation OakTabBarView SoftwareUpdate bundles io ns regexp settings text version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FRAMEWORKS = Cocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.18.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/local.rave b/editors/textmate2/files/local.rave
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3d33c8edce5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/textmate2/files/local.rave
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+add FLAGS "-I@@PREFIX@@/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+add LN_FLAGS "-L@@PREFIX@@/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Do not set --options runtime, because the MacPorts-compiled version won't start in the hardened runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set CS_FLAGS "--force"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-Applications__TextMate__src__RMateServer.mm-non-objc-ptr-cast-with-arc.diff b/editors/textmate2/files/patch-Applications__TextMate__src__RMateServer.mm-non-objc-ptr-cast-with-arc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ca17eee28fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/textmate2/files/patch-Applications__TextMate__src__RMateServer.mm-non-objc-ptr-cast-with-arc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9aab9de004c18dbd9adf056f449e194631fae84c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jason Gavris <jgavris@butterflynetinc.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 26 Dec 2021 09:05:42 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix cast of non Objective-C pointer in shared_ptr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Submitted [https://github.com/textmate/textmate/pull/1457]
</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;'>+ Applications/TextMate/src/RMateServer.mm | 15 ++++++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 8 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Applications/TextMate/src/RMateServer.mm b/Applications/TextMate/src/RMateServer.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f839026e2..095b49f9f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Applications/TextMate/src/RMateServer.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Applications/TextMate/src/RMateServer.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,16 +334,17 @@ bool write_data () const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reactivate_callback_t () : _shared_count(std::make_shared<size_t>(0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _terminal = std::make_shared<NSRunningApplication*>([NSWorkspace.sharedWorkspace frontmostApplication]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _terminal = [[NSWorkspace sharedWorkspace] frontmostApplication];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto terminal = _terminal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if([*terminal isEqual:NSRunningApplication.currentApplication])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __block auto terminal = _terminal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if([terminal isEqual:NSRunningApplication.currentApplication])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If we call ‘mate -w’ in quick succession there is a chance that we have not yet re-activated the terminal app when we are asked to open a new document. For this reason, we monitor the NSApplicationDidResignActiveNotification for 200 ms to see if the “real†frontmost application becomes active.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __weak __block id token = [NSNotificationCenter.defaultCenter addObserverForName:NSApplicationDidResignActiveNotification object:NSApp queue:nil usingBlock:^(NSNotification*){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSNotificationCenter.defaultCenter removeObserver:token];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *terminal = [NSWorkspace.sharedWorkspace frontmostApplication];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ terminal = [NSWorkspace.sharedWorkspace frontmostApplication];
</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;'>+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC / 5), dispatch_get_main_queue(), ^{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -355,19 +356,19 @@ bool write_data () const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void watch_document (OakDocument* document)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto counter = _shared_count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto terminal = _terminal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __block auto terminal = _terminal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ++*counter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __weak __block id token = [NSNotificationCenter.defaultCenter addObserverForName:OakDocumentWillCloseNotification object:document queue:nil usingBlock:^(NSNotification*){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(--*counter == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [*terminal activateWithOptions:NSApplicationActivateIgnoringOtherApps];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [terminal activateWithOptions:NSApplicationActivateIgnoringOtherApps];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSNotificationCenter.defaultCenter removeObserver:token];
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::shared_ptr<size_t> _shared_count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::shared_ptr<NSRunningApplication*> _terminal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSRunningApplication* _terminal;
</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;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-Applications_commit_target.diff b/editors/textmate2/files/patch-Applications_commit_target.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a8a2eccd157..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-Applications_commit_target.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add missing build dependency to make sure CommitWindow.h is found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes a build failure:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-| Applications/commit/src/commit.mm:1:10: fatal error: 'CommitWindow/CommitWindow.h' file not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-| #include <CommitWindow/CommitWindow.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-| ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-| 1 error generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Pending
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Applications/commit/target.orig 2016-08-06 20:55:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Applications/commit/target 2016-08-06 20:55:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1 +1,2 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES = src/*.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LINK += CommitWindow
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-Frameworks_plist_src_ascii.rl-work-around-ragel7-bugs.diff b/editors/textmate2/files/patch-Frameworks_plist_src_ascii.rl-work-around-ragel7-bugs.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 830552f9d2c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-Frameworks_plist_src_ascii.rl-work-around-ragel7-bugs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ascii.rl: Work around ragel 7 bugs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The version of ragel currently in MacPorts fails to parse the second machine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-definition if it's in the same block. Additionally, once that problem is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-out of the way, the 'write data' statement for the string machine fails
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and aborts because there are "no machine instantiations to write".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Moving the same piece of code further down as "machine string; write
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-data;" seems to work, but the ragel compiler is picky as to where in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-file it can occur.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-I've picked a place that seems to work fine.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Inappropriate [likely a ragel bug]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Frameworks/plist/src/ascii.rl b/Frameworks/plist/src/ascii.rl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3cc453a9..820830ed 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./Frameworks/plist/src/ascii.rl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Frameworks/plist/src/ascii.rl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,9 +35,9 @@ date: @2010-05-10 20:34:12 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOUBLE = '"' (D_ESCAPE | D_ANY)* >clear_str '"';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string := (BARE | SINGLE | DOUBLE) @matched;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}%%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- write data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%%{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- machine comment;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SINGLE = '//' [^\n]* '\n';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOUBLE = '/*' ([^*] | '*' [^/])* '*/';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,6 +46,7 @@ date: @2010-05-10 20:34:12 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }%%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool backtrack (char const*& p, char const* bt, plist::any_t& res)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,6 +61,11 @@ static bool parse_ws (char const*& p, char const* pe)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma clang diagnostic ignored "-Wunused-const-variable"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%% machine string; write data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma clang diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool parse_char (char const*& p, char const*& pe, char ch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return parse_ws(p, pe) && p != pe && *p == ch ? (++p, true) : false;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-bin__gen_build-avoid-endless-configure-loop.diff b/editors/textmate2/files/patch-bin__gen_build-avoid-endless-configure-loop.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e1361d24b93..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-bin__gen_build-avoid-endless-configure-loop.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gen_build: Avoid endless configure loop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The build.ninja.d dependency file written by bin/gen_build adds "." as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-a dependency of build.ninja. This causes the generation rule for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.ninja file to re-run endlessly because the mtime of the directory changes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-every time the build.ninja file is written.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove all dependencies instead, which fixes the build for us, and is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-a problem because we don't update the sources in-place and rebuild.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Inappropriate [Configuration]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/bin/gen_build b/bin/gen_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b3412da4..29ce2f0c 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./bin/gen_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./bin/gen_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -562,10 +562,7 @@ Dir.chdir(File.dirname(path)) do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builder.write(io, Target.new(path))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atomic_write("#{builddir}/build.ninja.d") do |io|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dep = BuildDependencies.to_a.map do |file|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- file.gsub(%r{^\./|/\.(?=/|$)}, '')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- builder.dependencies(io, dep)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ io << "build.ninja: \n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-configure-versionnumber.diff b/editors/textmate2/files/patch-configure-versionnumber.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 60e28eb1a02..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-configure-versionnumber.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Set correct version number and macports tag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We don't want to use curl to fetch a version number and want to identify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-our releases as being built in MacPorts to simplify origin tracking for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-upstream in bug reports.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Inappropriate [configuration]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./configure.orig 2019-09-17 12:45:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./configure 2019-09-17 12:45:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # = Application version =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # =======================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ver=$(curl -sf "${rest_api}/releases/nightly/version")${tag:-+git.$(git rev-parse --short HEAD)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ver=@VERSION@${tag:-+macports.git.$(git rev-parse --short HEAD)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ===============================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # = Check if boost is installed =
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-workaround-missing-capnp-dependency.diff b/editors/textmate2/files/patch-workaround-missing-capnp-dependency.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b135cdf00c0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-workaround-missing-capnp-dependency.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Workaround missing capnp-generated header dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The generated ninja build system files do not model the dependency that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-generates the *.capnp.h headers, and with sufficient parallelism this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-causes the build to fail when building the "bl" tool.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Explicitly trigger generation of the header files before building bl to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-avoid this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Pending [hack]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/create_default_bundles_tbz.orig 2020-07-21 15:54:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/create_default_bundles_tbz 2020-07-21 15:54:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builddir="${builddir:-$HOME/build/TextMate}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bl="$builddir/Applications/bl/bl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ninja -v \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Frameworks/plist/src/cache.capnp.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Frameworks/encoding/src/frequencies.capnp.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { [ -x "$bl" ] || ninja "$bl"; } && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p "$BUNDLES_DST/Managed" && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$bl" -C "$BUNDLES_DST/Managed" install mandatories defaults && \
</span></pre><pre style='margin:0'>
</pre>