Merge branch 'maint' into unstable

CMakeLists.txt

@@ -804,6 +804,8 @@ ADD_CUSTOM_COMMAND(OUTPUT ${DIST_FILE}.gz ${DIST_FILE}.bz2
            -D BUILDING_FROM_VCS=${BUILDING_FROM_VCS}
            -D SHELL=${SHELL}
            -D AUTOTOOLS_IN_DIST=${AUTOTOOLS_IN_DIST}
+           -D WITH_GNUCASH=${WITH_GNUCASH}
+
            -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDist.cmake
 
         DEPENDS
@@ -836,8 +838,17 @@ configure_file(
 add_custom_target(uninstall
         COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 
-SET_TARGET_PROPERTIES(gnc-core-utils gnc-module gnc-backend-sql gnc-backend-xml-utils
+SET(_MODULES gnc-core-utils gnc-module gnc-backend-xml-utils)
-  gnc-gnome PROPERTIES
+
+IF (WITH_SQL)
+  LIST(APPEND _MODULES gnc-backend-sql)
+ENDIF(WITH_SQL)
+
+IF (WITH_GNUCASH)
+  LIST(APPEND _MODULES gnc-gnome)
+ENDIF(WITH_GNUCASH)
+
+SET_TARGET_PROPERTIES(${_MODULES} PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY         ${LIBDIR_BUILD}
   IF (XCODE_VERSION)
     LIBRARY_OUTPUT_DIRECTORY_DEBUG   ${LIBDIR_BUILD}

ChangeLog

@@ -1,6 +1,198 @@
+2017-12-15 John Ralls 
+
+	* Handle mid-pacific timezones in date-sensitive tests. (HEAD -> unstable, origin/unstable)
+
+2017-12-15 John Ralls 
+
+	* Revert post-construction adjustment of ldt for DST.
+
+2017-12-12 John Ralls 
+
+	* Fix neutral time for consistent dates in mid-pacific time zones.
+
+2017-12-12 John Ralls 
+
+	* Fix posted-date scrub incrementing the day in central pacific timezones.
+
+2017-12-12 John Ralls 
+
+	* Remove (unused because of an error) parse-to-tm string timespec construction.
+
+2017-12-12 John Ralls 
+
+	* Fix offset handling in GncDateTime struct tm ctor, gnc_mktime, & gnc_timegm.
+
+2017-12-11 Geert Janssens 
+
+	* Add infrastructure to handle preference schema migrations and use it to replace one preference
+
+2017-12-08 John Ralls 
+
+	* Fix the Mac install_name_dir to point at CMAKE_INSTALL_FULL_LIBDIR.
+
+2017-12-10 John Ralls 
+
+	* Bug 791422 - gnucash 2.7 no longer opens sqlite3...
+
+2017-12-09 John Ralls 
+
+	* Test more thoroughly gnc-timezone's parsing of the zoneinfo database.
+
+2017-12-08 Geert Janssens 
+
+	* Fix transient parent warnings for tip-of-the-day and file dialogs
+
+2017-12-08 Geert Janssens 
+
+	* Fix transient parent warnings in search callbacks (origin/master, origin/HEAD, master)
+
+2017-12-06 Geert Janssens 
+
+	* Add transient parent for search dialog
+
+2017-12-03 Geert Janssens 
+
+	* Fix missing transient parent warnings for several business dialogs
+
+2017-11-16 Geert Janssens 
+
+	* Fix transient parent for SX since last run... at startup
+
+2017-11-16 Geert Janssens 
+
+	* Set transient parents for all query views and dialogs
+
+2017-11-26 Geert Janssens 
+
+	* Alter function signature of gnc_(verify|yes_no|info|warning|error)_dialog
+
+2017-11-25 Geert Janssens 
+
+	* Improve window management
+
+2017-11-16 Geert Janssens 
+
+	* Ensure the main window is mapped before any reminder dialogs are shown at startup
+
+2017-11-16 Geert Janssens 
+
+	* Handle the splash/lock file warning more the gtk way
+
+2017-12-05 John Ralls 
+
+	* Rework directory determination in CMake builds.
+
+2017-12-02 John Ralls 
+
+	* One more stray header in libexec.
+
+2017-12-01 John Ralls 
+
+	* LIBDIR is not lib--two more CMakeLists.txt.
+
+2017-12-01 John Ralls 
+
+	* Remove gnucash/test.
+
+2017-12-01 John Ralls 
+
+	* Some fixes to complete removing gnucash/overrides.
+
+2017-12-01 Rob Gowin 
+
+	* Handle cases where LIBDIR is not "lib"
+
+2017-12-01 John Ralls 
+
+	* Fix autotools build after removing gnucash/overrides.
+
+2017-12-01 Rob Gowin 
+
+	* Handle cases where LIBDIR is not "lib"
+
+2017-12-01 John Ralls 
+
+	* Remove overrides directory as being obsolete.
+
+2017-11-30 John Ralls 
+
+	* More GNUInstallDirs path fixes.
+
+2017-12-01 John Ralls 
+
+	* Fix the fixed path to compiled guile files.
+
+2017-11-30 John Ralls 
+
+	* Fix path to compiled guile files in environment.in.
+
+2017-11-30 John Ralls 
+
+	* Add GLIB_CFLAGS and srcdir to SWIG includes.
+
+2017-11-30 John Ralls 
+
+	* Remove unset variable SWIG_ARGS from Makefile.am
+
+2017-11-30 Geert Janssens 
+
+	* Fix installation destinations for overrides and quotes scripts
+
+2017-11-28 John Ralls 
+
+	* Fix python test failure on Travis.
+
+2017-11-28 John Ralls 
+
+	* Merge branch 'PyGncNumeric' into unstable
+
+2017-06-03 Guy Taylor 
+
+	* Use builtin SWIG conversions for glib types
+
+2017-06-03 Guy Taylor 
+
+	* Use glib.h over custom typedefs in Python SWIG
+
+2017-05-28 Guy Taylor 
+
+	* Add GncNumeric to native Python Fraction
+
+2017-05-17 Guy Taylor 
+
+	* Fix Python GncNumeric for non (int, int) pairs
+
+2017-11-28 John Ralls 
+
+	* Fix null pointer dereference segfault.
+
+2017-11-28 John Ralls 
+
+	* Merge Aaron Laws's 'unneeded-build-flag' into unstable
+
+2017-11-28 John Ralls 
+
+	* Use GNUInstallDirs in CMake Builds
+
+2017-11-28 John Ralls 
+
+	* Fix python tests in tarball builds.
+
+2017-11-28 lmat 
+
+	* Removing Arch Linux Autotools build
+
+2017-11-28 lmat 
+
+	* Removing unneeded build flag from docker
+
+2017-11-28 John Ralls 
+
+	* Remove common/test-core/unittest_support.py from git.
+
 2017-11-25 John Ralls 
 
-	* Release 2.7.2 (HEAD -> unstable)
+	* Release 2.7.2 (tag: 2.7.2)
 
 2017-11-25 John Ralls 
 
@@ -8,7 +200,7 @@
 
 2017-11-25 John Ralls 
 
-	* Correct GUILE_LOAD_COMPILE_PATH to include Guile's own modules as well as ours. (origin/unstable)
+	* Correct GUILE_LOAD_COMPILE_PATH to include Guile's own modules as well as ours.
 
 2017-11-24 John Ralls 
 
@@ -28,7 +220,7 @@
 
 2017-11-23 Rob Gowin 
 
-	* Bug 790620 - Failed to create file “/usr/share/glib-2.0/schemas/gschemas.compiled.XY789Y” (origin/maint, maint)
+	* Bug 790620 - Failed to create file “/usr/share/glib-2.0/schemas/gschemas.compiled.XY789Y”
 
 2017-11-23 Robert Fewell 
 
@@ -100,7 +292,7 @@
 
 2017-11-21 Geert Janssens 
 
-	* Merge branch 'gtk3-update8' of https://github.com/Bob-IT/gnucash into unstable (origin/master, origin/HEAD)
+	* Merge branch 'gtk3-update8' of https://github.com/Bob-IT/gnucash into unstable
 
 2017-11-21 Geert Janssens 
 
@@ -296,7 +488,7 @@
 
 2017-10-31 John Ralls 
 
-	* Merge branch J. Marino's fix-report-colors into unstable (manjusri/master)
+	* Merge branch J. Marino's fix-report-colors into unstable
 
 2017-10-31 John Ralls 
 
@@ -520,7 +712,7 @@
 
 2017-10-20 fell 
 
-	* Add a bunch of translator comments and a few accelerators to glade files (manjusri/maint)
+	* Add a bunch of translator comments and a few accelerators to glade files
 
 2017-10-20 Geert Janssens 
 
@@ -960,7 +1152,7 @@
 
 2017-09-16 John Ralls 
 
-	* Fix the fix from mac for test-userdata-dir.c (master)
+	* Fix the fix from mac for test-userdata-dir.c
 
 2017-09-16 John Ralls 
 
@@ -7042,3 +7234,11 @@
 
 	* Remove xaccSchedXactionGetInstanceAfter
 
+2016-01-02 fell 
+
+	* Add a missing gettext in plugin page owner tree
+
+2016-01-01 fell 
+
+	* Bug 760052 - missing flag translatable in Custom Report
+

NEWS

@@ -1,5 +1,27 @@
 Version history:
 ------- -------
+2.6.19 - 16 December 2017
+
+The following bugs are fixed:
+     Bug 787497 - Disabling OFX, AqBanking or python-bindings support cripples
+                  the dist build target. (Partial: The requisite files for AQB
+                  and OFX are provided. There remain ways to break the
+                  distribution.)
+     Bug 789928 - FTBFS with libdbi 0.9.0-5 on Debian
+     Bug 790620 - Failed to create file
+                  "/usr/share/glib-2.0/schemas/gschemas.compiled.XY789Y".
+
+Other repairs not marked as bugs in git:
+     Adapter for new flat KVP scheme for bayes import maps to be introduced in 2.8.0.
+     A better way to handle MySQL's 0000-00-00 invalid date indicator.
+     Fix python build and test errors on Mac.
+     Don't try to unref a NULL GDateTime*.
+     Add translator hint comments to C and glade files.
+     Improve type of bank accounts in SKR03
+     Stop testing GObject's handling of invalid parameters
+
+Updated Translations: Dutch, German, Russian, Serbian
+
 2.7.2 - 26 November 2017
 
     The Gnucash Development Team is pleased to release Gnucash 2.7.2,
@@ -327,7 +349,6 @@ KNOWN PROBLEMS:
 
     test-import-bayes built with autotools intermittently fails at
     line 381, where the returned value is 1 instead of the expected 6.
-
 2.6.18 - 24 September 2017
 
 The following bugs are fixed:

common/cmake_modules/MakeDist.cmake

@@ -181,4 +181,8 @@ FUNCTION(MAKE_DIST PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_F
     MESSAGE("\n\nDistributions ${PACKAGE_PREFIX}.tar.gz and ${PACKAGE_PREFIX}.tar.bz2 created.\n\n")
 ENDFUNCTION()
 
-MAKE_DIST(${PACKAGE_PREFIX} ${GNUCASH_SOURCE_DIR} ${BUILD_SOURCE_DIR} ${BUILDING_FROM_VCS})
+IF (NOT WITH_GNUCASH)
+    MESSAGE(SEND_ERROR "Creation of dist tarballs not support when WITH_GNUCASH=OFF.")
+ENDIF()
+
+ MAKE_DIST(${PACKAGE_PREFIX} ${GNUCASH_SOURCE_DIR} ${BUILD_SOURCE_DIR} ${BUILDING_FROM_VCS})

gnucash/import-export/CMakeLists.txt

@@ -3,18 +3,14 @@
 ADD_SUBDIRECTORY(test)
 
 # ############################################################
-if (WITH_AQBANKING)
+ADD_SUBDIRECTORY(aqb)
-  ADD_SUBDIRECTORY(aqb)
-endif()
 ADD_SUBDIRECTORY(bi-import)
 ADD_SUBDIRECTORY(csv-exp)
 ADD_SUBDIRECTORY(csv-imp)
 ADD_SUBDIRECTORY(customer-import)
 ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(log-replay)
-if (WITH_OFX)
+ADD_SUBDIRECTORY(ofx)
-  ADD_SUBDIRECTORY(ofx)
-endif()
 ADD_SUBDIRECTORY(qif)
 ADD_SUBDIRECTORY(qif-imp)
 

gnucash/import-export/ofx/gschemas/CMakeLists.txt

@@ -1,6 +1,8 @@
 
-set(ofx_GSCHEMA org.gnucash.dialogs.import.ofx.gschema.xml)
+IF (WITH_OFX)
+  set(ofx_GSCHEMA org.gnucash.dialogs.import.ofx.gschema.xml)
 
-ADD_GSCHEMA_TARGETS(ofx-gschema "${ofx_GSCHEMA}")
+  ADD_GSCHEMA_TARGETS(ofx-gschema "${ofx_GSCHEMA}")
+ENDIF (WITH_OFX)
 
 SET_DIST_LIST(ofx_gschema_DIST CMakeLists.txt Makefile.am org.gnucash.dialogs.import.ofx.gschema.xml.in.in)

gnucash/import-export/ofx/test/CMakeLists.txt

@@ -1,10 +1,10 @@
 
 
-SET(OFX_TEST_INCLUDE_DIRS
+IF(WITH_OFX)
-  ${LIBOFX_INCLUDE_DIRS}
+  SET(OFX_TEST_INCLUDE_DIRS ${LIBOFX_INCLUDE_DIRS})
-)
+  SET(OFX_TEST_LIBS)
-SET(OFX_TEST_LIBS)
 
-GNC_ADD_TEST(test-link-ofx test-link.c OFX_TEST_INCLUDE_DIRS OFX_TEST_LIBS)
+  GNC_ADD_TEST(test-link-ofx test-link.c OFX_TEST_INCLUDE_DIRS OFX_TEST_LIBS)
+ENDIF(WITH_OFX)
 
 SET_DIST_LIST(test_ofx_DIST CMakeLists.txt Makefile.am test-link.c)

libgnucash/backend/CMakeLists.txt

@@ -1,9 +1,7 @@
 
 ADD_SUBDIRECTORY(xml)
-IF (WITH_SQL)
+ADD_SUBDIRECTORY (dbi)
-  ADD_SUBDIRECTORY (dbi)
+ADD_SUBDIRECTORY (sql)
-  ADD_SUBDIRECTORY (sql)
-ENDIF (WITH_SQL)
 
 
 

libgnucash/backend/dbi/CMakeLists.txt

@@ -25,27 +25,29 @@ SET(backend_dbi_DIST ${backend_dbi_DIST_local} ${test_dbi_backend_DIST} PARENT_S
 # Add dependency on config.h
 SET_SOURCE_FILES_PROPERTIES (${backend_dbi_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-ADD_LIBRARY	(gncmod-backend-dbi
+IF (WITH_SQL)
-  ${backend_dbi_SOURCES}
+  ADD_LIBRARY (gncmod-backend-dbi
-  ${backend_dbi_noinst_HEADERS}
+    ${backend_dbi_SOURCES}
-)
+    ${backend_dbi_noinst_HEADERS}
+  )
 
-SET(WINSOCK_LIB "")
+  SET(WINSOCK_LIB "")
-IF(MINGW64)
+  IF(MINGW64)
-  SET(WINSOCK_LIB "-lws2_32")
+    SET(WINSOCK_LIB "-lws2_32")
-ENDIF(MINGW64)
+  ENDIF(MINGW64)
-TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB})
+  TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB})
 
-TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")
+  TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")
 
-TARGET_INCLUDE_DIRECTORIES(gncmod-backend-dbi PRIVATE ${LIBDBI_INCLUDE_PATH})
+  TARGET_INCLUDE_DIRECTORIES(gncmod-backend-dbi PRIVATE ${LIBDBI_INCLUDE_PATH})
 
-IF (APPLE)
+  IF (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-backend-dbi PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+    SET_TARGET_PROPERTIES (gncmod-backend-dbi PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+  ENDIF()
 
-INSTALL(TARGETS gncmod-backend-dbi
+  INSTALL(TARGETS gncmod-backend-dbi
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install
+ENDIF(WITH_SQL)

libgnucash/backend/dbi/test/CMakeLists.txt

@@ -27,7 +27,7 @@ SET(test_dbi_backend_HEADERS test-dbi-business-stuff.h test-dbi-stuff.h)
 SET_DIST_LIST(test_dbi_backend_DIST ${test_dbi_backend_SOURCES} ${test_dbi_backend_HEADERS} test-dbi.xml CMakeLists.txt Makefile.am)
 
 # This test does not work on Win32
-IF (NOT WIN32)
+IF (WITH_SQL AND NOT WIN32)
   GNC_ADD_TEST(test-backend-dbi "${test_dbi_backend_SOURCES}"
     BACKEND_DBI_TEST_INCLUDE_DIRS BACKEND_DBI_TEST_LIBS
   )

libgnucash/backend/sql/CMakeLists.txt

@@ -63,21 +63,22 @@ SET(backend_sql_DIST ${backend_sql_DIST_local} ${test_backend_sql_DIST} PARENT_S
 
 # Add dependency on config.h
 SET_SOURCE_FILES_PROPERTIES (${gnc_backend_sql_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+IF(WITH_SQL)
+  ADD_LIBRARY (gnc-backend-sql
+    ${backend_sql_SOURCES}
+    ${backend_sql_noinst_HEADERS}
+    )
 
-ADD_LIBRARY	(gnc-backend-sql
+  TARGET_LINK_LIBRARIES(gnc-backend-sql gncmod-engine)
-  ${backend_sql_SOURCES}
-  ${backend_sql_noinst_HEADERS}
-)
 
-TARGET_LINK_LIBRARIES(gnc-backend-sql gncmod-engine)
+  TARGET_COMPILE_DEFINITIONS (gnc-backend-sql PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.sql\")
 
-TARGET_COMPILE_DEFINITIONS (gnc-backend-sql PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.sql\")
+  TARGET_INCLUDE_DIRECTORIES(gnc-backend-sql PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-TARGET_INCLUDE_DIRECTORIES(gnc-backend-sql PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+  INSTALL(TARGETS gnc-backend-sql
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-INSTALL(TARGETS gnc-backend-sql
+  # No headers to install
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ENDIF(WITH_SQL)
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-# No headers to install

libgnucash/backend/sql/test/CMakeLists.txt

@@ -14,12 +14,14 @@ SET(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine test-core)
 SET_DIST_LIST(test_backend_sql_DIST ${test_backend_sql_SOURCES} CMakeLists.txt
   Makefile.am test-column-types.cpp)
 
-# This test does not actually do anything.
+IF(WITH_SQL)
-GNC_ADD_TEST(test-column-types test-column-types.cpp
+  # This test does not actually do anything.
-   BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
+  GNC_ADD_TEST(test-column-types test-column-types.cpp
-)
+    BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
+  )
 
-GNC_ADD_TEST(test-sqlbe "${test_backend_sql_SOURCES}"
+  GNC_ADD_TEST(test-sqlbe "${test_backend_sql_SOURCES}"
-   BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
+    BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
-)
+  )
-TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
+  TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
+ENDIF(WITH_SQL)