[gnucash] Further guile fixes.

[Bill Nottingham]

commit cacd2793af9e0c60ac00112a4f90cf9b63815ac7
Author: Bill Nottingham <notting at redhat.com>
Date:   Mon Jun 13 14:40:17 2011 -0400

    Further guile fixes.

 gnucash-guile-7.patch |   24 ------------------------
 gnucash.spec          |    7 +++++++
 2 files changed, 7 insertions(+), 24 deletions(-)
---
diff --git a/gnucash-guile-7.patch b/gnucash-guile-7.patch
index 01560b7..6071125 100644
--- a/gnucash-guile-7.patch
+++ b/gnucash-guile-7.patch
@@ -10,30 +10,6 @@ diff -up gnucash-2.4.5/configure.ac.foo gnucash-2.4.5/configure.ac
  AC_SUBST(GUILE_LIBS)
  AC_SUBST(GUILE)
  
-diff -up gnucash-2.4.5/src/app-utils/swig-app-utils.c.foo gnucash-2.4.5/src/app-utils/swig-app-utils.c
---- gnucash-2.4.5/src/app-utils/swig-app-utils.c.foo	2011-05-13 15:01:34.224685492 -0400
-+++ gnucash-2.4.5/src/app-utils/swig-app-utils.c	2011-05-13 15:01:48.607685496 -0400
-@@ -1921,7 +1921,7 @@ _wrap_gnc_spawn_process_async (SCM s_0, 
-       break;
-       key = scm_to_locale_string (key_scm);
-       gkey = g_strdup (key);
--      gnc_free_scm_locale_string(key);
-+      free (key);
-       path = g_list_prepend (path, gkey);
-       path_scm = SCM_CDR (path_scm);
-     }
-diff -up gnucash-2.4.5/src/engine/swig-engine.c.foo gnucash-2.4.5/src/engine/swig-engine.c
---- gnucash-2.4.5/src/engine/swig-engine.c.foo	2011-05-13 15:00:42.455685474 -0400
-+++ gnucash-2.4.5/src/engine/swig-engine.c	2011-05-13 15:00:57.522685478 -0400
-@@ -18489,7 +18489,7 @@ _wrap_gnc_quote_source_set_fq_installed 
-       
-       key = scm_to_locale_string (key_scm);
-       gkey = g_strdup (key);
--      gnc_free_scm_locale_string(key);
-+      free(key);
-       
-       path = g_list_prepend (path, gkey);
-       
 diff -up gnucash-2.4.5/src/import-export/aqbanking/Makefile.in.foo gnucash-2.4.5/src/import-export/aqbanking/Makefile.in
 --- gnucash-2.4.5/src/import-export/aqbanking/Makefile.in.foo	2011-05-13 14:51:07.793685262 -0400
 +++ gnucash-2.4.5/src/import-export/aqbanking/Makefile.in	2011-05-13 14:51:57.459685276 -0400
diff --git a/gnucash.spec b/gnucash.spec
index ada0320..bacafd9 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -8,6 +8,7 @@ Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/unstable/2.3.x/gnucash-%{version}.tar.bz2
+Source2: engine-common.i
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: webkitgtk-devel, libxml2 >= 2.5.10, zlib-devel
 BuildRequires: libgsf-devel >= 1.12.2, goffice-devel, swig
@@ -29,6 +30,9 @@ Patch107: gnucash-guile-7.patch
 Patch108: gnucash-guile-8.patch
 Patch109: gnucash-guile-9.patch
 
+# build noise
+Patch150: gnucash-notsvn.patch
+
 Requires: gnucash-docs >= 2.2.0
 Requires: perl(Finance::Quote)
 %if 0%{?fedora} <= 14 && 0%{?rhel} <= 6
@@ -60,9 +64,12 @@ balanced books.
 %patch107 -p1
 %patch108 -p1
 %patch109 -p1
+%patch150 -p1
+cp %{SOURCE2} src/engine
 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \;
 
 %build
+export BUILDING_FROM_SVN=yes
 autoreconf
 %configure  --enable-error-on-warning=no \
 	--enable-ofx \