gnucash-on-osx master: Replace mysql connector with mariadb connector.
John Ralls
jralls at code.gnucash.org
Fri Sep 17 01:25:18 EDT 2021
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/fe587b7d (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/0a36995f (commit)
commit fe587b7d880e2ee1b94cc41af95d064d06b8ec8a
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Sep 16 21:08:33 2021 -0700
Replace mysql connector with mariadb connector.
Matching gnucash-on-windows and most Linux distros, plus the mysql
C connector is no longer maintained but the mysql C++ connector which
is maintained doesn't work with libdbi.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 72e7e48..962e5fa 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -17,8 +17,6 @@
href="https://git.code.sf.net/p/"/>
<repository type="tarball" name="csail"
href="http://groups.csail.mit.edu/mac/ftpdir/"/>
- <repository type="tarball" name="csclub"
- href="http://mirror.csclub.uwaterloo.ca/mysql/Downloads/"/>
<repository type="tarball" name="gnucash.org"
href="http://www.gnucash.org/pub/gnucash/sources/"/>
<repository type="tarball" name="xmlsec"
@@ -31,13 +29,19 @@
href="https://github.com/"/>
<repository type="git" name="github"
href="git://github.com/"/>
+ <repository type="tarball" name="github-tarball"
+ href="https://github.com/"/>
<repository type="tarball" name="openssl"
href="https://www.openssl.org/source/"/>
<repository type="tarball" name="postgres"
href="https://ftp.postgresql.org/pub/source/"/>
<!--include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules"/-->
+<<<<<<< HEAD
<include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+=======
+ <include href="file:///Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+>>>>>>> 8720fb1 (Replace mysql connector with mariadb connector.)
<autotools id="libchipcard" autogen-sh="autoreconf" autogenargs="--enable-local-install">
<branch module="229/libchipcard-5.1.5rc2.tar.gz" version="5.1.5rc2"
@@ -165,6 +169,7 @@
</dependencies>
</autotools>
+<<<<<<< HEAD
<!-- The C connector is no longer being developed, users are advised
to use the C++ one, but it lacks mysql-configure so
libdbd-mysql can't use it. -->
@@ -172,9 +177,15 @@
<branch repo="csclub" module="Connector-C/mysql-connector-c-6.1.11-src.tar.gz"
version="6.1.11" >
<patch file="mysql-connector-6.1.11-cmake.patch" strip="1"/>
+=======
+ <cmake id="mariadb-connector" cmakeargs="-DWITH_SSL=gnutls">
+ <branch repo="github-tarball" module="mariadb-corporation/mariadb-connector-c/archive/refs/tags/v3.2.4.tar.gz" version="3.2.4"
+ checkoutdir="mariadb-connector-c-3.2.4">
+ <patch file="mysql-connector-fix-includes.patch" strip="1"/>
+>>>>>>> 8720fb1 (Replace mysql connector with mariadb connector.)
</branch>
<dependencies>
- <dep package="cmake"/>
+ <dep package="gnutls"/>
</dependencies>
</cmake>
@@ -184,13 +195,13 @@
</autotools>
<autotools id="libdbi-drivers" autogen-sh='autoreconf'
- autogenargs='--with-mysql --with-mysql-libdir=$PREFIX/lib --with-pgsql --with-sqlite3 --disable-docs --disable-dependency-tracking'>
+ autogenargs='--with-mysql --with-mysql-libdir=$PREFIX/lib --with-mysql-incdir=$PREFIX/include/mariadb/ --with-pgsql --with-sqlite3 --disable-docs --disable-dependency-tracking'>
<branch repo="sourceforge-git"
module="libdbi-drivers/libdbi-drivers">
</branch>
<dependencies>
<dep package="libdbi"/>
- <dep package="mysql"/>
+ <dep package="mariadb-connector"/>
<dep package="pgsql"/>
<dep package="sqlite"/>
</dependencies>
@@ -296,7 +307,7 @@
<dep package="meta-gtk-osx-gtk3"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
- <dep package="mysql"/>
+ <dep package="mariadb-connector"/>
<dep package="pgsql"/>
<dep package="sqlite"/>
<dep package="libdbi-drivers"/>
@@ -320,7 +331,7 @@
<dep package="meta-gtk-osx-gtk3"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
- <dep package="mysql"/>
+ <dep package="mariadb-connector"/>
<dep package="pgsql"/>
<dep package="sqlite"/>
<dep package="libdbi-drivers"/>
diff --git a/patches/mariadb-connector-fix-includes.patch b/patches/mariadb-connector-fix-includes.patch
new file mode 100644
index 0000000..7003715
--- /dev/null
+++ b/patches/mariadb-connector-fix-includes.patch
@@ -0,0 +1,50 @@
+From 16127f0e99101f87b9762957db2b9b6896c180d8 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Thu, 16 Sep 2021 21:28:43 -0700
+Subject: [PATCH] mysql-connector fix includes
+
+---
+ zlib/gzlib.c | 1 +
+ zlib/gzread.c | 1 +
+ zlib/gzwrite.c | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/zlib/gzlib.c b/zlib/gzlib.c
+index 4105e6a..7c9801b 100644
+--- a/zlib/gzlib.c
++++ b/zlib/gzlib.c
+@@ -4,6 +4,7 @@
+ */
+
+ #include "gzguts.h"
++#include <unistd.h>
+
+ #if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
+ # define LSEEK _lseeki64
+diff --git a/zlib/gzread.c b/zlib/gzread.c
+index 956b91e..5900b11 100644
+--- a/zlib/gzread.c
++++ b/zlib/gzread.c
+@@ -4,6 +4,7 @@
+ */
+
+ #include "gzguts.h"
++#include <unistd.h>
+
+ /* Local functions */
+ local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
+diff --git a/zlib/gzwrite.c b/zlib/gzwrite.c
+index c7b5651..972f323 100644
+--- a/zlib/gzwrite.c
++++ b/zlib/gzwrite.c
+@@ -4,6 +4,7 @@
+ */
+
+ #include "gzguts.h"
++#include <unistd.h>
+
+ /* Local functions */
+ local int gz_init OF((gz_statep));
+--
+2.30.1 (Apple Git-130)
+
Summary of changes:
modulesets/gnucash.modules | 25 ++++++++++----
patches/mariadb-connector-fix-includes.patch | 50 ++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 7 deletions(-)
create mode 100644 patches/mariadb-connector-fix-includes.patch
More information about the gnucash-changes
mailing list