From e48381ecf90b557b96f6b6a619e3c3e379cfc7a8 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 18 Jan 2014 15:09:52 +0000 Subject: [PATCH] Bug 721600 - Segmentation fault on startup if report Income/Expense Chart was opened since last running This bug is a continuation of bug 719481. The fix for that bug wouldn't trickle down into the release tarballs because the needed patch would only be applied if the tarball were generated against guile 2. This commit fixes this by applying that patch unconditionally git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23702 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/app-utils/Makefile.am | 3 +-- src/core-utils/Makefile.am | 3 +-- src/engine/Makefile.am | 3 +-- src/gnc-module/Makefile.am | 2 -- src/gnc-module/test/mod-bar/Makefile.am | 2 -- src/gnc-module/test/mod-baz/Makefile.am | 2 -- src/gnc-module/test/mod-foo/Makefile.am | 2 -- src/gnome-utils/Makefile.am | 2 -- src/gnome/Makefile.am | 2 -- src/html/Makefile.am | 2 -- src/report/report-gnome/Makefile.am | 2 -- src/report/report-system/Makefile.am | 2 -- src/test-core/Makefile.am | 2 -- 13 files changed, 3 insertions(+), 26 deletions(-) diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am index 71ba5afb72..6bf39e44ad 100644 --- a/src/app-utils/Makefile.am +++ b/src/app-utils/Makefile.am @@ -109,11 +109,10 @@ if BUILDING_FROM_SCM swig-app-utils-guile.c: app-utils.i ${top_srcdir}/src/base-typemaps.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi -endif + swig-app-utils-python.c: app-utils.i ${top_srcdir}/src/base-typemaps.i $(SWIG) -python -Wall -Werror $(SWIG_ARGS) \ -I${top_srcdir}/src -o $@ $< diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am index 4fdb6ec2d2..0fa0d52df5 100644 --- a/src/core-utils/Makefile.am +++ b/src/core-utils/Makefile.am @@ -46,11 +46,10 @@ if BUILDING_FROM_SCM swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi -endif + swig-core-utils-python.c: core-utils.i ${top_srcdir}/src/base-typemaps.i $(SWIG) -python -Wall -Werror $(SWIG_ARGS) \ -I${top_srcdir}/src -o $@ $< diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index 0bff4b872b..6f101d7837 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -205,11 +205,10 @@ swig-engine.c: engine.i $(top_srcdir)/src/base-typemaps.i \ $(gncinclude_HEADERS) $(noinst_HEADERS) $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src/libqof/qof -I${top_srcdir}/src -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi -endif + endif iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am index 5a24af7745..01d93cfad6 100644 --- a/src/gnc-module/Makefile.am +++ b/src/gnc-module/Makefile.am @@ -33,12 +33,10 @@ if BUILDING_FROM_SCM swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi endif -endif EXTRA_DIST = \ ${gncmod_DATA} \ diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/src/gnc-module/test/mod-bar/Makefile.am index 17756d556e..5b0d633224 100644 --- a/src/gnc-module/test/mod-bar/Makefile.am +++ b/src/gnc-module/test/mod-bar/Makefile.am @@ -25,12 +25,10 @@ libgncmodbar_la_LIBADD=libbar.la \ if BUILDING_FROM_SCM swig-bar.c: bar.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi endif -endif EXTRA_DIST = \ bar.i \ diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/src/gnc-module/test/mod-baz/Makefile.am index fde34f7b1a..ef571cc2cf 100644 --- a/src/gnc-module/test/mod-baz/Makefile.am +++ b/src/gnc-module/test/mod-baz/Makefile.am @@ -29,12 +29,10 @@ libgncmodbaz_la_LIBADD = \ if BUILDING_FROM_SCM swig-baz.c: baz.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi endif -endif EXTRA_DIST = \ baz.i \ diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/src/gnc-module/test/mod-foo/Makefile.am index 5254f45fc2..49972db725 100644 --- a/src/gnc-module/test/mod-foo/Makefile.am +++ b/src/gnc-module/test/mod-foo/Makefile.am @@ -30,12 +30,10 @@ EXTRA_DIST = \ if BUILDING_FROM_SCM swig-foo.c: foo.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi endif -endif BUILT_SOURCES = swig-foo.c MAINTAINERCLEANFILES = swig-foo.c diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am index fd81993413..65b24853b3 100644 --- a/src/gnome-utils/Makefile.am +++ b/src/gnome-utils/Makefile.am @@ -228,12 +228,10 @@ swig-gnome-utils.c: gnome-utils.i \ ${top_srcdir}/src/base-typemaps.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi endif -endif gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncmod_DATA = gnome-utils.scm diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am index 365e75b82e..906f212bb5 100644 --- a/src/gnome/Makefile.am +++ b/src/gnome/Makefile.am @@ -115,12 +115,10 @@ if BUILDING_FROM_SCM swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi endif -endif EXTRA_DIST = \ gnome.i \ diff --git a/src/html/Makefile.am b/src/html/Makefile.am index b3c42678b2..c27b555464 100644 --- a/src/html/Makefile.am +++ b/src/html/Makefile.am @@ -59,12 +59,10 @@ swig-gnc-html.c: gnc-html.i gnc-html.h \ ${top_srcdir}/src/base-typemaps.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi endif -endif EXTRA_DIST = \ gnc-html.i diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am index 05282384d7..04fc6e9f04 100644 --- a/src/report/report-gnome/Makefile.am +++ b/src/report/report-gnome/Makefile.am @@ -53,12 +53,10 @@ if BUILDING_FROM_SCM swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi endif -endif gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report gncmod_DATA = report-gnome.scm diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am index b3c3b893c7..952555e4ca 100644 --- a/src/report/report-system/Makefile.am +++ b/src/report/report-system/Makefile.am @@ -25,12 +25,10 @@ if BUILDING_FROM_SCM swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi endif -endif AM_CPPFLAGS = \ -I${top_srcdir}/src \ diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am index ef41ec83b0..f9d2a8bef7 100644 --- a/src/test-core/Makefile.am +++ b/src/test-core/Makefile.am @@ -28,11 +28,9 @@ swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/src/base-typemap $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ -I${top_srcdir}/src \ ${AM_CPPFLAGS} -o $@ $< -if GNC_HAVE_GUILE_2 if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ patch $@ $(top_srcdir)/src/swig-utf8.patch; \ fi -endif swig-unittest-support-python.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i $(SWIG) -python -Wall -Werror $(SWIG_ARGS) \