r23702 - gnucash/trunk/src - Bug 721600 - Segmentation fault on startup if report Income/Expense Chart was opened since last running
Geert Janssens
gjanssens at code.gnucash.org
Sat Jan 18 10:09:52 EST 2014
Author: gjanssens
Date: 2014-01-18 10:09:52 -0500 (Sat, 18 Jan 2014)
New Revision: 23702
Trac: http://svn.gnucash.org/trac/changeset/23702
Modified:
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/core-utils/Makefile.am
gnucash/trunk/src/engine/Makefile.am
gnucash/trunk/src/gnc-module/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/html/Makefile.am
gnucash/trunk/src/report/report-gnome/Makefile.am
gnucash/trunk/src/report/report-system/Makefile.am
gnucash/trunk/src/test-core/Makefile.am
Log:
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
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/app-utils/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -109,11 +109,10 @@
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 $@ $<
Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/core-utils/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -46,11 +46,10 @@
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 $@ $<
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/engine/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -205,12 +205,11 @@
$(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
-chmod u+x ./iso-currencies-to-c
Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/gnc-module/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -33,12 +33,10 @@
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} \
Modified: gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -25,12 +25,10 @@
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 \
Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -29,12 +29,10 @@
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 \
Modified: gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -30,12 +30,10 @@
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
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/gnome/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -115,12 +115,10 @@
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 \
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -228,12 +228,10 @@
${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
Modified: gnucash/trunk/src/html/Makefile.am
===================================================================
--- gnucash/trunk/src/html/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/html/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -59,12 +59,10 @@
${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
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -53,12 +53,10 @@
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
Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/report/report-system/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -25,12 +25,10 @@
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 \
Modified: gnucash/trunk/src/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/test-core/Makefile.am 2014-01-17 00:26:12 UTC (rev 23701)
+++ gnucash/trunk/src/test-core/Makefile.am 2014-01-18 15:09:52 UTC (rev 23702)
@@ -28,11 +28,9 @@
$(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) \
More information about the gnucash-changes
mailing list