From aea33ca515aceb4f63a5cbc8165d4ec93f245d0c Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 8 Apr 2018 15:20:55 -0700 Subject: [PATCH 1/7] Bug 795049 - GnuCash 2.6.20-1 (Fedora Linux package) is unable to open... MariaDB database. --- src/backend/dbi/test/test-backend-dbi-basic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/dbi/test/test-backend-dbi-basic.c b/src/backend/dbi/test/test-backend-dbi-basic.c index 386a2c3ac1..4a55a625da 100644 --- a/src/backend/dbi/test/test-backend-dbi-basic.c +++ b/src/backend/dbi/test/test-backend-dbi-basic.c @@ -666,15 +666,15 @@ test_suite_gnc_backend_dbi (void) } if (g_list_find_custom (drivers, "sqlite3", (GCompareFunc)g_strcmp0)) create_dbi_test_suite ("sqlite3", "sqlite3"); - if (strlen (TEST_MYSQL_URL) > 0 && - g_list_find_custom (drivers, "mysql", (GCompareFunc)g_strcmp0)) - create_dbi_test_suite ("mysql", TEST_MYSQL_URL); if (strlen (TEST_PGSQL_URL) > 0 && g_list_find_custom (drivers, "pgsql", (GCompareFunc)g_strcmp0)) { g_setenv ("PGOPTIONS", "-c client_min_messages=WARNING", FALSE); create_dbi_test_suite ("postgres", TEST_PGSQL_URL); } + if (strlen (TEST_MYSQL_URL) > 0 && + g_list_find_custom (drivers, "mysql", (GCompareFunc)g_strcmp0)) + create_dbi_test_suite ("mysql", TEST_MYSQL_URL); GNC_TEST_ADD_FUNC( suitename, "adjust sql options string localtime", test_adjust_sql_options_string ); From c3f528b80c6cccdf9c139dc0f63a96ef513a0e62 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 9 Apr 2018 15:17:32 -0700 Subject: [PATCH 2/7] Bug 795068 - src/optional/python-bindings missing several files --- src/optional/python-bindings/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/optional/python-bindings/CMakeLists.txt b/src/optional/python-bindings/CMakeLists.txt index e87c194c90..96d92a10e5 100644 --- a/src/optional/python-bindings/CMakeLists.txt +++ b/src/optional/python-bindings/CMakeLists.txt @@ -1,7 +1,9 @@ ADD_SUBDIRECTORY(example_scripts) ADD_SUBDIRECTORY(tests) -IF (BUILDING_FROM_VCS) + SET(PYEXEC_FILES __init__.py function_class.py gnucash_business.py gnucash_core.py) + + IF (BUILDING_FROM_VCS) SET(SWIG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnucash_core.i ${CMAKE_CURRENT_SOURCE_DIR}/timespec.i) SET(GNUCASH_CORE_C_INCLUDES ${CMAKE_BINARY_DIR}/src/config.h @@ -63,8 +65,6 @@ IF(WITH_PYTHON) ${PYTHON_INCLUDE_DIRS} ) - SET(PYEXEC_FILES __init__.py function_class.py gnucash_business.py gnucash_core.py) - ADD_LIBRARY(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C}) TARGET_INCLUDE_DIRECTORIES(gnucash_core_c PRIVATE ${gnucash_core_c_INCLUDE_DIRS}) From 655803a1ca839bcc2c0065eecc31cd1a0995beb1 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 9 Apr 2018 15:23:40 -0700 Subject: [PATCH 3/7] Remove reference to the deleted gnc-value-portfolio script from README. --- src/quotes/README | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/quotes/README b/src/quotes/README index 9c9fccb874..36b51404cd 100644 --- a/src/quotes/README +++ b/src/quotes/README @@ -25,9 +25,3 @@ gnc-fq-update.in: Source file for gnc-fq-update which is a perl script that updates Finance::Quote from CPAN. -gnc-value-portfolio: - - A stand-alone perl script for updating and printing the value of a - portfolio. To use this script, edit the first few lines at the top - of the file to indicate your portfolio and purchase price. - (from Christopher B. Browne, cbbrowne@hex.net) From 9319858b9697a8bf7ebad09be5235f8811baa64e Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 9 Apr 2018 15:30:36 -0700 Subject: [PATCH 4/7] Release 2.6.21 --- CMakeLists.txt | 2 +- NEWS | 10 ++++++++++ configure.ac | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52bc5af3a4..7a44f55478 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ ENABLE_TESTING() # Version number of gnucash SET (GNUCASH_MAJOR_VERSION 2) SET (GNUCASH_MINOR_VERSION 6) -SET (GNUCASH_MICRO_VERSION 20) +SET (GNUCASH_MICRO_VERSION 21) SET (GNUCASH_NANO_VERSION 0) SET (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}.${GNUCASH_MICRO_VERSION}") SET (GNUCASH_LATEST_STABLE_SERIES 2.6) diff --git a/NEWS b/NEWS index fbeea527ae..de89e20d4a 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,15 @@ Version history: ------- ------- +2.6.21 - 10 April 2018 +This is the final, final release in the 2.6. stable series. After 2.6.20's release astute users quickly reported two significant bugs: + Bug 795049 - GnuCash 2.6.20-1 (Fedora Linux package) is unable to open + MariaDB database. + Bug 795068 - src/optional/python-bindings missing several files. + +We also noticed that src/quotes/README had a note about the +gnc-value-portfolio script that was removed because it required Yahoo! +quotes. That note has also been removed. + 2.6.20 - 1 April 2018 This is the final release in the 2.6 stable series. The following bugs are fixed: diff --git a/configure.ac b/configure.ac index 9905267f95..b337b126d5 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. # Autoconf initialization AC_PREREQ(2.60) -AC_INIT([GnuCash], [2.6.20], [https://bugzilla.gnome.org/page.cgi?id=browse.html&product=GnuCash], , [http://www.gnucash.org/]) +AC_INIT([GnuCash], [2.6.21], [https://bugzilla.gnome.org/page.cgi?id=browse.html&product=GnuCash], , [http://www.gnucash.org/]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(src/engine/Transaction.h) AC_CONFIG_MACRO_DIR([macros]) From cdeee96074211ee8a16f2cf666398525def81341 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 10 Apr 2018 09:30:58 -0700 Subject: [PATCH 5/7] Revert "Bug 795049 - GnuCash 2.6.20-1 (Fedora Linux package) is unable to open..." This reverts commit aea33ca515aceb4f63a5cbc8165d4ec93f245d0c because it doesn't fix the problem, just tests that the problem is only on MySQL/MariaDB. --- src/backend/dbi/test/test-backend-dbi-basic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/dbi/test/test-backend-dbi-basic.c b/src/backend/dbi/test/test-backend-dbi-basic.c index 4a55a625da..386a2c3ac1 100644 --- a/src/backend/dbi/test/test-backend-dbi-basic.c +++ b/src/backend/dbi/test/test-backend-dbi-basic.c @@ -666,15 +666,15 @@ test_suite_gnc_backend_dbi (void) } if (g_list_find_custom (drivers, "sqlite3", (GCompareFunc)g_strcmp0)) create_dbi_test_suite ("sqlite3", "sqlite3"); + if (strlen (TEST_MYSQL_URL) > 0 && + g_list_find_custom (drivers, "mysql", (GCompareFunc)g_strcmp0)) + create_dbi_test_suite ("mysql", TEST_MYSQL_URL); if (strlen (TEST_PGSQL_URL) > 0 && g_list_find_custom (drivers, "pgsql", (GCompareFunc)g_strcmp0)) { g_setenv ("PGOPTIONS", "-c client_min_messages=WARNING", FALSE); create_dbi_test_suite ("postgres", TEST_PGSQL_URL); } - if (strlen (TEST_MYSQL_URL) > 0 && - g_list_find_custom (drivers, "mysql", (GCompareFunc)g_strcmp0)) - create_dbi_test_suite ("mysql", TEST_MYSQL_URL); GNC_TEST_ADD_FUNC( suitename, "adjust sql options string localtime", test_adjust_sql_options_string ); From b1915a0b89396446f0bf2fb6c78bed32eab3ee08 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 10 Apr 2018 09:34:06 -0700 Subject: [PATCH 6/7] Bug 795049 - GnuCash 2.6.20-1 (Fedora Linux package) is unable to open... MariaDB. MariaDB (and probably MySQL) doesn't accept two queries in a single command. --- src/backend/dbi/gnc-backend-dbi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/dbi/gnc-backend-dbi.c b/src/backend/dbi/gnc-backend-dbi.c index 5708f7878c..29bd82dbeb 100644 --- a/src/backend/dbi/gnc-backend-dbi.c +++ b/src/backend/dbi/gnc-backend-dbi.c @@ -3326,10 +3326,10 @@ conn_test_dbi_library( dbi_conn conn ) GncDbiTestResult retval = GNC_DBI_PASS; memset( doublestr, 0, sizeof(doublestr)); - result = dbi_conn_query( conn, "DROP TABLE IF EXISTS numtest;" - "CREATE TEMPORARY TABLE numtest " + result = dbi_conn_query (conn, "DROP TABLE IF EXISTS numtest;"); + result = dbi_conn_query (con, "CREATE TEMPORARY TABLE numtest " "( test_int BIGINT, test_unsigned BIGINT," - " test_double FLOAT8 )" ); + " test_double FLOAT8 )"); if ( result == NULL ) { PWARN("Test_DBI_Library: Create table failed"); From 868489b1c4f9b1f64fe61130e6ae28b4bad16f22 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 10 Apr 2018 09:52:02 -0700 Subject: [PATCH 7/7] Fix typo. --- src/backend/dbi/gnc-backend-dbi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/dbi/gnc-backend-dbi.c b/src/backend/dbi/gnc-backend-dbi.c index 29bd82dbeb..824486a526 100644 --- a/src/backend/dbi/gnc-backend-dbi.c +++ b/src/backend/dbi/gnc-backend-dbi.c @@ -3327,7 +3327,7 @@ conn_test_dbi_library( dbi_conn conn ) memset( doublestr, 0, sizeof(doublestr)); result = dbi_conn_query (conn, "DROP TABLE IF EXISTS numtest;"); - result = dbi_conn_query (con, "CREATE TEMPORARY TABLE numtest " + result = dbi_conn_query (conn, "CREATE TEMPORARY TABLE numtest " "( test_int BIGINT, test_unsigned BIGINT," " test_double FLOAT8 )"); if ( result == NULL )