gnucash-on-flatpak master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/cfeee80e (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/56394bf0 (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/41321db5 (commit)
	from  https://github.com/Gnucash/gnucash-on-flatpak/commit/799eaf9d (commit)



commit cfeee80eddab7e53d91859e32244c7d308b68a75
Merge: 799eaf9 56394bf
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Jun 23 20:37:29 2021 +0200

    Merge branch 'mariadb-connector-c'


commit 56394bf06c6f8c67569c5654f056ec5a6e753fff
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Jun 23 20:33:47 2021 +0200

    Tweak mariadb-connector-c build script to effectively build

diff --git a/modules/mariadb.json b/modules/mariadb.json
index 09367e7..b86851a 100644
--- a/modules/mariadb.json
+++ b/modules/mariadb.json
@@ -1,9 +1,17 @@
 {
     "name": "mariadb-connector-c",
     "buildsystem": "cmake",
-    "no-make-install": true,
     "config-opts": [
-        "-DCMAKE_BUILD_TYPE=Release"
+        "-DCMAKE_BUILD_TYPE=Release",
+        "-DINSTALL_BINDIR=bin",
+        "-DINSTALL_LIBDIR=lib",
+        "-DINSTALL_INCLUDEDIR=include",
+        "-DINSTALL_PLUGINDIR=lib/mariadb/plugin",
+        "-DINSTALL_PCDIR=lib/pkgconfig"
+    ],
+    "post-install": [
+        "ln -s /app/bin/mariadb_config /app/bin/mysql_config",
+        "ln -s /app/lib/libmariadb.so.3 /app/lib/libmysqlclient.so"
     ],
     "sources": [
         {

commit 41321db54f27156a983098a9bf5d7663f6c4b81a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Nov 27 18:34:13 2020 +0100

    Downsize from MariaDB to mariadb-connector-c

diff --git a/modules/mariadb.json b/modules/mariadb.json
index f41458b..09367e7 100644
--- a/modules/mariadb.json
+++ b/modules/mariadb.json
@@ -1,33 +1,15 @@
 {
-    "name": "mariadb",
+    "name": "mariadb-connector-c",
     "buildsystem": "cmake",
     "no-make-install": true,
     "config-opts": [
-        "-DBUILD_CONFIG=mysql_release",
-        "-DWITH_INNOBASE_STORAGE_ENGINE=1",
-        "-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1",
-        "-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1",
-        "-DWITHOUT_PARTITION_STORAGE_ENGINE=1",
-        "-DWITHOUT_TOKUDB=1",
-        "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1",
-        "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1",
-        "-DWITHOUT_PBXT_STORAGE_ENGINE=1",
-        "-DPLUGIN_AUTH_PAM=NO"
-    ],
-    "post-install": [
-        "make -C libmysql install",
-        "make -C include install",
-        "install -Dm755 scripts/mysql_config /app/bin/mysql_config",
-        "install -Dm644 support-files/mariadb.pc /app/share/pkgconfig/mariadb.pc"
-    ],
-    "cleanup": [
-        "/bin/"
+        "-DCMAKE_BUILD_TYPE=Release"
     ],
     "sources": [
         {
             "type": "archive",
-            "url": "http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-10.1.48/source/mariadb-10.1.48.tar.gz",
-            "sha256": "069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9"
+            "url": "https://mirrors.syringanetworks.net/mariadb/connector-c-3.1.13/mariadb-connector-c-3.1.13-src.tar.gz",
+            "sha256": "0271a5edfd64b13bca5937267474e4747d832ec62e169fc2589d2ead63746875"
         }
     ],
     "modules": [



Summary of changes:
 modules/mariadb.json | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)