<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/51af7fc1a0eb80df96c01ce1cbbe573e5c09a585">https://github.com/macports/macports-ports/commit/51af7fc1a0eb80df96c01ce1cbbe573e5c09a585</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 51af7fc xbase: Fix compile failure with clang 8
</span>51af7fc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 51af7fc1a0eb80df96c01ce1cbbe573e5c09a585
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Oct 1 22:27:41 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> xbase: Fix compile failure with clang 8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fixes various other problems discovered while working on that.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add upstream bug report URLs to existing patches where I could find them.
</span>---
databases/xbase/Portfile | 15 +-
databases/xbase/files/fix-GNUC-GNUG-defines.patch | 291 +++++++++++++++++++++
.../xbase/files/fix-extension-comparison.patch | 12 +
databases/xbase/files/include-unistd.patch | 11 +
databases/xbase/files/patch-xbase64-cpp.diff | 1 +
.../xbase/files/patch-xbase64-xbnode-cpp.diff | 1 +
databases/xbase/files/patch-xblock-cpp.diff | 1 +
databases/xbase/files/patch-xbtypes-h.diff | 1 +
8 files changed, 327 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/xbase/Portfile b/databases/xbase/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 260962c..b1f48c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/xbase/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/xbase/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,11 @@ PortSystem 1.0
</span>
name xbase
version 3.1.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8f2a16fcecd6098b7b3ca47354e33a387a7dc1d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5920c453e358ef4af8408c1998805af4537d288436dd7f3c31b5561bfe3c489c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 425650
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories databases devel
# lib is LGPL, executables are GPL
license {LGPL GPL-2+}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,15 +29,14 @@ homepage http://linux.techass.com/projects/xdb/
</span> master_sites sourceforge:project/xdb/Source/${version}
distname ${name}64-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 7f3a727c142b4339faa781e1f6d5871c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 5bd433a4f748a6fa1a7855b6a2325483d4ee7206 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8f2a16fcecd6098b7b3ca47354e33a387a7dc1d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-bin-dumprecs-cpp.diff \
patch-xbase64-cpp.diff \
patch-xbase64-xbnode-cpp.diff \
patch-xblock-cpp.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-xbtypes-h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-xbtypes-h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-extension-comparison.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-GNUC-GNUG-defines.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include-unistd.patch
</span>
configure.args-append --without-xbase-locking
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/xbase/files/fix-GNUC-GNUG-defines.patch b/databases/xbase/files/fix-GNUC-GNUG-defines.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1d41eb7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/xbase/files/fix-GNUC-GNUG-defines.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,291 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Undo the unintended parts of a much-too-broad "GNU"-to-"GNU Lesser"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replace-all used by the developers sometime between the release of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xbase 3.1.1 and 3.1.2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+A similar but incorrect patch (that also contains unrelated fixes) is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+attached here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xdb/patches/5/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The problem was also mentioned on the mailing list, where a different
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+incorrect solution was proposed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xdb/discussion/131854/thread/18d7fb7c/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xbase64/xbase64.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbase64.cpp 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbase64.h"
</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;'>+--- xbase64/xbase64.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbase64.h 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_XBASE_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_XBASE_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // ripped from wxWindows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // _declspec works in BC++ 5 and later, as well as VC++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNU LesserC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef XBMAKINGDLL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define XBDLLEXPORT __declspec( dllexport )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define XBDLLEXPORT_DATA(type) __declspec( dllexport ) type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xbase64/xbcdx.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbcdx.h 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xbLong leftSibling;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xbLong rightSibling;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __attribute__((packed))
</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;'>+@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char keys[500];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __attribute__((packed))
</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;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char byteCount;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char keys[488];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __attribute__((packed))
</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;'>+--- xbase64/xbdate.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbdate.cpp 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbdate.h"
</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;'>+--- xbase64/xbdate.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbdate.h 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_XBDATE_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_XBDATE_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+--- xbase64/xbdbf.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbdbf.cpp 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbdbf.h"
</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;'>+--- xbase64/xbdbf.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbdbf.h 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_DBF_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_DBF_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+--- xbase64/xbexp.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbexp.cpp 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbexp.h"
</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;'>+--- xbase64/xbexp.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbexp.h 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_EXP_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_EXP_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+--- xbase64/xbfile.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbfile.cpp 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbfile.h"
</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;'>+--- xbase64/xbfile.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbfile.h 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_FILE_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_FILE_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+--- xbase64/xbfilter.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbfilter.cpp 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbfilter.h"
</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;'>+--- xbase64/xbfilter.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbfilter.h 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_FILTER_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_FILTER_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+--- xbase64/xbindex.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbindex.cpp 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USA
</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;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbindex.h"
</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;'>+--- xbase64/xbindex.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbindex.h 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_INDEX_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_INDEX_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+--- xbase64/xblock.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xblock.cpp 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USA
</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;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xblock.h"
</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;'>+--- xbase64/xblock.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xblock.h 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_XBLOCK_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_XBLOCK_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+--- xbase64/xbndx.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbndx.cpp 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbndx.h"
</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;'>+--- xbase64/xbndx.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbndx.h 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_NDX_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_NDX_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+--- xbase64/xbntx.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbntx.cpp 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USA
</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;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbntx.h"
</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;'>+--- xbase64/xbntx.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbntx.h 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XB_NTX_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XB_NTX_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;'>+--- xbase64/xbstring.cpp 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbstring.cpp 2019-10-01 21:28:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma implementation "xbstring.h"
</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;'>+--- xbase64/xbstring.h 2006-07-17 11:54:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbstring.h 2019-10-01 21:28:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __XBSTRING_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __XBSTRING_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __GNU LesserG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUG__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</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;color:#808080;'>diff --git a/databases/xbase/files/fix-extension-comparison.patch b/databases/xbase/files/fix-extension-comparison.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b34e62d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/xbase/files/fix-extension-comparison.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix "warning: using the result of an assignment as a condition without parentheses"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xbase64/xbmemo.cpp.orig 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbmemo.cpp 2019-10-01 22:11:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -255,7 +255,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ext == "DBF")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MemofileName += "FPT";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ext = "dbf")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ext == "dbf")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MemofileName += "fpt";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return XB_INVALID_NAME;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/xbase/files/include-unistd.patch b/databases/xbase/files/include-unistd.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..54759bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/xbase/files/include-unistd.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix "error: use of undeclared identifier 'access'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xbase64/xbdbf.cpp.orig 2006-07-17 11:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xbase64/xbdbf.cpp 2019-10-01 22:01:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <io.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*! \file xbdbf.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/xbase/files/patch-xbase64-cpp.diff b/databases/xbase/files/patch-xbase64-cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 87454d2..a95ab66 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/xbase/files/patch-xbase64-cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/xbase/files/patch-xbase64-cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xdb/bugs/38/
</span> --- xbase64/xbase64.cpp.orig 2010-10-02 23:04:57.000000000 +0200
+++ xbase64/xbase64.cpp 2006-07-17 18:54:42.000000000 +0200
@@ -51,6 +51,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/xbase/files/patch-xbase64-xbnode-cpp.diff b/databases/xbase/files/patch-xbase64-xbnode-cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 750d612..fb43f50 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/xbase/files/patch-xbase64-xbnode-cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/xbase/files/patch-xbase64-xbnode-cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xdb/bugs/28/
</span> --- xbase64/xbnode.cpp.orig 2006-07-17 11:54:42.000000000 -0500
+++ xbase64/xbnode.cpp 2012-07-27 10:29:05.000000000 -0500
@@ -1,4 +1,4 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/xbase/files/patch-xblock-cpp.diff b/databases/xbase/files/patch-xblock-cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 451fb1e..69b32dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/xbase/files/patch-xblock-cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/xbase/files/patch-xblock-cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xdb/bugs/38/
</span> --- xbase64/xblock.cpp.orig 2010-10-02 22:57:35.000000000 +0200
+++ xbase64/xblock.cpp 2010-10-02 22:58:09.000000000 +0200
@@ -64,6 +64,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/xbase/files/patch-xbtypes-h.diff b/databases/xbase/files/patch-xbtypes-h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e9353e8..e359da0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/xbase/files/patch-xbtypes-h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/xbase/files/patch-xbtypes-h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xdb/bugs/39/
</span> --- xbase64/xbtypes.h.orig 2010-10-02 23:35:58.000000000 +0200
+++ xbase64/xbtypes.h 2010-10-02 23:36:05.000000000 +0200
@@ -85,7 +85,6 @@
</pre><pre style='margin:0'>
</pre>