gnucash-on-windows master: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Wed Sep 25 10:41:00 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/7e6d97d8 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/681c6067 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/23cb2c05 (commit)



commit 7e6d97d82b140b42e74a03698b1d476547fc7bd1
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Sep 25 16:40:53 2019 +0200

    Remove obsolete patch files

diff --git a/patches/aqbanking-5.99.33beta-mconsole.patch b/patches/aqbanking-5.99.33beta-mconsole.patch
deleted file mode 100644
index d8e7943..0000000
--- a/patches/aqbanking-5.99.33beta-mconsole.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/tools/aqbanking-cli/Makefile.am
-+++ b/src/tools/aqbanking-cli/Makefile.am
-@@ -37,6 +37,9 @@ aqbanking_cli_SOURCES= \
-   control.c
- 
- aqbanking_cli_LDFLAGS=
-+aqhbci_tool4_LDFLAGS=
-+aqpaypal_tool_LDFLAGS=
-+aqebics_tool_LDFLAGS=
- #-Wl,-static
- 
- DEFS += -DLOCALEDIR=\"$(localedir)\" -DAQBANKING_CLI_VERSION_STRING=\"@AQBANKING_CLI_VERSION_STRING@\"
-@@ -68,6 +68,10 @@ aqebics_tool_LDADD= \
- if IS_WINDOWS
- 
- aqbanking_cli_LDFLAGS+=-mconsole
-+aqhbci_tool4_LDFLAGS+=-mconsole
-+aqpaypal_tool_LDFLAGS+=-mconsole
-+aqebics_tool_LDFLAGS+=-mconsole
-+
- 
- endif
- 
-
diff --git a/patches/gwenhywfar-4.99.16-clean.patch b/patches/gwenhywfar-4.99.16-clean.patch
deleted file mode 100644
index 6dc7a1b..0000000
--- a/patches/gwenhywfar-4.99.16-clean.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2019-09-20 11:59:23.000000000 -0700
-+++ b/Makefile.in	2019-09-22 12:31:05.662210400 -0700
-@@ -1212,7 +1212,7 @@
- clean-local: clean-local-check
- .PHONY: clean-local
- clean-local-check:
--	rm -rf apidoc gwenhywfar5
-+	rm -rf apidoc
- 
- listdoc.h: $(top_builddir)/admin/mklistdoc
- 	admin/mklistdoc -v -I $(top_srcdir)/src/base `find "$(top_builddir)/gwenhywfar5/gwenhywfar" -name "*.h" | LC_ALL=C sort` >listdoc.h
diff --git a/patches/gwenhywfar-4.99.16-decl.patch b/patches/gwenhywfar-4.99.16-decl.patch
deleted file mode 100644
index 6ba60d3..0000000
--- a/patches/gwenhywfar-4.99.16-decl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/sio/syncio_tls.c	2019-09-20 11:59:23.000000000 -0700
-+++ b/src/sio/syncio_tls.c	2019-09-21 18:12:03.751296700 -0700
-@@ -123,7 +123,9 @@
- 
- 
- 
--int GWEN_SyncIo_Tls_Internal_CheckCert(GWEN_SYNCIO *sio, const GWEN_SSLCERTDESCR *cert)
-+GWENHYWFAR_CB int
-+GWEN_SyncIo_Tls_Internal_CheckCert(GWEN_SYNCIO *sio,
-+				       const GWEN_SSLCERTDESCR *cert)
- {
-   GWEN_SYNCIO_TLS *xio;
- 

commit 681c606773e9eb15971415487f3fdc4eabe54e77
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Sep 25 16:39:16 2019 +0200

    Revert back to wrapping rsync in a bash shell
    
    Directly invoking rsync in powershell gives an odd remote error
    (null) unknown option

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 198c010..ffd15e0 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -148,6 +148,6 @@ Write-Output "Build Ended $time_stamp" | Tee-Object -FilePath $log_file -Append
 if ($hostname) {
     bash.exe -lc "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch 2>&1"
     if ($new_file) {
-        rsync.exe -e ssh -a "$setup_file $hostname/$branch" 2>&1
+        bash.exe -lc "rsync.exe -e ssh -a $setup_file $hostname/$branch 2>&1"
     }
 }



Summary of changes:
 buildserver/build_package.ps1                |  2 +-
 patches/aqbanking-5.99.33beta-mconsole.patch | 24 ------------------------
 patches/gwenhywfar-4.99.16-clean.patch       | 11 -----------
 patches/gwenhywfar-4.99.16-decl.patch        | 13 -------------
 4 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 patches/aqbanking-5.99.33beta-mconsole.patch
 delete mode 100644 patches/gwenhywfar-4.99.16-clean.patch
 delete mode 100644 patches/gwenhywfar-4.99.16-decl.patch



More information about the gnucash-changes mailing list