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
This commit is contained in:
Geert Janssens 2014-01-18 15:09:52 +00:00
parent 2d97811265
commit e48381ecf9
13 changed files with 3 additions and 26 deletions

View File

@ -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 $@ $<

View File

@ -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 $@ $<

View File

@ -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

View File

@ -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} \

View File

@ -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 \

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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 \

View File

@ -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) \