gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/b92eff26 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/92bb277f (commit)
	from  https://github.com/Gnucash/gnucash/commit/1d3fc071 (commit)



commit b92eff265a5008d8a03049c77af0db1e64ecb637
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu Jun 2 18:49:23 2016 +0200

    Avoid variable redefined errors for _FORTIFY_SOURCE
    
    I ran into this on sabayon linux while trying the cmake build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3ab49d..3010147 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,7 +375,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")  # FIXME: should be -std=
 
 
 IF (UNIX)
-  SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wdeclaration-after-statement -Wno-pointer-sign -D_FORTIFY_SOURCE=2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations  -Wno-unused")
+  SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wdeclaration-after-statement -Wno-pointer-sign -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations  -Wno-unused")
   SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-declarations -std=gnu99 -O2")
 ENDIF (UNIX)
 IF (MINGW)

commit 92bb277f066d4625bffabd3dacad43616c35a6d4
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sat May 21 20:01:53 2016 +0200

    Fix leaking of ICU's c++ interface through libxml on some platforms
    
    This may become unnecessary once the backends are rewritten in c++.
    Tested on sabayon linux (which exibited the issue).

diff --git a/src/backend/xml/CMakeLists.txt b/src/backend/xml/CMakeLists.txt
index 950119c..c6882a7 100644
--- a/src/backend/xml/CMakeLists.txt
+++ b/src/backend/xml/CMakeLists.txt
@@ -87,7 +87,7 @@ TARGET_INCLUDE_DIRECTORIES (gnc-backend-xml-utils
   PRIVATE ${ZLIB_INCLUDE_DIRS}
 )
 
-TARGET_COMPILE_DEFINITIONS (gnc-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\")
+TARGET_COMPILE_DEFINITIONS (gnc-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
 
 INSTALL(TARGETS gnc-backend-xml-utils
   LIBRARY DESTINATION lib
@@ -105,7 +105,7 @@ ADD_LIBRARY(gncmod-backend-xml MODULE ${libgncmod_backend_xml_SOURCES})
 TARGET_LINK_LIBRARIES(gncmod-backend-xml gnc-backend-xml-utils gncmod-engine
                         gnc-core-utils ${LIBXML2_LDFLAGS} ${GLIB2_LDFLAGS} ${ZLIB_LIBRARY})
 
-TARGET_COMPILE_DEFINITIONS (gncmod-backend-xml PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\")
+TARGET_COMPILE_DEFINITIONS (gncmod-backend-xml PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
 
 SET(LIB_DIR lib/gnucash)
 IF (WIN32)
diff --git a/src/backend/xml/Makefile.am b/src/backend/xml/Makefile.am
index 8e61544..e84e589 100644
--- a/src/backend/xml/Makefile.am
+++ b/src/backend/xml/Makefile.am
@@ -7,6 +7,7 @@ pkglib_LTLIBRARIES = libgncmod-backend-xml.la
 AM_CPPFLAGS = \
   -I.. -I../.. \
   -DLOCALE_DIR=\""$(datadir)/locale"\" \
+  -DU_SHOW_CPLUSPLUS_API=0 \
   -I${top_srcdir}/src/backend \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/core-utils \
diff --git a/src/backend/xml/test/CMakeLists.txt b/src/backend/xml/test/CMakeLists.txt
index bf3fdbd..1abe1bb 100644
--- a/src/backend/xml/test/CMakeLists.txt
+++ b/src/backend/xml/test/CMakeLists.txt
@@ -18,6 +18,7 @@ SET(XML_TEST_LIBS gncmod-engine gnc-qof gncmod-test-engine test-core ${LIBXML2_L
 
 FUNCTION(ADD_XML_TEST _TARGET _SOURCE_FILES)
   GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" XML_TEST_INCLUDE_DIRS XML_TEST_LIBS ${ARGN})
+  TARGET_COMPILE_OPTIONS(${_TARGET} PRIVATE -DU_SHOW_CPLUSPLUS_API=0)
 ENDFUNCTION()
 
 
@@ -74,6 +75,7 @@ GNC_ADD_TEST_WITH_GUILE(test-load-example-account
   XML_TEST_INCLUDE_DIRS XML_TEST_LIBS
   GNC_ACCOUNT_PATH=${CMAKE_SOURCE_DIR}/accounts/C
 )
+TARGET_COMPILE_OPTIONS(test-load-example-account PRIVATE -DU_SHOW_CPLUSPLUS_API=0)
 ADD_XML_TEST(test-string-converters "${test_backend_xml_base_SOURCES};test-string-converters.cpp")
 ADD_XML_TEST(test-xml-account "${test_backend_xml_module_SOURCES};test-xml-account.cpp;test-file-stuff.cpp")
 ADD_XML_TEST(test-xml-commodity "${test_backend_xml_module_SOURCES};test-xml-commodity.cpp;test-file-stuff.cpp")
diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am
index abbd231..1ede9f2 100644
--- a/src/backend/xml/test/Makefile.am
+++ b/src/backend/xml/test/Makefile.am
@@ -271,6 +271,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/engine/test-core \
   -I${top_srcdir}/src/backend/xml \
   -I${top_srcdir}/src/libqof/qof \
+  -DU_SHOW_CPLUSPLUS_API=0 \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS} \



Summary of changes:
 CMakeLists.txt                      | 2 +-
 src/backend/xml/CMakeLists.txt      | 4 ++--
 src/backend/xml/Makefile.am         | 1 +
 src/backend/xml/test/CMakeLists.txt | 2 ++
 src/backend/xml/test/Makefile.am    | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)