<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1d3b58652a3289810dc43cdc3ea2a2fe48a10942">https://github.com/macports/macports-ports/commit/1d3b58652a3289810dc43cdc3ea2a2fe48a10942</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 1d3b58652a3 git: fix trace build, patch fuzz and offsets
</span>1d3b58652a3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1d3b58652a3289810dc43cdc3ea2a2fe48a10942
</span>Author: Eric F <eric@iefdev.se>
AuthorDate: Thu Oct 29 14:36:42 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> git: fix trace build, patch fuzz and offsets
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add patch-git-gui-Makefile.diff
</span><span style='display:block; white-space:pre;color:#404040;'> - fix patch offsets and fuzz
</span><span style='display:block; white-space:pre;color:#404040;'> - Closes: https://trac.macports.org/ticket/61381
</span>---
devel/git/Portfile | 5 ++++-
devel/git/files/patch-Makefile.diff | 2 +-
devel/git/files/patch-git-gui-Makefile.diff | 11 +++++++++++
devel/git/files/patch-sha1dc-older-apple-gcc-versions.diff | 6 +++---
4 files changed, 19 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/Portfile b/devel/git/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54f10b564f0..96d67fd32db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,10 @@ depends_run-append port:p${perl5.major}-authen-sasl \
</span> port:p${perl5.major}-cgi \
port:rsync
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff patch-git-subtree.1.diff patch-sha1dc-older-apple-gcc-versions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-git-gui-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-git-subtree.1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sha1dc-older-apple-gcc-versions.diff
</span> patch.pre_args -p1
extract.only git-${version}${extract.suffix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/patch-Makefile.diff b/devel/git/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c22e6a5f69..d2356bbf101 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- a/Makefile.orig
+++ b/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1065,7 +1065,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1257,7 +1257,7 @@
</span> ifeq ($(COMPUTE_HEADER_DEPENDENCIES),auto)
dep_check = $(shell $(CC) $(ALL_CFLAGS) \
-c -MF /dev/null -MQ /dev/null -MMD -MP \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/patch-git-gui-Makefile.diff b/devel/git/files/patch-git-gui-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b22ef465e32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/files/patch-git-gui-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./git-gui/Makefile.orig 2020-10-23 00:31:53.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./git-gui/Makefile 2020-10-29 13:49:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,7 +104,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(uname_S),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/patch-sha1dc-older-apple-gcc-versions.diff b/devel/git/files/patch-sha1dc-older-apple-gcc-versions.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 37f058fa348..3dda73afc5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/patch-sha1dc-older-apple-gcc-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/files/patch-sha1dc-older-apple-gcc-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,14 +2,14 @@ diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
</span> index 25eded1..5faf5a5 100644
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,6 +92,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,6 +102,10 @@
</span> */
#define SHA1DC_BIGENDIAN
+#elif (defined(__APPLE__) && defined(__BIG_ENDIAN__) && !defined(SHA1DC_BIGENDIAN))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* older gcc compilers which are the default on Apple PPC do not define __BYTE_ORDER__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* older gcc compilers which are the default on Apple PPC do not define __BYTE_ORDER__ */
</span> +#define SHA1DC_BIGENDIAN
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <os whitelist> */
</span> #elif defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
/*
</pre><pre style='margin:0'>
</pre>