Merge Richard Cohen's 'cleanup-build' into stable.

libgnucash/backend/sql/gnc-sql-backend.cpp

@@ -455,8 +455,6 @@ GncSqlBackend::write_schedXactions()
     return is_ok;
 }
 
-#pragma GCC diagnostic warning "-Wformat-nonliteral"
-
 void
 GncSqlBackend::sync(QofBook* book)
 {

libgnucash/backend/xml/CMakeLists.txt

@@ -125,9 +125,3 @@ install(TARGETS gncmod-backend-xml
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # ----
-
-# Special normal (non-MODULE) library for cutecash only
-add_library(gncmod-backend-xml-utils ${libgncmod_backend_xml_SOURCES})
-target_link_libraries(gncmod-backend-xml-utils gnc-backend-xml-utils gnc-engine
-                        gnc-core-utils ${LIBXML2_LDFLAGS} PkgConfig::GLIB2 ${ZLIB_LIBRARY})
-target_compile_definitions (gncmod-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)

libgnucash/backend/xml/io-gncxml-v2.cpp

@@ -73,14 +73,6 @@
 #include "io-gncxml-v2.h"
 #include "io-gncxml-gen.h"
 
-/* Do not treat -Wstrict-aliasing warnings as errors because of problems of the
- * G_LOCK* macros as declared by glib.  See
- * https://bugs.gnucash.org/show_bug.cgi?id=316221 for additional information.
- */
-#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
-#    pragma GCC diagnostic warning "-Wstrict-aliasing"
-#endif
-
 static QofLogModule log_module = GNC_MOD_IO;
 
 typedef struct

libgnucash/backend/xml/sixtp-utils.cpp

@@ -171,7 +171,7 @@ string_to_gint64 (const gchar* str, gint64* v)
     g_return_val_if_fail (str, FALSE);
 
     /* must use "<" here because %n's effects aren't well defined */
-    if (sscanf (str, " " QOF_SCANF_LLD "%n", &v_in, &num_read) < 1)
+    if (sscanf (str, " %lld%n", &v_in, &num_read) < 1)
     {
         return (FALSE);
     }