gnucash-on-flatpak master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Jan 18 18:52:23 EST 2025
Updated via https://github.com/Gnucash/gnucash-on-flatpak/commit/63ad5e69 (commit)
via https://github.com/Gnucash/gnucash-on-flatpak/commit/608230f6 (commit)
from https://github.com/Gnucash/gnucash-on-flatpak/commit/721e4c17 (commit)
commit 63ad5e69c3402154f4b7ad29f15ad34261a4ce16
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 18 15:48:19 2025 -0800
libdbi: Supply mysql paths to configure.
libdbi-0.9.1 uses pkg-config to find mysql-connector, but mariadb
doesn't provide a mysql.pc so we need to tell it.
Fixes https://github.com/flathub/org.gnucash.GnuCash/issues/92
diff --git a/modules/libdbi.json b/modules/libdbi.json
index 3b5aaa9..d9e48b7 100644
--- a/modules/libdbi.json
+++ b/modules/libdbi.json
@@ -6,6 +6,8 @@
"--with-dbi-libdir=/app/lib/",
"--with-dbi-incdir=/app/include/",
"--with-mysql",
+ "--with-mysql-libdir=/app/lib/",
+ "--with-mysql-incdir=/app/include/",
"--with-pgsql",
"--with-sqlite3"
],
commit 608230f67e5935197a85b7224bc0acea3a8e5580
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 18 15:47:32 2025 -0800
libdbi: Don't use version script instead of supplying one.
diff --git a/modules/libdbi.json b/modules/libdbi.json
index a8c91ab..3b5aaa9 100644
--- a/modules/libdbi.json
+++ b/modules/libdbi.json
@@ -22,7 +22,6 @@
{
"type": "patch",
"paths": [
- "../patches/libdbi-link-map.patch",
"../patches/libdbi-drivers-cgreen-tests-constraint-test-type.patch"
]
},
@@ -49,7 +48,7 @@
},
{
"type": "patch",
- "path": "../patches/libdbi-link-map.patch"
+ "path": "../patches/libdbi-no-version-script.patch"
},
{
"type": "shell",
diff --git a/patches/libdbi-link-map.patch b/patches/libdbi-link-map.patch
deleted file mode 100644
index c858672..0000000
--- a/patches/libdbi-link-map.patch
+++ /dev/null
@@ -1,194 +0,0 @@
---- /dev/null
-+++ a/src/libdbi.map
-@@ -0,0 +1,191 @@
-+ ABI_3 {
-+ global:
-+ dbi_conn_cap_get;
-+ dbi_conn_clear_option;
-+ dbi_conn_clear_options;
-+ dbi_conn_close;
-+ dbi_conn_connect;
-+ dbi_conn_disjoin_results;
-+ dbi_conn_error;
-+ dbi_conn_error_flag;
-+ dbi_conn_error_handler;
-+ dbi_conn_escape_binary_copy;
-+ dbi_conn_escape_string;
-+ dbi_conn_escape_string_copy;
-+ dbi_conn_get_db_list;
-+ dbi_conn_get_driver;
-+ dbi_conn_get_encoding;
-+ dbi_conn_get_engine_version;
-+ dbi_conn_get_engine_version_string;
-+ dbi_conn_get_option;
-+ dbi_conn_get_option_list;
-+ dbi_conn_get_option_numeric;
-+ dbi_conn_get_socket;
-+ dbi_conn_get_table_list;
-+ dbi_conn_new;
-+ dbi_conn_new_r;
-+ dbi_conn_open;
-+ dbi_conn_ping;
-+ dbi_conn_query;
-+ dbi_conn_query_null;
-+ dbi_conn_queryf;
-+ dbi_conn_quote_binary_copy;
-+ dbi_conn_quote_string;
-+ dbi_conn_quote_string_copy;
-+ dbi_conn_release_savepoint;
-+ dbi_conn_require_option;
-+ dbi_conn_require_option_numeric;
-+ dbi_conn_rollback_to_savepoint;
-+ dbi_conn_savepoint;
-+ dbi_conn_select_db;
-+ dbi_conn_sequence_last;
-+ dbi_conn_sequence_next;
-+ dbi_conn_set_error;
-+ dbi_conn_set_option;
-+ dbi_conn_set_option_numeric;
-+ dbi_conn_transaction_begin;
-+ dbi_conn_transaction_commit;
-+ dbi_conn_transaction_rollback;
-+ dbi_driver_cap_get;
-+ dbi_driver_encoding_from_iana;
-+ dbi_driver_encoding_to_iana;
-+ dbi_driver_get_date_compiled;
-+ dbi_driver_get_description;
-+ dbi_driver_get_filename;
-+ dbi_driver_get_instance;
-+ dbi_driver_get_maintainer;
-+ dbi_driver_get_name;
-+ dbi_driver_get_url;
-+ dbi_driver_get_version;
-+ dbi_driver_is_reserved_word;
-+ dbi_driver_list;
-+ dbi_driver_list_r;
-+ dbi_driver_open;
-+ dbi_driver_open_r;
-+ dbi_driver_quote_string;
-+ dbi_driver_quote_string_copy;
-+ dbi_driver_specific_function;
-+ dbi_initialize;
-+ dbi_initialize_r;
-+ dbi_result_bind_binary;
-+ dbi_result_bind_binary_copy;
-+ dbi_result_bind_char;
-+ dbi_result_bind_datetime;
-+ dbi_result_bind_double;
-+ dbi_result_bind_fields;
-+ dbi_result_bind_float;
-+ dbi_result_bind_int;
-+ dbi_result_bind_long;
-+ dbi_result_bind_longlong;
-+ dbi_result_bind_short;
-+ dbi_result_bind_string;
-+ dbi_result_bind_string_copy;
-+ dbi_result_bind_uchar;
-+ dbi_result_bind_uint;
-+ dbi_result_bind_ulong;
-+ dbi_result_bind_ulonglong;
-+ dbi_result_bind_ushort;
-+ dbi_result_disjoin;
-+ dbi_result_field_is_null;
-+ dbi_result_field_is_null_idx;
-+ dbi_result_first_row;
-+ dbi_result_free;
-+ dbi_result_get_as_longlong;
-+ dbi_result_get_as_longlong_idx;
-+ dbi_result_get_as_string_copy;
-+ dbi_result_get_as_string_copy_idx;
-+ dbi_result_get_binary;
-+ dbi_result_get_binary_copy;
-+ dbi_result_get_binary_copy_idx;
-+ dbi_result_get_binary_idx;
-+ dbi_result_get_char;
-+ dbi_result_get_char_idx;
-+ dbi_result_get_conn;
-+ dbi_result_get_currow;
-+ dbi_result_get_datetime;
-+ dbi_result_get_datetime_idx;
-+ dbi_result_get_datetimex;
-+ dbi_result_get_datetimex_idx;
-+ dbi_result_get_double;
-+ dbi_result_get_double_idx;
-+ dbi_result_get_field_attrib;
-+ dbi_result_get_field_attrib_idx;
-+ dbi_result_get_field_attribs;
-+ dbi_result_get_field_attribs_idx;
-+ dbi_result_get_field_idx;
-+ dbi_result_get_field_length;
-+ dbi_result_get_field_length_idx;
-+ dbi_result_get_field_name;
-+ dbi_result_get_field_size;
-+ dbi_result_get_field_size_idx;
-+ dbi_result_get_field_type;
-+ dbi_result_get_field_type_idx;
-+ dbi_result_get_fields;
-+ dbi_result_get_float;
-+ dbi_result_get_float_idx;
-+ dbi_result_get_int;
-+ dbi_result_get_int_idx;
-+ dbi_result_get_long;
-+ dbi_result_get_long_idx;
-+ dbi_result_get_longlong;
-+ dbi_result_get_longlong_idx;
-+ dbi_result_get_numfields;
-+ dbi_result_get_numrows;
-+ dbi_result_get_numrows_affected;
-+ dbi_result_get_short;
-+ dbi_result_get_short_idx;
-+ dbi_result_get_string;
-+ dbi_result_get_string_copy;
-+ dbi_result_get_string_copy_idx;
-+ dbi_result_get_string_idx;
-+ dbi_result_get_uchar;
-+ dbi_result_get_uchar_idx;
-+ dbi_result_get_uint;
-+ dbi_result_get_uint_idx;
-+ dbi_result_get_ulong;
-+ dbi_result_get_ulong_idx;
-+ dbi_result_get_ulonglong;
-+ dbi_result_get_ulonglong_idx;
-+ dbi_result_get_ushort;
-+ dbi_result_get_ushort_idx;
-+ dbi_result_has_next_row;
-+ dbi_result_has_prev_row;
-+ dbi_result_last_row;
-+ dbi_result_next_row;
-+ dbi_result_prev_row;
-+ dbi_result_seek_row;
-+ dbi_set_verbosity;
-+ dbi_set_verbosity_r;
-+ dbi_shutdown;
-+ dbi_shutdown_r;
-+ dbi_version;
-+ dbi_version_numeric;
-+
-+ _dbd_decode_binary;
-+ _dbd_encode_binary;
-+ _dbd_escape_chars;
-+ _dbd_internal_error_handler;
-+ _dbd_parse_datetimex;
-+ _dbd_register_conn_cap;
-+ _dbd_register_driver_cap;
-+ _dbd_result_add_field;
-+ _dbd_result_add_to_conn;
-+ _dbd_result_create;
-+ _dbd_result_create_from_stringarray;
-+ _dbd_result_set_numfields;
-+ _dbd_row_allocate;
-+ _dbd_row_finalize;
-+ _dirent_buf_size;
-+ _disjoin_from_conn;
-+ _error_handler;
-+ _get_field_flag;
-+ _isolate_attrib;
-+ _logquery;
-+ _logquery_null;
-+ _reset_conn_error;
-+ _set_field_flag;
-+ _verbose_handler;
-+
-+ local:
-+ *;
-+ };
diff --git a/patches/libdbi-no-version-script.patch b/patches/libdbi-no-version-script.patch
new file mode 100644
index 0000000..ff0900d
--- /dev/null
+++ b/patches/libdbi-no-version-script.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac 2025-01-18 12:26:34.017029913 -0800
++++ b/configure.ac 2025-01-18 12:30:22.174166882 -0800
+@@ -88,7 +88,6 @@
+ DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+ CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char $CFLAGS"
+ PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char"
+- ld_version_script="yes"
+ ;;
+ sparc-sun-*)
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
+
+
Summary of changes:
modules/libdbi.json | 5 +-
patches/libdbi-link-map.patch | 194 ---------------------------------
patches/libdbi-no-version-script.patch | 12 ++
3 files changed, 15 insertions(+), 196 deletions(-)
delete mode 100644 patches/libdbi-link-map.patch
create mode 100644 patches/libdbi-no-version-script.patch
More information about the gnucash-changes
mailing list