From a3e7b33b902e760f0a56925ddf0223ee77c53a6c Mon Sep 17 00:00:00 2001
From: sgtell <sgtell@9168a026-1b44-0410-911b-d774ca5fe8d3>
Date: Thu, 12 Feb 2009 05:25:10 +0000
Subject: [PATCH] add g-wrap patch and discussion of it in INSTALL
 instructions.

git-svn-id: http://gwave.svn.sourceforge.net/svnroot/gwave/branches/guile-gnome-platform-branch@235 9168a026-1b44-0410-911b-d774ca5fe8d3
---
 INSTALL                       | 13 +++++++++++--
 NEWS                          |  7 +++++++
 g-wrap-1.9.11.pkgconfig.patch | 15 +++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 g-wrap-1.9.11.pkgconfig.patch

diff --git a/INSTALL b/INSTALL
index a60dfd3..69e8ea2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@
 Some installation notes for gwave2, a version of gwave using the Gtk2
 toolkit by way of guile-gnome-platform.
 
-Updated Jan 2009
+Updated Feb 2009
 
 Prerequesites:
 	Guile	version 1.8 (http://www.gnu.org/software/guile/guile.html)
@@ -24,7 +24,7 @@ Fedora 8
 	gtk2-2.12.8-2.fc8		(Standard with F8+updates)
 
 	guile-1.8.5-1sgt
-	g-wrap-1.9.11-1sgt
+	g-wrap-1.9.11-1sgt  (with g-wrap-1.9.11.pkgconfig.patch)
 	guile-gnome-platform-2.16.1-1sgt
 
 	(Note that in order to build from source, you also need the -devel 
@@ -56,6 +56,15 @@ without installing all of gnome, so long as the Gtk2 (gnome toolkit)
 is installed.  All that GWave requires is the Gtk2 portions of
 guile-gnome-platform.
 
+
+Guile-gnome-platform requires g-wrap.  G-wrap version 1.9.11 often requires
+applying the enclosed patchfile, g-wrap-1.9.11.pkgconfig.patch . 
+Without the patch, I find that guile-gnome-platform fails to build because
+of a defective pkgconfig file installed by g-wrap.
+The error message is somthing like
+ gcc: @LIBFFI_CFLAGS_INSTALLED@: No such file or directory
+
+
 ----
 
 
diff --git a/NEWS b/NEWS
index 6328a8c..20c96db 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 Gwave NEWS --- history of user-visible changes.  -*- text -*-
 
+New in 20090211
+- Fix warnings related to GtkTooltips 
+- fix reading of ascii spice3 rawfiles containing blank lines, like those 
+generated by ngspice
+- add patchfile and explanation sometimes needed when building g-wrap
+- applied submitted patch that fixes some gcc return-type warnings
+
 New in 20090124
 - minor fixes adaptating for stable guile-gnome-platform-2.16.1
 - seems to be stable now
diff --git a/g-wrap-1.9.11.pkgconfig.patch b/g-wrap-1.9.11.pkgconfig.patch
new file mode 100644
index 0000000..28056bb
--- /dev/null
+++ b/g-wrap-1.9.11.pkgconfig.patch
@@ -0,0 +1,15 @@
+*** guile/g-wrap-2.0-guile.pc.in.orig	Sat Dec 27 15:13:27 2008
+--- guile/g-wrap-2.0-guile.pc.in	Sat Dec 27 15:13:36 2008
+***************
+*** 11,15 ****
+  Name: G-Wrap
+  Description: A Guile wrapper generator
+  Version: @VERSION@
+! Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS_INSTALLED@
+! Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@
+--- 11,15 ----
+  Name: G-Wrap
+  Description: A Guile wrapper generator
+  Version: @VERSION@
+! Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS@
+! Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS@
-- 
2.11.4.GIT