<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eec2e54c4baead6f2e71641ed3803bf38cbfdc64">https://github.com/macports/macports-ports/commit/eec2e54c4baead6f2e71641ed3803bf38cbfdc64</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 eec2e54c4ba GitUp: new port
</span>eec2e54c4ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eec2e54c4baead6f2e71641ed3803bf38cbfdc64
</span>Author: Knapoc <Knapoc@users.noreply.github.com>
AuthorDate: Sat May 15 21:45:09 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> GitUp: new port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add Portfile for GitUp
</span><span style='display:block; white-space:pre;color:#404040;'> * disable Sparkle updates
</span><span style='display:block; white-space:pre;color:#404040;'> * replace CLT installation with port variant
</span><span style='display:block; white-space:pre;color:#404040;'> * version dependent on OS/XCode version
</span><span style='display:block; white-space:pre;color:#404040;'> * patch for included libgit2 library
</span>---
devel/GitUp/Portfile | 67 +++++++++++++++++
devel/GitUp/files/patch-disable-clt-install.diff | 32 ++++++++
devel/GitUp/files/patch-disable-sparkle.diff | 31 ++++++++
.../files/patch-exclude-arm-below-bigsur.diff | 87 ++++++++++++++++++++++
devel/GitUp/files/patch-libgit2.diff | 13 ++++
5 files changed, 230 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/GitUp/Portfile b/devel/GitUp/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8f6eb8551c2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/GitUp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,67 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp $xcodeversion 12.2] < 0 || ${os.major} < 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.1.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7d05dc36ad80f3157e5d22ee214d30c5ac7e2954 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0bf407b2efb1bbce6e5af54bd9788107067268e5aa9003c290e089de4a7c7fb9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 35852906
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c8c5eab4cf5bfed8abe934d57ea34cb8b8b769f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3b8934cfd72f6fad899bf95e7e5b983e6a3543e2ce2226005463b5e7f872e216 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21309896
</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;'>+github.setup git-up GitUp ${version} v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@knapoc knapoc} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description GitUp is a native macOS git client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description GitUp provides features such as a live and interactive repo graph \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlimited redo/undo, snapshots for 1-click rollbacks, visual commit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ splitter and many more
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://gitup.co
</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;'>+fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "git submodule update --init"
</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;'>+patchfiles patch-disable-sparkle.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-disable-clt-install.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libgit2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${version} 1.1.3] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-exclude-arm-below-bigsur.diff
</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;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant clt description {Installs GitUp command line tool} {
</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;'>+default_variants +clt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${build.dir}/GitUp "xcodebuild -derivedDataPath ${build.dir} -configuration Release -scheme Application 'CODE_SIGN_IDENTITY=' CODE_SIGNING_REQUIRED=NO 'CODE_SIGN_ENTITLEMENTS='"
</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;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${build.dir}/Build/Products/Release/GitUp.app ${destroot}${applications_dir}
</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;'>+if {[variant_isset clt]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/GitUp.app/Contents/SharedSupport/gitup ${destroot}${prefix}/bin/gitup
</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/devel/GitUp/files/patch-disable-clt-install.diff b/devel/GitUp/files/patch-disable-clt-install.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b13d2f840e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/GitUp/files/patch-disable-clt-install.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git GitUp/Application/AppDelegate.m GitUp/Application/AppDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2efe0c1..1b0daec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GitUp/Application/AppDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GitUp/Application/AppDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -265,6 +265,9 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // First launch has completed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[NSUserDefaults standardUserDefaults] setBool:NO forKey:kUserDefaultsKey_FirstLaunch];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Skip command line tool installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[NSUserDefaults standardUserDefaults] setBool:true forKey:kUserDefaultsKey_SkipInstallCLT];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Create tool message port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFMessagePortContext context = {0, (__bridge void*)self, NULL, NULL, NULL};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _messagePort = CFMessagePortCreateLocal(kCFAllocatorDefault, CFSTR(kToolPortName), _MessagePortCallBack, &context, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git GitUp/Application/Base.lproj/MainMenu.xib GitUp/Application/Base.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 528efb4..3602656 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GitUp/Application/Base.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GitUp/Application/Base.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,13 +31,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <action selector="checkForUpdates:" target="Voe-Tx-rLC" id="Bx2-39-dyN"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <menuItem isSeparatorItem="YES" id="gLG-bh-eJk"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <menuItem title="Install Command Line Tool…" id="f9m-On-7Ly">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <action selector="installTool:" target="Voe-Tx-rLC" id="vFd-eA-ejg"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <menuItem isSeparatorItem="YES" id="dst-2l-Azr"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <menuItem title="Preferences…" keyEquivalent="," id="smQ-Fd-MMe">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <connections>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/GitUp/files/patch-disable-sparkle.diff b/devel/GitUp/files/patch-disable-sparkle.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..40707c8e607
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/GitUp/files/patch-disable-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git GitUp/Application/AppDelegate.m GitUp/Application/AppDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2efe0c1..3a1908f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GitUp/Application/AppDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GitUp/Application/AppDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -265,6 +265,9 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // First launch has completed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[NSUserDefaults standardUserDefaults] setBool:NO forKey:kUserDefaultsKey_FirstLaunch];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Disable sparkle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[NSUserDefaults standardUserDefaults] setBool:true forKey:kUserDefaultsKey_DisableSparkle];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Create tool message port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFMessagePortContext context = {0, (__bridge void*)self, NULL, NULL, NULL};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _messagePort = CFMessagePortCreateLocal(kCFAllocatorDefault, CFSTR(kToolPortName), _MessagePortCallBack, &context, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git GitUp/Application/Base.lproj/MainMenu.xib GitUp/Application/Base.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 528efb4..711833c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GitUp/Application/Base.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GitUp/Application/Base.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,12 +25,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <action selector="showAboutPanel:" target="Voe-Tx-rLC" id="uMT-pN-nex"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <menuItem title="Check for Updates…" id="RvP-51-UEO">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <action selector="checkForUpdates:" target="Voe-Tx-rLC" id="Bx2-39-dyN"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <menuItem isSeparatorItem="YES" id="gLG-bh-eJk"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <menuItem title="Install Command Line Tool…" id="f9m-On-7Ly">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/GitUp/files/patch-exclude-arm-below-bigsur.diff b/devel/GitUp/files/patch-exclude-arm-below-bigsur.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..efe5a25dfc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/GitUp/files/patch-exclude-arm-below-bigsur.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,87 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git GitUp/GitUp.xcodeproj/project.pbxproj GitUp/GitUp.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3efcbfe..4ec7628 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GitUp/GitUp.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GitUp/GitUp.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -657,6 +657,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isa = XCBuildConfiguration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baseConfigurationReference = E27E37571B86F670000A551A /* Debug.xcconfig */;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buildSettings = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXCLUDED_ARCHS = arm64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name = Debug;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -665,6 +666,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isa = XCBuildConfiguration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baseConfigurationReference = E27E37591B86F670000A551A /* Release.xcconfig */;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buildSettings = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXCLUDED_ARCHS = arm64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name = Release;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -676,6 +679,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_VERSION = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_VERSION_STRING = 1.1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CODE_SIGN_ENTITLEMENTS = Application/GitUp.entitlements;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXCLUDED_ARCHS = arm64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Third-Party";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INFOPLIST_FILE = Application/Info.plist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -692,10 +696,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_VERSION = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_VERSION_STRING = 1.1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CODE_SIGN_ENTITLEMENTS = Application/GitUp.entitlements;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXCLUDED_ARCHS = arm64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Third-Party";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INFOPLIST_FILE = Application/Info.plist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MARKETING_VERSION = 1.1.3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_BUNDLE_IDENTIFIER = co.gitup.mac;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_NAME = GitUp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git GitUpKit/GitUpKit.xcodeproj/project.pbxproj GitUpKit/GitUpKit.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4c950e8..38a8d73 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GitUpKit/GitUpKit.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GitUpKit/GitUpKit.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1826,6 +1826,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYLIB_COMPATIBILITY_VERSION = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYLIB_CURRENT_VERSION = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYLIB_INSTALL_NAME_BASE = "@rpath";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXCLUDED_ARCHS = arm64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INFOPLIST_FILE = Info.plist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_BUNDLE_IDENTIFIER = co.gitup.kit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1842,8 +1843,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYLIB_COMPATIBILITY_VERSION = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYLIB_CURRENT_VERSION = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYLIB_INSTALL_NAME_BASE = "@rpath";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXCLUDED_ARCHS = arm64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INFOPLIST_FILE = Info.plist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_BUNDLE_IDENTIFIER = co.gitup.kit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_NAME = GitUpKit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1855,6 +1858,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isa = XCBuildConfiguration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baseConfigurationReference = E27E37501B86F5D1000A551A /* Debug.xcconfig */;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buildSettings = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXCLUDED_ARCHS = arm64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADER_SEARCH_PATHS = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Third-Party/libgit2/include",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Third-Party/libsqlite3/$(GITUP_PLATFORM)/include",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1872,11 +1876,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isa = XCBuildConfiguration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baseConfigurationReference = E27E37521B86F5D1000A551A /* Release.xcconfig */;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buildSettings = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXCLUDED_ARCHS = arm64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADER_SEARCH_PATHS = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Third-Party/libgit2/include",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Third-Party/libsqlite3/$(GITUP_PLATFORM)/include",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Third-Party/libssh2/$(GITUP_PLATFORM)/include",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OTHER_LDFLAGS = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Third-Party/libsqlite3/$(GITUP_PLATFORM)/lilibsqlite3.a",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Third-Party/libssl/$(GITUP_PLATFORM)/lilibcrypto.a",
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/GitUp/files/patch-libgit2.diff b/devel/GitUp/files/patch-libgit2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5e35b4bb61e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/GitUp/files/patch-libgit2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git GitUpKit/Third-Party/libgit2/src/diff_generate.c GitUpKit/Third-Party/libgit2/src/diff_generate.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 568fb9743..776f443ef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GitUpKit/Third-Party/libgit2/src/diff_generate.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GitUpKit/Third-Party/libgit2/src/diff_generate.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (((DIFF)->base.opts.flags & (FLAG)) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DIFF_FLAG_SET(DIFF,FLAG,VAL) (DIFF)->base.opts.flags = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (VAL) ? ((DIFF)->base.opts.flags | (FLAG)) : \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ((DIFF)->base.opts.flags & ~(VAL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((DIFF)->base.opts.flags & ~(FLAG))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct git_diff base;
</span></pre><pre style='margin:0'>
</pre>