<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/14830c3e12d92027b5935035b741a91118cf8010">https://github.com/macports/macports-ports/commit/14830c3e12d92027b5935035b741a91118cf8010</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 14830c3e12d92027b5935035b741a91118cf8010
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Jul 21 11:54:17 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> textmate2: Update to 2.0.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57714
</span>---
editors/textmate2/Portfile | 29 +++++++--------
.../0001-Revert-Build-with-MacOSX10.11-SDK.patch | 42 ----------------------
.../ae470335a234e336c3d0337f065e26b29751e668.patch | 34 ------------------
editors/textmate2/files/patch-configure-brew.diff | 37 -------------------
.../files/patch-configure-versionnumber.diff | 12 +++----
editors/textmate2/files/patch-ninja-verbose.diff | 25 -------------
.../patch-workaround-missing-capnp-dependency.diff | 24 +++++++++++++
7 files changed, 43 insertions(+), 160 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 a5e04f2b07b..ca2db76e215 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;'>@@ -4,9 +4,9 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup textmate textmate 2.0-rc.10 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup textmate textmate 2.0.6 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;'>@@ -31,14 +31,9 @@ post-fetch {
</span> }
patchfiles patch-Applications_commit_target.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-brew.diff \
</span> patch-configure-versionnumber.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ninja-verbose.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-Revert-Build-with-MacOSX10.11-SDK.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-Add-missing-link-dependency-to-Preferences.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ae470335a234e336c3d0337f065e26b29751e668.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-bin__gen_build-avoid-endless-configure-loop.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:#e0ffe0;'>+ patch-Frameworks_plist_src_ascii.rl-work-around-ragel7-bugs.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-workaround-missing-capnp-dependency.diff
</span>
post-patch {
reinplace "s/@VERSION@/${version}/" ${worksrcpath}/configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +43,8 @@ post-patch {
</span> reinplace -q "/TEST_SOURCES *=/d" ${file}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|xcrun clang\\+\\+|${configure.cxx}|g" ${worksrcpath}/bin/gen_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|xcrun clang|${configure.cc}|g" ${worksrcpath}/bin/gen_build
</span> }
depends_build-append path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,15 +84,15 @@ if {${os.major} < 17} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Needs support for -std=c++14.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist {clang < 602}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needs support for -std=c++2a.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist {clang < 920}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Needs support for Objective-C lightweight generics.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${configure.sdk_version} 10.11] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Release notes say "SDK: (requires 10.12)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${configure.sdk_version} 10.12] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version 10.12
</span> if {[catch {set configure.sdkroot} sdkroot] || $sdkroot eq ""} {
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} @${version} requires the OS X 10.11 SDK or later."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} @${version} requires the OS X 10.12 SDK or later."
</span> return -code error "incompatible SDK version"
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/0001-Revert-Build-with-MacOSX10.11-SDK.patch b/editors/textmate2/files/0001-Revert-Build-with-MacOSX10.11-SDK.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 97da6620a24..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/0001-Revert-Build-with-MacOSX10.11-SDK.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 11024c9a5a44b84156edc31b8f2876d88db10893 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:19:08 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Revert "Build with MacOSX10.11 SDK"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This reverts commit e28713286ee2cc63a1c619ee67dadb7ca30f0d5e.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The path to the SDK is hardcoded, which is not very useful. Revert this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit to fix the build.
</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;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target | 6 ++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ./target ./target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2620c6a7..6589cdd9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,9 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLIST_FLAGS = -d'APP_NAME=$APP_NAME' -d'APP_VERSION=$APP_VERSION' -d'APP_MIN_OS=$APP_MIN_OS'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SDK = /Users/duff/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FLAGS += -c -pipe -fPIC -gdwarf-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FLAGS += -m64 -mmacosx-version-min=$APP_MIN_OS -isysroot "$SDK"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FLAGS += -m64 -mmacosx-version-min=$APP_MIN_OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FLAGS += -funsigned-char
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FLAGS += -D'NULL_STR="\uFFFF"'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FLAGS += -DREST_API='"$rest_api"'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +19,7 @@ OBJCXX_FLAGS += -fvisibility=hidden -std=c++14 -fobjc-abi-version=3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCXX_FLAGS += -fobjc-arc -fobjc-call-cxx-cdtors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS += c++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LN_FLAGS += -m64 -mmacosx-version-min=$APP_MIN_OS -isysroot "$SDK"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LN_FLAGS += -m64 -mmacosx-version-min=$APP_MIN_OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LN_FLAGS += -fvisibility=hidden
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LN_FLAGS += -Wl,-dead_strip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LN_FLAGS += -Wl,-dead_strip_dylibs
</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/ae470335a234e336c3d0337f065e26b29751e668.patch b/editors/textmate2/files/ae470335a234e336c3d0337f065e26b29751e668.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 21b303aa9c3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/ae470335a234e336c3d0337f065e26b29751e668.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ae470335a234e336c3d0337f065e26b29751e668 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Allan Odgaard <git@abetarda.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 12 Jun 2018 00:01:39 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] =?UTF-8?q?Remove=20dependency=20on=20=E2=80=98ns=E2=80=99?=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- =?UTF-8?q?=20framework?=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Since the ‘ns’ framework depends on OakFoundation this was a circular dependency and only sort of worked because ‘ns’ was not listed as a link target.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport [https://github.com/textmate/textmate/commit/ae470335a234e336c3d0337f065e26b29751e668.patch]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Frameworks/OakFoundation/src/OakFoundation.mm | 3 +--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ./Frameworks/OakFoundation/src/OakFoundation.mm ./Frameworks/OakFoundation/src/OakFoundation.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0459943e2..64dba5cc8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./Frameworks/OakFoundation/src/OakFoundation.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Frameworks/OakFoundation/src/OakFoundation.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,12 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "OakFoundation.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "NSString Additions.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <ns/ns.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string OakMoveToTrash (std::string const& path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSURL* resultingItemURL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if([[NSFileManager defaultManager] trashItemAtURL:[NSURL fileURLWithPath:[NSString stringWithCxxString:path]] resultingItemURL:&resultingItemURL error:nil])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return to_s([resultingItemURL path]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return resultingItemURL.filePathURL.path.fileSystemRepresentation ?: NULL_STR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else return NULL_STR;
</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;color:#808080;'>diff --git a/editors/textmate2/files/patch-configure-brew.diff b/editors/textmate2/files/patch-configure-brew.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7e7c8e32c1a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-configure-brew.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Do not look for dependencies installed with Homebrew.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-01-23 07:57:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-01-23 08:00:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,10 +25,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # = Check if boost is installed =
</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 which -s brew && [[ -z "$boostdir" && ! -d /usr/local/include/boost ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boostdir=$(brew --prefix boost)/include/boost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for dir in "${boostdir:-/usr/include/boost}" /{opt,usr}/local/include/boost ${CPATH//:/ }; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ ! -L "${builddir}/include/boost" && -d "${dir}" ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p "${builddir}/include" && ln -fs "${dir}" "${builddir}/include/boost"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,10 +37,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # = Check if google sparsehash is installed =
</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 which -s brew && [[ -z "$sparsedir" && ! -d /usr/local/include/sparsehash ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sparsedir=$(brew --prefix google-sparsehash)/include/sparsehash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for dir in "${sparsedir:-/usr/include/sparsehash}" /{opt,usr}/local/include/sparsehash/ ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ ! -L "${builddir}/include/sparsehash" && -d "${dir}" ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p "${builddir}/include" && ln -fs "${dir}" "${builddir}/include/sparsehash"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,11 +49,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # = Check if non-system openssl is intalled =
</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 which -s brew && [[ -z "$libressl_prefix" && ! -d "${libressl_prefix}/include/openssl" ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libressl_prefix=$(brew --prefix libressl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test -d "${libressl_prefix}/include/" || error "*** openssl headers not found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if which -s port && [[ -z "$libressl_prefix" && ! -d "${libressl_prefix}/include/openssl" ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libressl_prefix=/opt/local/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d "${libressl_prefix}/include/openssl" || error "*** openssl headers not found."
</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><span style='display:block; white-space:pre;color:#808080;'>index 79661188446..60e28eb1a02 100644
</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;'>+++ b/editors/textmate2/files/patch-configure-versionnumber.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,14 +5,14 @@ our releases as being built in MacPorts to simplify origin tracking for
</span> upstream in bug reports.
Upstream-Status: Inappropriate [configuration]
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2016-11-04 00:10:51.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-11-04 00:13:34.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ========================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./configure.orig 2019-09-17 12:45:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./configure 2019-09-17 12:45:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # = Application version =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # =======================
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- name=TextMate
</span> -ver=$(curl -sf "${rest_api}/releases/nightly/version")${tag:-+git.$(git rev-parse --short HEAD)}
+ver=@VERSION@${tag:-+macports.git.$(git rev-parse --short HEAD)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- min_os=10.9
</span>
# ===============================
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # = Check if boost is installed =
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-ninja-verbose.diff b/editors/textmate2/files/patch-ninja-verbose.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0c256d2d173..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-ninja-verbose.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;'>-Tell ninja to be verbose.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/create_default_bundles_tbz.orig 2018-01-23 08:59:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/create_default_bundles_tbz 2018-01-23 09:01:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</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;'>--{ [ -x "$bl" ] || ninja "$bl"; } && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ [ -x "$bl" ] || ninja -v "$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><span style='display:block; white-space:pre;background:#ffe0e0;'>- /usr/bin/tar --disable-copyfile -cf "$TBZ_DST~" "$BZIP2_FLAG" -C "$BUNDLES_DST" "Managed" && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-01-27 09:08:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-01-27 09:08:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,8 +82,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin/gen_build -o build.ninja -C "$builddir" -dAPP_NAME="$name" -dAPP_VERSION="$ver" -dAPP_MIN_OS="$min_os" -dCC="$CC" -dCXX="$CXX" -didentity="$identity" -drest_api="$rest_api" -dbzip2_flag="$bzip2_flag" -dtest_flags="$test" -dcapnp_prefix="$capnp_prefix" -dlibressl_prefix="$libressl_prefix" target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ninja Frameworks/encoding/src/frequencies.capnp.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ninja Frameworks/plist/src/cache.capnp.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ninja -v Frameworks/encoding/src/frequencies.capnp.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ninja -v Frameworks/plist/src/cache.capnp.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUNDLES_TBZ=Applications/TextMate/resources/DefaultBundles.tbz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -e "$BUNDLES_TBZ" || builddir="$builddir" bin/create_default_bundles_tbz "$BUNDLES_TBZ"
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b135cdf00c0
</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-workaround-missing-capnp-dependency.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Workaround missing capnp-generated header dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The generated ninja build system files do not model the dependency that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+generates the *.capnp.h headers, and with sufficient parallelism this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+causes the build to fail when building the "bl" tool.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Explicitly trigger generation of the header files before building bl to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+avoid this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Pending [hack]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bin/create_default_bundles_tbz.orig 2020-07-21 15:54:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bin/create_default_bundles_tbz 2020-07-21 15:54:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builddir="${builddir:-$HOME/build/TextMate}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bl="$builddir/Applications/bl/bl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ninja -v \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Frameworks/plist/src/cache.capnp.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Frameworks/encoding/src/frequencies.capnp.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { [ -x "$bl" ] || ninja "$bl"; } && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p "$BUNDLES_DST/Managed" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$bl" -C "$BUNDLES_DST/Managed" install mandatories defaults && \
</span></pre><pre style='margin:0'>
</pre>