gnucash-on-osx master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Thu Apr 28 15:07:09 EDT 2022


Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/0b5a854c (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/af4126c0 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/7f7e6e04 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/39302a6a (commit)



commit 0b5a854c409ddc8da3432e84e4eb891165275142
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Apr 21 23:06:35 2022 +0200

    Update to libofx-0.10.5

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index bf00fb5..ce9aea3 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -130,9 +130,8 @@
   </autotools>
 
   <autotools id="libofx" autogen-sh='configure'>
-    <branch repo="sourceforge" module="libofx/libofx-0.10.2.tar.gz"
-            version="0.10.2">
-      <patch file="libofx-subtract-gmt-offset.patch" strip="1"/>
+    <branch repo="github-tarball" module="libofx/libofx/releases/download/0.10.5/libofx-0.10.5.tar.gz"
+            version="0.10.5">
     </branch>
     <dependencies>
       <dep package="OpenSP"/>
diff --git a/patches/libofx-subtract-gmt-offset.patch b/patches/libofx-subtract-gmt-offset.patch
deleted file mode 100644
index d6e8932..0000000
--- a/patches/libofx-subtract-gmt-offset.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 86036241d35df6570a19f932f5486d4a27dc3f02 Mon Sep 17 00:00:00 2001
-From: John Ralls <jralls at ceridwen.us>
-Date: Thu, 16 Sep 2021 16:32:30 -0700
-Subject: [PATCH] Reverse the application of gmt offset seconds to struct
- tm::tm_sec.
-
-A positive gmt offset means that UTC is that many seconds before the
-time indicated in struct tm so the gmt offset should be subtracted
-from tm_sec not added.
-
-Fixes https://bugs.gnucash.org/show_bug.cgi?id=798267.
----
- lib/ofx_utilities.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ofx_utilities.cpp b/lib/ofx_utilities.cpp
-index ced5cf9..6c8aa1e 100644
---- a/lib/ofx_utilities.cpp
-+++ b/lib/ofx_utilities.cpp
-@@ -152,7 +152,7 @@ string AppendCharStringtostring(const SGMLApplication::CharString source, string
-     float ofx_gmt_offset = atof(offset_str.c_str());
-     std::time_t temptime = std::time(nullptr);
-     static const double secs_per_hour = 3600.0;
--    time.tm_sec += static_cast<int>(ofx_gmt_offset * secs_per_hour);
-+    time.tm_sec -= static_cast<int>(ofx_gmt_offset * secs_per_hour);
-     return timegm(&time);
-   }
- 
--- 
-2.30.1 (Apple Git-130)
-

commit af4126c0dd4fadbf90dd1c987c15b34c3f679128
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Jan 13 11:50:27 2022 +0100

    Update to aqbanking-6.4.1 and gwenhywfar-5.8.1
    
    general: Added "taxes" to AB_TRANSACTION
    CSV: Improved profiles
    FinTS: Improvements on SEPA internal transfer
     Updated German bank data
    and more.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 8991e10..bf00fb5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -51,11 +51,10 @@
 
   <autotools id="gwenhywfar" autogen-sh="configure"
 	     autogenargs="--with-guis='gtk3' --enable-local-install">
-    <branch module="396/gwenhywfar-5.7.4.tar.gz" version="5.7.4"
+    <branch module="415/gwenhywfar-5.9.0.tar.gz" version="5.9.0"
             repo="aqbanking" >
       <patch file="gwen-include-file.patch" strip="1"/>
       <patch file="gwen-macos-bundle-path.patch" strip="1"/>
-      <patch file="gwenhywfar-5.7.4-typemaker2-Makefiles.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="libgcrypt"/>
@@ -89,7 +88,7 @@
 
   <autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
 	     autogenargs="--enable-local-install">
-    <branch module="394/aqbanking-6.4.0.tar.gz" version="6.4.0"
+    <branch module="435/aqbanking-6.5.0.tar.gz" version="6.5.0"
             repo="aqbanking">
     </branch>
     <dependencies>
diff --git a/patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch b/patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch
deleted file mode 100644
index d58026a..0000000
--- a/patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/tools/typemaker2/Makefile.in	2021-11-13 10:12:21.000000000 -0800
-+++ b/tools/typemaker2/Makefile.in	2021-11-24 13:31:46.720542300 -0800
-@@ -125,8 +125,9 @@
- am__DEPENDENCIES_1 =
- @IS_WINDOWS_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
- typemaker2_DEPENDENCIES =  \
-+	c/libtm2_c.la \
- 	$(top_builddir)/src/$(gwenhywfar_internal_libname) \
--	c/libtm2_c.la $(am__DEPENDENCIES_2)
-+	$(am__DEPENDENCIES_2)
- AM_V_lt = $(am__v_lt_ at AM_V@)
- am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -560,8 +561,10 @@
- 
- 
- #  tm_enum.c
--typemaker2_LDADD = $(top_builddir)/src/$(gwenhywfar_internal_libname) \
--	c/libtm2_c.la $(am__append_1)
-+typemaker2_LDADD = \
-+	c/libtm2_c.la \
-+	$(top_builddir)/src/$(gwenhywfar_internal_libname) \
-+	$(am__append_1)
- @IS_WINDOWS_TRUE at typemaker2_LDFLAGS = -mconsole
- EXTRA_DIST = $(typefiles)
- all: all-recursive
---- a/tools/typemaker2/c/Makefile.in	2021-11-13 10:12:21.000000000 -0800
-+++ b/tools/typemaker2/c/Makefile.in	2021-11-24 13:39:45.614600400 -0800
-@@ -456,7 +456,7 @@
- with_gui_gtk2 = @with_gui_gtk2@
- with_gui_gtk3 = @with_gui_gtk3@
- with_gui_qt4 = @with_gui_qt4@
--INCLUDES = @all_includes@ -I$(top_builddir) -I../ -I../../ -I$(top_srcdir)/tools -I$(gwenhywfar_symlinkdir)
-+INCLUDES = @all_includes@ -I$(top_builddir) -I${srcdir}/../ -I${srcdir}/../../ -I$(top_srcdir)/tools -I$(gwenhywfar_symlinkdir)
- noinst_LTLIBRARIES = libtm2_c.la
- libtm2_c_la_SOURCES = \
-  tm_builder_c.c \

commit 7f7e6e04aa63326c4dded83ec95ab55b5b723b59
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Apr 26 14:42:04 2022 -0700

    Repackage GnuCash 4.10
    
    With all the Guide translations and the old Adwaita theme with stock icons.

diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 2d3dca4..1bbb84a 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 4.10-1 © 2022 GnucashContributors</string>
+	<string>Gnucash version 4.10-3 © 2022 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>4.10-1 © 2022 Gnucash Contributors</string>
+	<string>4.10-3 © 2022 Gnucash Contributors</string>
 	<key>CFBundleName</key>
 	<string>Gnucash</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.10-1</string>
+	<string>4.10-3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.10-1</string>
+	<string>4.10-3</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index b7afa0b..8991e10 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -365,7 +365,7 @@
 
   <cmake id="gnucash-docs"
          ninjaargs="html">
-    <branch  module="gnucash/gnucash-docs-4.10.tar.gz"
+    <branch  module="gnucash/gnucash-docs-4.10.1.tar.gz"
 	     version="4.10" repo="sourceforge"/>
   </cmake>
 
@@ -375,4 +375,13 @@
 	     version="3.906" repo="sourceforge"/>
   </cmake>
 
+  <autotools id="adwaita-3">
+    <branch module="adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz"
+            version="3.38.0"
+            hash="sha256:6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97"/>
+    <dependencies>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>



Summary of changes:
 gnucash-bundler/Info.plist                         |  8 ++---
 modulesets/gnucash.modules                         | 21 ++++++++----
 .../gwenhywfar-5.7.4-typemaker2-Makefiles.patch    | 37 ----------------------
 patches/libofx-subtract-gmt-offset.patch           | 31 ------------------
 4 files changed, 18 insertions(+), 79 deletions(-)
 delete mode 100644 patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch
 delete mode 100644 patches/libofx-subtract-gmt-offset.patch



More information about the gnucash-changes mailing list