gnucash-on-windows master: Fix Makefile formatting in opensp-1.5.2.patch

John Ralls jralls at code.gnucash.org
Tue Jan 11 14:31:46 EST 2022


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/2e786c27 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/11a04ce2 (commit)



commit 2e786c2764f21d65b130c7bfe9eada4a364bb735
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 11 11:31:27 2022 -0800

    Fix Makefile formatting in opensp-1.5.2.patch

diff --git a/patches/opensp-1.5.2.patch b/patches/opensp-1.5.2.patch
index a42665f..5079df1 100644
--- a/patches/opensp-1.5.2.patch
+++ b/patches/opensp-1.5.2.patch
@@ -15,12 +15,12 @@
 +++ b/lib/MessageReporter.cxx     2017-05-06 11:51:04.348011200 -0700
 @@ -13,7 +13,8 @@
  #include "macros.h"
-
+ 
  #include <string.h>
 -
 +#include <iostream>
 +#include <sstream>
-
+ 
  #ifdef SP_NAMESPACE
  namespace SP_NAMESPACE {
 @@ -123,8 +124,12 @@
@@ -42,19 +42,19 @@
 @@ -46,6 +46,9 @@
  /* Define if the GNU gettext() function is already present or preinstalled. */
  #undef HAVE_GETTEXT
-
+ 
 +/* Define if you have the iconv() function and it works. */
 +#undef HAVE_ICONV
 +
  /* define if the compiler supports explicit instantiations */
  #undef HAVE_INSTANTIATIONS
-
+ 
 --- a/configure.in       2005-12-23 06:15:21.000000000 -0800
 +++ b/configure.in        2022-01-09 10:51:18.494840900 -0800
 @@ -238,7 +238,7 @@
  dnl Checks for libraries.
  AC_CHECK_LIB(pthread,pthread_create,,AC_CHECK_LIB(threads,cthread_fork))
-
+ 
 -AM_GNU_GETTEXT
 +AM_GNU_GETTEXT([external])
  AM_GNU_GETTEXT_VERSION([0.14.5])
@@ -63,12 +63,13 @@
 --- a/Makefile.am        2005-12-23 06:14:27.000000000 -0800
 +++ b/Makefile.am 2022-01-09 10:52:48.907191300 -0800
 @@ -4,7 +4,7 @@
-
+ 
  SUBDIRS = pubtext unicode doc \
-        include generic \
--       intl po \
-+       po \
-        lib nsgmls spent spam sgmlnorm sx spcat \
-        tests @DOCSRC@
+ 	include generic \
+-	intl po \
++	po \
+ 	lib nsgmls spent spam sgmlnorm sx spcat \
+ 	tests @DOCSRC@
+ 
 
 



Summary of changes:
 patches/opensp-1.5.2.patch | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)



More information about the gnucash-changes mailing list