gnucash-on-osx master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Fri Jun 18 19:04:57 EDT 2021
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/768568a2 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/9be40e1d (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/eb9dbff4 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/8a52c4b6 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/83428a56 (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/c7954305 (commit)
commit 768568a287ebcd1c69f23a9e57c052f35e432845
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 18 16:04:23 2021 -0700
Remove no longer used patches
diff --git a/patches/aqbanking-aqhbci-la.patch b/patches/aqbanking-aqhbci-la.patch
deleted file mode 100644
index 8c91677..0000000
--- a/patches/aqbanking-aqhbci-la.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/plugins/backends/aqhbci/plugin/Makefile.am 2019-08-12 07:55:34.000000000 -0700
-+++ b/src/plugins/backends/aqhbci/plugin/Makefile.am 2019-08-20 11:32:32.000000000 -0700
-@@ -74,7 +74,7 @@
-
- testlib_SOURCES=testlib.c
- testlib_LDADD = \
-- $(aqhbci_internal_libs) \
-+ libaqhbci.la \
- $(aqbanking_internal_libs) \
- $(gwenhywfar_libs)
-
---- a/src/plugins/backends/aqhbci/plugin/Makefile.in 2019-08-20 11:15:07.000000000 -0700
-+++ b/src/plugins/backends/aqhbci/plugin/Makefile.in 2019-08-20 13:45:07.000000000 -0700
-@@ -170,7 +170,7 @@
- libaqhbciplugin_la_OBJECTS = $(am_libaqhbciplugin_la_OBJECTS)
- am_testlib_OBJECTS = testlib.$(OBJEXT)
- testlib_OBJECTS = $(am_testlib_OBJECTS)
--testlib_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+testlib_DEPENDENCIES = libaqhbci.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- AM_V_P = $(am__v_P_ at AM_V@)
- am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
-@@ -617,7 +617,7 @@
- aqhbci_la_LDFLAGS = -no-undefined -module -avoid-version
- testlib_SOURCES = testlib.c
- testlib_LDADD = \
-- $(aqhbci_internal_libs) \
-+ libaqhbci.la \
- $(aqbanking_internal_libs) \
- $(gwenhywfar_libs)
-
diff --git a/patches/dbi-drv.patch b/patches/dbi-drv.patch
deleted file mode 100644
index 016b0ef..0000000
--- a/patches/dbi-drv.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.in 2013-09-30 22:43:48.000000000 -0700
-+++ b/configure.in 2013-08-03 09:14:47.000000000 -0700
-@@ -3,7 +3,7 @@
- AM_MAINTAINER_MODE
-
- AM_INIT_AUTOMAKE(libdbi-drivers, 0.8.3-1)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_LIBTOOL_WIN32_DLL
-
- dnl library versioning currently unnecessary...
-@@ -63,6 +63,8 @@
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
-+ *-*-darwin*)
-+ ;;
- *)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-
diff --git a/patches/libdbi-fix-cflags.patch b/patches/libdbi-fix-cflags.patch
deleted file mode 100644
index a384821..0000000
--- a/patches/libdbi-fix-cflags.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/configure.in Tue Aug 31 15:35:12 2010
-+++ b/configure.in Mon Oct 13 10:29:50 2014
-@@ -3,7 +3,7 @@
- AM_MAINTAINER_MODE
-
- AM_INIT_AUTOMAKE(libdbi, 0.8.4)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR([m4])
-
- dnl Library versioning
-@@ -47,9 +47,9 @@
- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
- *)
-- DEBUG="-g"
-- CFLAGS="-O"
-- PROFILE="-g -p" ;;
-+ DEBUG="$CFLAGS -g"
-+ CFLAGS="$CFLAGS -O"
-+ PROFILE="$CFLAGS -g -p" ;;
- esac
- else
-
-@@ -63,9 +63,9 @@
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" ;;
- *)
-- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
-- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
-- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char -std=gnu99" ;;
-+ DEBUG="$CFLAGS -g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
-+ CFLAGS="$CFLAGS -O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
-+ PROFILE="$CFLAGS -O20 -g -pg -D__NO_MATH_INLINES -fsigned-char -std=gnu99" ;;
- esac
- fi
-
-
-Diff finished. Mon Oct 13 10:30:08 2014
diff --git a/patches/libmysql.patch b/patches/libmysql.patch
deleted file mode 100644
index 2fa969a..0000000
--- a/patches/libmysql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt-org 2010-04-23 23:46:39.000000000 +0200
-+++ CMakeLists.txt 2010-04-23 23:47:06.000000000 +0200
-@@ -318,7 +318,7 @@
- ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-
- INSTALL(DIRECTORY "include/"
-- DESTINATION "include"
-+ DESTINATION "include/mysql"
- FILES_MATCHING PATTERN "*.h")
-
- # ----------------------------------------------------------------------
diff --git a/patches/pgsql-find-int64.patch b/patches/pgsql-find-int64.patch
deleted file mode 100644
index b143985..0000000
--- a/patches/pgsql-find-int64.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -u /Users/john/Development/Gnucash-Build/Gnucash-3/src/postgresql-9.6.17/configure\~ /Users/john/Development/Gnucash-Build/Gnucash-3/src/postgresql-9.6.17/configure
---- a/configure 2020-02-10 14:21:38.000000000 -0800
-+++ b/configure 2020-03-06 17:00:56.000000000 -0800
-@@ -13930,6 +13930,7 @@
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-+#include <stdlib.h>
- typedef long long int ac_int64;
-
- /*
-@@ -13939,7 +13940,7 @@
- ac_int64 a = 20000001;
- ac_int64 b = 40000005;
-
--int does_int64_work()
-+static int does_int64_work()
- {
- ac_int64 c,d;
-
-@@ -13953,7 +13954,7 @@
- return 0;
- return 1;
- }
--main() {
-+int main() {
- exit(! does_int64_work());
- }
- _ACEOF
-
-Diff finished. Sat Mar 7 11:17:19 2020
diff --git a/patches/swift940-strndup.patch b/patches/swift940-strndup.patch
deleted file mode 100644
index a63ae85..0000000
--- a/patches/swift940-strndup.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/src/plugins/parsers/swift/swift940.c 2015-06-01 10:16:28.000000000 -0700
-+++ b/src/plugins/parsers/swift/swift940.c 2016-06-20 16:45:18.000000000 -0700
-@@ -31,9 +31,20 @@
-
-
- /* #define ENABLE_FULL_SEPA_LOG */
-+#ifndef HAVE_STRNDUP
-+inline char* strndup_impl(char* instr, size_t len)
-+{
-+ char *outstr = malloc(len +1);
-+ if (outstr)
-+ {
-+ memset(outstr, 0, len);
-+ memcpy(outstr, instr, len);
-+ }
-+ return outstr;
-+}
-
--
--
-+#define strndup(str, len) strndup_impl(str, len)
-+#endif
- #define CENTURY_CUTOFF_YEAR 79
-
-
-@@ -266,7 +277,7 @@
-
- /* found begin of the next SEPA field or end of buffer */
- if (s > sLastTagStart) {
-- int tagLen;
-+ size_t tagLen;
-
- /* we currently have a field, close that first */
- tagLen=s-sLastTagStart;
---- a/configure.ac 2016-04-23 09:29:09.000000000 -0700
-+++ b/configure.ac 2016-06-20 16:48:10.000000000 -0700
-@@ -384,7 +384,7 @@
- # Checks for library functions.
- #
- AC_FUNC_STRFTIME
--AC_CHECK_FUNCS([memmove memset strcasecmp strdup strerror snprintf])
-+AC_CHECK_FUNCS([memmove memset strcasecmp strdup strndup strerror snprintf])
- AC_CHECK_FUNCS([setlocale])
-
-
commit 9be40e1d897d5e48309bc95ddf23775aef5ab3f8
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 18 15:56:28 2021 -0700
Remove URL part of patch file attributes.
Inspired by https://gitlab.gnome.org/GNOME/gtk-osx/-/issues/39,
it's not necessary and makes the patches folder more maintainable
because a local checkout will use the local patches associated with
the current commit.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f1cb92d..559018d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -42,8 +42,8 @@
<autotools id="libchipcard" autogen-sh="autoreconf" autogenargs="--enable-local-install">
<branch module="229/libchipcard-5.1.5rc2.tar.gz" version="5.1.5rc2"
repo="aqbanking">
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libchipcard-sdk.patch" strip="1"/>
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libchipcard-include.patch" strip="1"/>
+ <patch file="libchipcard-sdk.patch" strip="1"/>
+ <patch file="libchipcard-include.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libgcrypt"/>
@@ -55,8 +55,8 @@
autogenargs="--with-guis='gtk3' --enable-local-install">
<branch module="364/gwenhywfar-5.6.0.tar.gz" version="5.6.0"
repo="aqbanking" >
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-include-file.patch" strip="1"/>
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip="1"/>
+ <patch file="gwen-include-file.patch" strip="1"/>
+ <patch file="gwen-macos-bundle-path.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libgcrypt"/>
@@ -127,7 +127,7 @@
autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'>
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/OpenSP-AC_CONFIG_HEADERS.patch" strip='0'/>
+ <patch file="OpenSP-AC_CONFIG_HEADERS.patch" strip='0'/>
</branch>
</autotools>
@@ -186,7 +186,7 @@
autogenargs='--with-mysql --with-mysql-libdir=$PREFIX/lib --with-pgsql --with-sqlite3 --disable-docs --disable-dependency-tracking'>
<branch repo="sourceforge" version="0.9.0"
module="libdbi-drivers/libdbi-drivers-0.9.0.tar.gz">
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libdbi-drivers-cgreen-include.patch" strip="1"/>
+ <patch file="libdbi-drivers-cgreen-include.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libdbi"/>
@@ -214,7 +214,7 @@
<autotools id="goffice" autogen-sh="configure">
<branch module="goffice/0.8/goffice-0.8.17.tar.xz" version="0.8.17"
hash="sha256:165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15">
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/goffice-gsize.patch" strip="1"/>
+ <patch file="goffice-gsize.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gtk+"/>
@@ -226,7 +226,7 @@
<cmake id="boost" cmakeargs="-DLIBRARIES='date_time;regex;locale;filesystem;program_options'">
<branch module="1.73.0/source/boost_1_73_0.tar.bz2" version="1.73.0"
repo="bintray">
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/boost-cmake.patch" strip="1"/>
+ <patch file="boost-cmake.patch" strip="1"/>
</branch>
<after>
<dep package="icu"/>
@@ -248,7 +248,7 @@
<autotools id="guile22" autogen-sh="configure">
<branch repo="ftp.gnu.org" module="guile/guile-2.2.7.tar.gz"
version="2.2.7">
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/guile-2.2-libguile-Makefile-fixups.patch" strip="1"/>
+ <patch file="guile-2.2-libguile-Makefile-fixups.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libunistring"/>
commit eb9dbff49d2622208a869302160434517bcbf969
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 18 14:51:02 2021 -0700
Patch cmakefiles.txt error in mysql-connector-6.1.11.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index d1fd3c3..f1cb92d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -168,7 +168,8 @@
libdbd-mysql can't use it. -->
<cmake id="mysql">
<branch repo="csclub" module="Connector-C/mysql-connector-c-6.1.11-src.tar.gz"
- version="6.1.11" >
+ version="6.1.11" >
+ <patch file="mysql-connector-6.1.11-cmake.patch" strip="1"/>
</branch>
<dependencies>
<dep package="cmake"/>
diff --git a/patches/mysql-connector-6.1.11-cmake.patch b/patches/mysql-connector-6.1.11-cmake.patch
new file mode 100644
index 0000000..c38041b
--- /dev/null
+++ b/patches/mysql-connector-6.1.11-cmake.patch
@@ -0,0 +1,16 @@
+diff -u /Users/john/Development/Gnucash-Build/Gnucash-4-10.13-x86_64/src/mysql-connector-c-6.1.11-src/cmake/install_macros.cmake\~ /Users/john/Development/Gnucash-Build/Gnucash-4-10.13-x86_64/src/mysql-connector-c-6.1.11-src/cmake/install_macros.cmake
+--- a/cmake/install_macros.cmake 2017-07-12 23:55:32.000000000 -0700
++++ b/cmake/install_macros.cmake 2021-06-17 12:03:41.000000000 -0700
+@@ -362,8 +362,8 @@
+ CONFIGURATIONS Release RelWithDebInfo
+ COMPONENT ${ARG_COMPONENT}
+ OPTIONAL)
+- ENDIF()
+- ENDFOREACH()
++ ENDFOREACH()
++ ENDIF()
+
+ ENDFUNCTION()
+
+
+Diff finished. Thu Jun 17 12:03:59 2021
commit 8a52c4b6d065be933c05c36e46124a51f4daf859
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 18 14:50:19 2021 -0700
Add modules for guile dependencies removed from gtk-osx.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index bf2fd13..d1fd3c3 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -25,6 +25,8 @@
href="https://git.aquamaniac.de/git/"/>
<repository type="tarball" name="aqbanking"
href="https://www.aquamaniac.de/rdm/attachments/download/"/>
+ <repository type="tarball" name="github-tarball"
+ href="https://github.com/"/>
<repository type="git" name="github"
href="git://github.com/"/>
<repository type="tarball" name="openssl"
@@ -230,6 +232,18 @@
</after>
</cmake>
+ <autotools id="bdw-gc" autogen-sh="configure">
+ <branch repo="github-tarball"
+ module="ivmai/bdwgc/releases/download/v8.0.4/gc-8.0.4.tar.gz"
+ version="8.0.4"/>
+ </autotools>
+
+<autotools id="libunistring" autogen-sh="configure">
+ <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.10.tar.gz"
+ version="0.9.10">
+ </branch>
+ </autotools>
+
<autotools id="guile22" autogen-sh="configure">
<branch repo="ftp.gnu.org" module="guile/guile-2.2.7.tar.gz"
version="2.2.7">
commit 83428a56485d2703b742f0a29c812f83e60d4ce5
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jun 18 14:49:26 2021 -0700
Remove dependencies on modules no longer provided by gtk-osx.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index aa33d41..bf2fd13 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -59,11 +59,8 @@
<dependencies>
<dep package="libgcrypt"/>
<dep package="gnutls"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-core"/>
<dep package="meta-gtk-osx-gtk3"/>
- </after>
+ </dependencies>
</autotools>
<autotools id="gwenhywfar-git" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
@@ -230,7 +227,6 @@
</branch>
<after>
<dep package="icu"/>
- <dep package="icu55"/>
</after>
</cmake>
Summary of changes:
modulesets/gnucash.modules | 41 +++++++++++++++++----------
patches/aqbanking-aqhbci-la.patch | 31 --------------------
patches/dbi-drv.patch | 21 --------------
patches/libdbi-fix-cflags.patch | 39 --------------------------
patches/libmysql.patch | 11 --------
patches/mysql-connector-6.1.11-cmake.patch | 16 +++++++++++
patches/pgsql-find-int64.patch | 31 --------------------
patches/swift940-strndup.patch | 45 ------------------------------
8 files changed, 42 insertions(+), 193 deletions(-)
delete mode 100644 patches/aqbanking-aqhbci-la.patch
delete mode 100644 patches/dbi-drv.patch
delete mode 100644 patches/libdbi-fix-cflags.patch
delete mode 100644 patches/libmysql.patch
create mode 100644 patches/mysql-connector-6.1.11-cmake.patch
delete mode 100644 patches/pgsql-find-int64.patch
delete mode 100644 patches/swift940-strndup.patch
More information about the gnucash-changes
mailing list