gnucash-on-windows master: Update xmlsec patch to upstream's preferred solution

Geert Janssens gjanssens at code.gnucash.org
Thu Apr 16 03:30:32 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/4d106a20 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/a702c901 (commit)



commit 4d106a204bda1ffc281f81f937374f9184e29eb7
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Apr 16 09:30:24 2020 +0200

    Update xmlsec patch to upstream's preferred solution

diff --git a/patches/xmlsec-make-clean.patch b/patches/xmlsec-make-clean.patch
index 26efee2..3011fcf 100644
--- a/patches/xmlsec-make-clean.patch
+++ b/patches/xmlsec-make-clean.patch
@@ -1,16 +1,45 @@
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index a89ba76c..4b196026 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -27,9 +27,9 @@ docs-copy:
+ 		if [ z"$(srcdir)" != z"$(builddir)" -a z"`uname`" != z"Darwin" ]; \
+ 		then \
+ 		    $(CP) -ru $(srcdir)/*.html $(srcdir)/*.ico $(srcdir)/images $(builddir)/  ; \
+-		    chmod u+w $(builddir)/*.html ; \
+-		    chmod u+w $(builddir)/*.ico ; \
+-		    chmod -R u+w $(builddir)/images ; \
++		    (chmod u+w $(builddir)/*.html || true) ; \
++		    (chmod u+w $(builddir)/*.ico || true) ; \
++		    (chmod -R u+w $(builddir)/images || true) ; \
+ 		fi \
+ 	)
+ 
+@@ -94,8 +94,8 @@ endif
+ clean-local:
+ 	-rm -f *.stamp
+ 	( if [ z"$(srcdir)" != z"$(builddir)" ] ; then \
+-		chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
+-		chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
++		(chmod -R u+w $(builddir)/images || true) && rm -rf $(builddir)/images ; \
++		(chmod -R u+w $(builddir)/src || true) && rm -rf $(builddir)/src ; \
+ 		(for i in `find $(builddir) -name "*.html" -print` ; do \
+ 			echo "Removing files '$$i' ... " ; \
+ 			chmod -R u+w $$i && rm -f $$i ; \
 diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
-index a1ffd3a7..e88ea929 100644
+index a1ffd3a7..dcf093d1 100644
 --- a/docs/api/Makefile.am
 +++ b/docs/api/Makefile.am
-@@ -268,9 +268,8 @@ clean-local:
+@@ -268,9 +268,9 @@ clean-local:
  	-rm -rf $(SOURCE_CODE_DIR) $(EXAMPLES_DIR) $(SCAN_DIR)/*.txt $(SGML_DIR) $(GTKDOC_MKDB_OUTPUT_DIR)
  	-rm -f *.stamp *.types index.sgml
  	@( if [ z"$(builddir)" != z"$(srcdir)" ] ; then \
 -    	chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
 -    	chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
 -    	chmod -R u+w $(builddir)/*.png && rm -rf $(builddir)/*.png ; \
-+	find $(builddir) -name 'src' -o -name 'images' -o -name '*.png' -exec chmod u+w '{}' ';' ; \
-+	rm -rf $(builddir)/src $(builddir)/images $(builddir)/*.png ; \
++    	(chmod -R u+w $(builddir)/src || true) && rm -rf $(builddir)/src ; \
++    	(chmod -R u+w $(builddir)/images || true) && rm -rf $(builddir)/images ; \
++    	(chmod -R u+w $(builddir)/*.png || true) && rm -rf $(builddir)/*.png ; \
  	 fi ; )
  
  distclean-local: clean-local



Summary of changes:
 patches/xmlsec-make-clean.patch | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list