gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Mar 7 19:22:00 EST 2023
Updated via https://github.com/Gnucash/gnucash/commit/7d5154ce (commit)
via https://github.com/Gnucash/gnucash/commit/d87ee730 (commit)
via https://github.com/Gnucash/gnucash/commit/0f0b5e3f (commit)
via https://github.com/Gnucash/gnucash/commit/44cd4c1a (commit)
from https://github.com/Gnucash/gnucash/commit/2872d86c (commit)
commit 7d5154ce18f48d33e22c80e7dc0200b735d61cf4
Merge: 2872d86ca5 d87ee73048
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 7 16:17:20 2023 -0800
Merge Richard Cohen's 'cleanup-cflags' into master.
commit d87ee73048ce0ed48bdb8fbddfa0cee88ac0998a
Author: Richard Cohen <richard at daijobu.co.uk>
Date: Thu Mar 2 13:41:02 2023 +0000
Remove -Wno-pointer-sign
Add the necessary casts in gnc-gwen-guic.c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 222825f28c..b1104a2a47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -590,14 +590,14 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_C_EXTENSIONS ON)
if (UNIX)
- set( CMAKE_C_FLAGS "-Werror -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
+ set( CMAKE_C_FLAGS "-Werror -Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations ${CMAKE_CXX_FLAGS}")
set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${CMAKE_CXX_FLAGS}")
set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
endif()
if (MINGW)
- set( CMAKE_C_FLAGS "-Werror -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
+ set( CMAKE_C_FLAGS "-Werror -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
set( CMAKE_CXX_FLAGS "-DWINVER=0x0500 -D_EMULATE_GLIBC=0 ${CMAKE_CXX_FLAGS}") # Workaround for bug in gtest on mingw, see https://github.com/google/googletest/issues/893 and https://github.com/google/googletest/issues/920
endif()
diff --git a/gnucash/import-export/aqb/gnc-gwen-gui.c b/gnucash/import-export/aqb/gnc-gwen-gui.c
index a39be8870b..44a492e82c 100644
--- a/gnucash/import-export/aqb/gnc-gwen-gui.c
+++ b/gnucash/import-export/aqb/gnc-gwen-gui.c
@@ -1575,8 +1575,8 @@ checkcert_cb(GWEN_GUI *gwen_gui, const GWEN_SSLCERTDESCR *cert,
hash = GWEN_SslCertDescr_GetFingerPrint(cert);
status = GWEN_SslCertDescr_GetStatusText(cert);
- g_checksum_update (gcheck, hash, strlen (hash));
- g_checksum_update (gcheck, status, strlen (status));
+ g_checksum_update (gcheck, (const guchar *)hash, strlen (hash));
+ g_checksum_update (gcheck, (const guchar *)status, strlen (status));
/* Did we get the permanently accepted certs from AqBanking? */
if (gui->permanently_accepted_certs)
@@ -1597,7 +1597,7 @@ checkcert_cb(GWEN_GUI *gwen_gui, const GWEN_SSLCERTDESCR *cert,
g_warning("Can't check permanently accepted certs from invalid AqBanking cert store.");
}
- g_checksum_get_digest (gcheck, cert_hash, &hashlen);
+ g_checksum_get_digest (gcheck, (guint8 *)cert_hash, &hashlen);
g_checksum_free (gcheck);
g_assert (hashlen <= sizeof (cert_hash));
commit 0f0b5e3fe7fd90c5deb9b6fcc41e0cb80be478a6
Author: Richard Cohen <richard at daijobu.co.uk>
Date: Mon Mar 6 10:48:50 2023 +0000
Remove -Wno-error=parentheses
It was added for gcc 8.0 and gtk 3.14
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5be5819405..222825f28c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -591,8 +591,8 @@ set(CMAKE_C_EXTENSIONS ON)
if (UNIX)
set( CMAKE_C_FLAGS "-Werror -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
- set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations -Wno-error=parentheses ${CMAKE_C_FLAGS}")
- set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
+ set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
+ set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations ${CMAKE_CXX_FLAGS}")
set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${CMAKE_CXX_FLAGS}")
set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
endif()
commit 44cd4c1af1a0027cc166bafcb60fc763c5b16390
Author: Richard Cohen <richard at daijobu.co.uk>
Date: Mon Mar 6 10:48:26 2023 +0000
Remove unused ${REGISTER_CXXFLAG}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f997cea582..5be5819405 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -593,7 +593,7 @@ if (UNIX)
set( CMAKE_C_FLAGS "-Werror -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations -Wno-error=parentheses ${CMAKE_C_FLAGS}")
set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
- set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${REGISTER_CXXFLAG} ${CMAKE_CXX_FLAGS}")
+ set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${CMAKE_CXX_FLAGS}")
set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
endif()
if (MINGW)
Summary of changes:
CMakeLists.txt | 10 +++++-----
gnucash/import-export/aqb/gnc-gwen-gui.c | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
More information about the gnucash-changes
mailing list