<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8ed68d6b0709d60bdc875a9ddc5e31e5848b88cf">https://github.com/macports/macports-ports/commit/8ed68d6b0709d60bdc875a9ddc5e31e5848b88cf</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 8ed68d6b070 gdbm: more selective patch for Tiger
</span>8ed68d6b070 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8ed68d6b0709d60bdc875a9ddc5e31e5848b88cf
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Aug 21 14:57:40 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> gdbm: more selective patch for Tiger
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> although off_t is defined in the sys/types.h header, on
</span><span style='display:block; white-space:pre;color:#404040;'> Leopard and newer, off_t is selectively defined in stdio.h without
</span><span style='display:block; white-space:pre;color:#404040;'> including the entire sys/types.h header.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It likely makes little overall difference, but including the entire
</span><span style='display:block; white-space:pre;color:#404040;'> sys/types.h header could have unexpected effects, so we will duplicate
</span><span style='display:block; white-space:pre;color:#404040;'> the behaviour of Leopard and newer as much as possible.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This patch is always applied as is desired, but blocked on systems
</span><span style='display:block; white-space:pre;color:#404040;'> where the deployment target is newer than 10.4.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This version still builds of course, passes the test suite, and
</span><span style='display:block; white-space:pre;color:#404040;'> successfully builds ports that require gdbm such as perl5.34.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As this change is installed in the gdbm.h header, revbump needed.
</span>---
databases/gdbm/Portfile | 8 +++-----
databases/gdbm/files/patch-gdbm-tiger-sys-types.diff | 18 ------------------
.../gdbm/files/patch-gdbm.h-tiger-stdio-no-offt.diff | 16 ++++++++++++++++
3 files changed, 19 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/gdbm/Portfile b/databases/gdbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c0f6a247ff..9f8b03cfb98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup clang_dependency 1.0
</span>
name gdbm
version 1.20
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,10 +34,8 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
</span> clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/63393
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gdbm-tiger-sys-types.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/63393
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-gdbm.h-tiger-stdio-no-offt.diff
</span>
configure.ccache no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/gdbm/files/patch-gdbm-tiger-sys-types.diff b/databases/gdbm/files/patch-gdbm-tiger-sys-types.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ab10e97db81..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/gdbm/files/patch-gdbm-tiger-sys-types.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The <sys/types.h> header is apparently not automatically pulled in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-by including <stdio.h> on Tiger, resulting in off_t being undefined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see ticket #63393
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-kencu@macports.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/gdbm.h.in.orig src/gdbm.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index be6a11a..b1aaabc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gdbm.h.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gdbm.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define _GDBM_H_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* GDBM C++ support */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if defined(__cplusplus) || defined(c_plusplus)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/gdbm/files/patch-gdbm.h-tiger-stdio-no-offt.diff b/databases/gdbm/files/patch-gdbm.h-tiger-stdio-no-offt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2111ab9804d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/gdbm/files/patch-gdbm.h-tiger-stdio-no-offt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gdbm.h.in.orig 2021-08-21 13:03:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gdbm.h.in 2021-08-21 13:08:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _OFF_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _OFF_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef __darwin_off_t off_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ /* GDBM C++ support */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined(__cplusplus) || defined(c_plusplus)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" {
</span></pre><pre style='margin:0'>
</pre>