<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/28903f4a48fe02d2ffa7757978c45d88e54da35a">https://github.com/macports/macports-ports/commit/28903f4a48fe02d2ffa7757978c45d88e54da35a</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 28903f4 textmate2: Update to 2.0-rc.10
</span>28903f4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 28903f4a48fe02d2ffa7757978c45d88e54da35a
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun Jun 24 16:54:10 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> textmate2: Update to 2.0-rc.10
</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/56691
</span>---
editors/textmate2/Portfile | 9 +++--
...dd-missing-link-dependency-to-Preferences.patch | 27 ++++++++++++++
.../0001-Revert-Build-with-MacOSX10.11-SDK.patch | 42 ++++++++++++++++++++++
.../49cc123544edb219a9fd131c68837e32bfaa271d.patch | 26 --------------
.../ae470335a234e336c3d0337f065e26b29751e668.patch | 34 ++++++++++++++++++
...plications_TextMate_about_Contributions.md.diff | 39 --------------------
.../files/patch-configure-versionnumber.diff | 2 +-
editors/textmate2/files/patch-strong.diff | 25 -------------
editors/textmate2/files/patch-target.diff | 16 ---------
9 files changed, 108 insertions(+), 112 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 8559549..6ffd014 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,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
epoch 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup textmate textmate 2.0-rc.4 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-rc.10 v
</span>
maintainers {cal @neverpanic} openmaintainer
name textmate2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,12 +29,12 @@ post-fetch {
</span> }
patchfiles patch-Applications_commit_target.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Applications_TextMate_about_Contributions.md.diff \
</span> patch-configure-brew.diff \
patch-configure-versionnumber.diff \
patch-ninja-verbose.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-strong.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-target.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-Revert-Build-with-MacOSX10.11-SDK.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-Add-missing-link-dependency-to-Preferences.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ae470335a234e336c3d0337f065e26b29751e668.patch
</span>
post-patch {
reinplace "s/@VERSION@/${version}/" ${worksrcpath}/configure
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ab036df
</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/0001-Add-missing-link-dependency-to-Preferences.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d891ce4bc4c63f294a79eb603771002b52384f24 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Clemens Lang <neverpanic@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 24 Jun 2018 16:44:05 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add missing link dependency to Preferences
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The Preferences framework uses kUserDefaultsDisableTabBarCollapsingKey
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+from OakTabBarView and hence needs to link against it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Pending
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Frameworks/Preferences/target | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ./Frameworks/Preferences/target ./Frameworks/Preferences/target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 28a8ea74..180f2522 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Frameworks/Preferences/target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Frameworks/Preferences/target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES = src/*.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPORT = src/{Preferences,Keys,TerminalPreferences,PreferencesPane}.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CP_Resources = resources/* icons/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LINK = BundlesManager MASPreferences MGScopeBar OakAppKit OakFoundation SoftwareUpdate bundles io ns regexp settings text version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LINK = BundlesManager MASPreferences MGScopeBar OakAppKit OakFoundation OakTabBarView SoftwareUpdate bundles io ns regexp settings text version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FRAMEWORKS = Cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.18.0
</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-Revert-Build-with-MacOSX10.11-SDK.patch b/editors/textmate2/files/0001-Revert-Build-with-MacOSX10.11-SDK.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..97da662
</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/0001-Revert-Build-with-MacOSX10.11-SDK.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 11024c9a5a44b84156edc31b8f2876d88db10893 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Clemens Lang <neverpanic@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 24 Jun 2018 16:19:08 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Revert "Build with MacOSX10.11 SDK"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This reverts commit e28713286ee2cc63a1c619ee67dadb7ca30f0d5e.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The path to the SDK is hardcoded, which is not very useful. Revert this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit to fix the build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Inappropriate [Configuration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target | 6 ++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ./target ./target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2620c6a7..6589cdd9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-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:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLAGS += -c -pipe -fPIC -gdwarf-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FLAGS += -m64 -mmacosx-version-min=$APP_MIN_OS -isysroot "$SDK"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FLAGS += -m64 -mmacosx-version-min=$APP_MIN_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLAGS += -funsigned-char
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLAGS += -D'NULL_STR="\uFFFF"'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLAGS += -DREST_API='"$rest_api"'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +19,7 @@ OBJCXX_FLAGS += -fvisibility=hidden -std=c++14 -fobjc-abi-version=3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCXX_FLAGS += -fobjc-arc -fobjc-call-cxx-cdtors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += c++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LN_FLAGS += -m64 -mmacosx-version-min=$APP_MIN_OS -isysroot "$SDK"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LN_FLAGS += -m64 -mmacosx-version-min=$APP_MIN_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LN_FLAGS += -fvisibility=hidden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LN_FLAGS += -Wl,-dead_strip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LN_FLAGS += -Wl,-dead_strip_dylibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.18.0
</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/49cc123544edb219a9fd131c68837e32bfaa271d.patch b/editors/textmate2/files/49cc123544edb219a9fd131c68837e32bfaa271d.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b83239..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/49cc123544edb219a9fd131c68837e32bfaa271d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 49cc123544edb219a9fd131c68837e32bfaa271d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Ronald Wampler <rdwampler@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 23 Jun 2017 10:44:28 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Change `std::vector< std::pair<char const*, char const*> >`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to `auto` (C++17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-C++17 added a non-const overload for std::string::data().
</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/49cc123544edb219a9fd131c68837e32bfaa271d]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Frameworks/editor/src/editor.cc | 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/editor/src/editor.cc ./Frameworks/editor/src/editor.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 308633444..58488bf0c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./Frameworks/editor/src/editor.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Frameworks/editor/src/editor.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -546,7 +546,7 @@ namespace ng
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int minIndent = INT_MAX;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::vector< std::pair<char const*, char const*> > const& v = text::to_lines(str.data(), str.data() + str.size());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto const& v = text::to_lines(str.data(), str.data() + str.size());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(auto const& it : v)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!text::is_blank(it.first, it.second))
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..21b303a
</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/ae470335a234e336c3d0337f065e26b29751e668.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ae470335a234e336c3d0337f065e26b29751e668 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Allan Odgaard <git@abetarda.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 12 Jun 2018 00:01:39 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] =?UTF-8?q?Remove=20dependency=20on=20=E2=80=98ns=E2=80=99?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?=20framework?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Backport [https://github.com/textmate/textmate/commit/ae470335a234e336c3d0337f065e26b29751e668.patch]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Frameworks/OakFoundation/src/OakFoundation.mm | 3 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ./Frameworks/OakFoundation/src/OakFoundation.mm ./Frameworks/OakFoundation/src/OakFoundation.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0459943e2..64dba5cc8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Frameworks/OakFoundation/src/OakFoundation.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Frameworks/OakFoundation/src/OakFoundation.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,12 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "OakFoundation.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "NSString Additions.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#import <ns/ns.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string OakMoveToTrash (std::string const& path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSURL* resultingItemURL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if([[NSFileManager defaultManager] trashItemAtURL:[NSURL fileURLWithPath:[NSString stringWithCxxString:path]] resultingItemURL:&resultingItemURL error:nil])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return to_s([resultingItemURL path]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return resultingItemURL.filePathURL.path.fileSystemRepresentation ?: NULL_STR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else return NULL_STR;
</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_TextMate_about_Contributions.md.diff b/editors/textmate2/files/patch-Applications_TextMate_about_Contributions.md.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0ece447..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-Applications_TextMate_about_Contributions.md.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix generation of contribution page
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Modern multimarkdown tends to convert the <% and %> tags into HTML when they
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-occur before or after an empty line. This would then break parsing with erb.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove all empty lines in the vincinity of these tags to prevent this problem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Additionally, move the cache file for the githubcredits into the build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-directory, because the home is either not writable, or not preserved within
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MacPorts builds, and attempting to re-generate these texts too often usually
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-causes one to hit the GitHub API limit. By putting the file into the build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-directory, aborted builds can at least be re-started without hitting any API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-limits.
</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;'>---- Applications/TextMate/about/Contributions.md.orig 2018-01-31 21:46:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Applications/TextMate/about/Contributions.md 2018-01-31 22:21:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,13 +8,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <div>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <%# this wrapping div prevents Markdown from trying to parse the ERB blocks %>
</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;'>- last_group_heading = ''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require File.join(File.dirname(__FILE__), 'bin/gen_credits')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--generate_credits(File.expand_path('~/Library/Caches/com.macromates.TextMate/githubcredits'), warn) do |hash, author, subject, body, userpic, date, github_user|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+generate_credits(File.expand_path('githubcredits'), warn) do |hash, author, subject, body, userpic, date, github_user|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- group_heading = date.strftime('%b %e, %Y')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if last_group_heading != group_heading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if last_group_heading != ''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _erbout << "</ol>\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +47,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </li>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if last_group_heading != ''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _erbout << "</ol>\n"
</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><span style='display:block; white-space:pre;color:#808080;'>index cec32a0..7966118 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;'>@@ -13,6 +13,6 @@ Upstream-Status: Inappropriate [configuration]
</span> name=TextMate
-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.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ min_os=10.9
</span>
# ===============================
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-strong.diff b/editors/textmate2/files/patch-strong.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7883f08..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-strong.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;'>-Fix build failure with OS X 10.11 SDK earlier than 10.11.4 (Xcode 7.2.1 and earlier).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Frameworks/DocumentWindow/src/SelectGrammarViewController.mm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Frameworks/DocumentWindow/src/SelectGrammarViewController.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property (nonatomic) OakDocumentView* documentView;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property (nonatomic) BundleGrammar* grammar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@property (nonatomic) void(^callback)(SelectGrammarResponse, BundleGrammar*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@property (nonatomic, strong) void(^callback)(SelectGrammarResponse, BundleGrammar*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static NSButton* OakSmallButton (NSString* title, SEL action, id target, NSInteger tag)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Frameworks/OakCommand/src/OakCommand.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Frameworks/OakCommand/src/OakCommand.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,8 +13,8 @@ NS_ENUM(NSInteger) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PUBLIC @interface OakCommand : NSObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property (nonatomic, weak) NSResponder* firstResponder;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property (nonatomic, readonly) NSUUID* identifier;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@property (nonatomic) void(^modalEventLoopRunner)(OakCommand*, BOOL* didTerminate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@property (nonatomic) void(^terminationHandler)(OakCommand*, BOOL normalExit);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@property (nonatomic, strong) void(^modalEventLoopRunner)(OakCommand*, BOOL* didTerminate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@property (nonatomic, strong) void(^terminationHandler)(OakCommand*, BOOL normalExit);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property (nonatomic) BOOL updateHTMLViewAtomically;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property (nonatomic, readonly) OakHTMLOutputView* htmlOutputView;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (instancetype)initWithBundleCommand:(bundle_command_t const&)aCommand;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-target.diff b/editors/textmate2/files/patch-target.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 858ff6e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-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,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failure with Xcode 9 and runtime crashes on High Sierra.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/textmate/textmate/commit/234e64dcfcf2845d3a1c34e29bcd7d5419d7f42d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- target.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,9 +13,9 @@ FLAGS += -fcolor-diagnostics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FLAGS += -DNDEBUG -Os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LINK = OakDebug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXX_FLAGS += -fvisibility=hidden -std=c++1z -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXX_FLAGS += -fvisibility=hidden -std=c++14 -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJC_FLAGS += -fvisibility=hidden -fobjc-arc -std=c99 -fobjc-abi-version=3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OBJCXX_FLAGS += -fvisibility=hidden -std=c++1z -stdlib=libc++ -fobjc-abi-version=3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OBJCXX_FLAGS += -fvisibility=hidden -std=c++14 -stdlib=libc++ -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></pre><pre style='margin:0'>
</pre>