gnucash-on-osx master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Wed Jul 3 18:41:39 EDT 2024
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/54d5f769 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/0f64b943 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/ee6057ff (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/e25315a0 (commit)
commit 54d5f7696546e5452e4eef761387f4dae6a6cca2
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Jul 3 15:38:19 2024 -0700
Bug 799350 - Opening MySQL database fails in 5.7 but works in 5.6
Mariadb-connector-C has a new default parameter that requires the
server to have a valid TLS certificate. Turn that off.
Reviewed the other options in CMakeLists.txt and the cmake output and
added some other options to silence warnings, use the jhbuild-built zlib,
and get the install path right so that it doesn't have to be fixed after
building.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index d7d3412..281eb89 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -155,7 +155,8 @@
</dependencies>
</autotools>
- <cmake id="mariadb-connector" cmakeargs="-DWITH_SSL=gnutls -DWITH_MYSQLCOMPAT=ON">
+ <cmake id="mariadb-connector"
+ cmakeargs="-DWITH_MYSQLCOMPAT=ON -DWITH_ICONV=ON -DWITH_UNIT_TESTS=OFF -DWITH_EXTERNAL_ZLIB=ON -DWITH_SSL=gnutls -DDEFAULT_SSL_VERIFY_SERVER_CERT=OFF -DMACOSX_RPATH=ON">
<branch repo="github-tarball" module="mariadb-corporation/mariadb-connector-c/archive/refs/tags/v3.4.0.tar.gz" version="3.4.0"
checkoutdir="mariadb-connector-c-3.4.0">
<!-- patch file="mariadb-connector-fix-includes.patch" strip="1"/ -->
commit 0f64b943ec575da98ea8049bd8d424539764d841
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Jul 3 15:38:06 2024 -0700
Package GnuCash 5.7
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index eb8b1f2..726280b 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 5.6-1 © 2024 GnucashContributors</string>
+ <string>Gnucash version 5.7-1 © 2024 GnucashContributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>5.6-1 © 2024 Gnucash Contributors</string>
+ <string>5.7-1 © 2024 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>5.6-1</string>
+ <string>5.7-1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.6-1</string>
+ <string>5.7-1</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 53d1456..d7d3412 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -74,8 +74,8 @@
</autotools>
<autotools id="xmlsec" autogenargs="--enable-docs=no --with-gcrypt --with-gnutls">
- <branch module="xmlsec1-1.3.2.tar.gz"
- repo="xmlsec" version="1.3.2" >
+ <branch module="xmlsec1-1.3.4.tar.gz"
+ repo="xmlsec" version="1.3.4" >
</branch>
<dependencies>
<dep package="openssl"/>
@@ -240,8 +240,8 @@
<cmake id="gnucash"
cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/">
- <branch module="gnucash/gnucash-5.6.tar.bz2"
- checkoutdir="gnucash-5.6" repo="sourceforge" version="5.6" />
+ <branch module="gnucash/gnucash-5.7.tar.bz2"
+ checkoutdir="gnucash-5.7" repo="sourceforge" version="5.7" />
<dependencies>
<dep package="meta-gnucash-dependencies"/>
</dependencies>
@@ -301,8 +301,8 @@
<cmake id="gnucash-docs"
ninjaargs="html">
- <branch module="gnucash/gnucash-docs-5.6.tar.gz"
- version="5.6" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs-5.7.tar.gz"
+ version="5.7" repo="sourceforge"/>
</cmake>
<cmake id="gnucash-unstable-docs"
commit ee6057ff3014be1009ffbe3993492106b4136877
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jun 27 16:43:37 2024 -0700
Moduleset cleanup.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a196a7a..53d1456 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -255,6 +255,7 @@
<dependencies>
<dep package="meta-gnucash-dependencies"/>
+ <dep package="shared-mime-info"/>
</dependencies>
</cmake>
@@ -270,11 +271,12 @@
<metamodule id="meta-gnucash-dependencies">
<dependencies>
<dep package="meta-gtk-osx-gtk3"/>
- <dep package="meta-gtk-osx-python3-gtk3"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
+ <dep package="mariadb-connector"/>
+ <dep package="pgsql"/>
+ <dep package="sqlite"/>
<dep package="libdbi-drivers"/>
- <dep package="shared-mime-info"/>
<dep package="iso-codes"/>
<dep package="guile22"/>
<dep package="swig"/>
@@ -290,16 +292,22 @@
checkoutdir="gnucash-docs-git"/>
</cmake>
- <cmake id="gnucash-docs"
- ninjaargs="html">
- <branch module="gnucash/gnucash-docs-5.6.tar.gz"
- version="5.6" repo="sourceforge"/>
- </cmake>
+ <cmake id="gnucash-olddocs" autogenargs="--disable-scrollkeeper"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
+ makeargs=" html" makeinstallargs="install-html" >
+ <branch module="gnucash/gnucash-docs-4.14.tar.gz"
+ version="4.14" repo="sourceforge"/>
+ </cmake>
- <cmake id="gnucash-unstable-docs"
- ninjaargs="html">
- <branch module="gnucash/gnucash-docs-4.903.tar.gz"
- version="4.903" repo="sourceforge"/>
- </cmake>
+ <cmake id="gnucash-docs"
+ ninjaargs="html">
+ <branch module="gnucash/gnucash-docs-5.6.tar.gz"
+ version="5.6" repo="sourceforge"/>
+ </cmake>
+ <cmake id="gnucash-unstable-docs"
+ ninjaargs="html">
+ <branch module="gnucash/gnucash-docs-4.903.tar.gz"
+ version="4.903" repo="sourceforge"/>
+ </cmake>
</moduleset>
Summary of changes:
gnucash-bundler/Info.plist | 8 ++++----
modulesets/gnucash.modules | 43 ++++++++++++++++++++++++++-----------------
2 files changed, 30 insertions(+), 21 deletions(-)
More information about the gnucash-changes
mailing list