>Number:         28525
>Category:       pkg
>Synopsis:       [AHA]<devel/g-wrap> dependency upgrade guile14->guile for gnucash
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 03 09:30:00 +0000 2004
>Originator:     Andreas Hallmann
>Release:        NetBSD 1.6.2_STABLE
>Organization:
NetBSD: If you happen to have any problem with your uptime.
>Environment:
System: NetBSD nda 1.6.2_STABLE NetBSD 1.6.2_STABLE (AHAv8#2) #8: Mon Jun 21 15:16:26 CEST 2004 toor@nda:/amd/nda/mounts/netbsd/src/sys/arch/sparc/compile/AHAv8#2 sparc
Architecture: sparc
Machine: sparc
>Description:
	At least on sparc, gnucash is not in a working condition for a long time now.
        It compiles, can be started, but crashes after every new line checked into an account.
	Moreover, it throws a lot gtk-related error-messages and warnings.

	Im not picking on the maintainer. He is doinging a great job. Pulling up any new revision.

	Due to my analysis, guppi, guile-slib, guile-gtk and g-wrap needs to be modernised and all dependencies
	to guile14 should be replaced by guile.

>How-To-Repeat:
	compile and try to enter a few lines of data into an account

>Fix:

	It was a lot of work, to build a set of patches to fix this.
	Applying them results in a rock stable gnucash (again at least on sparc)
	Please, apply them before the freeze.

	A series of patches follow. Marked by [AHA] and i.e. <math/guppi> for your convinience.
	All should be applied from your pkgsrc root. (again for your convinience.)
	OK, first fix is trivial.

	Here it goes:

cd /usr/pkgsrc

apply the patch

remove  devel/g-wrap/patches/patch-ab from cvs
remove  devel/g-wrap/patches/patch-ac from cvs


Patch to devel/g-wrap
###################
Index: devel/g-wrap/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/g-wrap/Makefile,v
retrieving revision 1.28
diff -r1.28 Makefile
4c4
< PKGREVISION=	5
---
> PKGREVISION=	6
19c19
< MAKE_ENV+=		GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
---
> #MAKE_ENV+=		GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
24c24
< CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/${GUILE14_SUBDIR}/share/guile
---
> CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/share/guile/1.6
28c28
< .include "../../lang/guile14/buildlink3.mk"
---
> .include "../../lang/guile/buildlink3.mk"
Index: devel/g-wrap/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/g-wrap/PLIST,v
retrieving revision 1.7
diff -r1.7 PLIST
3,18c3,18
< guile/1.4/share/guile/g-wrap.scm
< guile/1.4/share/guile/g-wrap/enumeration.scm
< guile/1.4/share/guile/g-wrap/g-translate.scm
< guile/1.4/share/guile/g-wrap/gtkobj.scm
< guile/1.4/share/guile/g-wrap/gw-glib-spec.scm
< guile/1.4/share/guile/g-wrap/gw-glib.scm
< guile/1.4/share/guile/g-wrap/gw-gtk-spec.scm
< guile/1.4/share/guile/g-wrap/gw-gtk.scm
< guile/1.4/share/guile/g-wrap/gw-standard-spec.scm
< guile/1.4/share/guile/g-wrap/gw-standard.scm
< guile/1.4/share/guile/g-wrap/gw-wct-spec.scm
< guile/1.4/share/guile/g-wrap/gw-wct.scm
< guile/1.4/share/guile/g-wrap/output-file.scm
< guile/1.4/share/guile/g-wrap/runtime.scm
< guile/1.4/share/guile/g-wrap/simple-type.scm
< guile/1.4/share/guile/g-wrap/sorting.scm
---
> share/guile/1.6/g-wrap.scm
> share/guile/1.6/g-wrap/enumeration.scm
> share/guile/1.6/g-wrap/g-translate.scm
> share/guile/1.6/g-wrap/gtkobj.scm
> share/guile/1.6/g-wrap/gw-glib-spec.scm
> share/guile/1.6/g-wrap/gw-glib.scm
> share/guile/1.6/g-wrap/gw-gtk-spec.scm
> share/guile/1.6/g-wrap/gw-gtk.scm
> share/guile/1.6/g-wrap/gw-standard-spec.scm
> share/guile/1.6/g-wrap/gw-standard.scm
> share/guile/1.6/g-wrap/gw-wct-spec.scm
> share/guile/1.6/g-wrap/gw-wct.scm
> share/guile/1.6/g-wrap/output-file.scm
> share/guile/1.6/g-wrap/runtime.scm
> share/guile/1.6/g-wrap/simple-type.scm
> share/guile/1.6/g-wrap/sorting.scm
30c30
< @dirrm guile/1.4/share/guile/g-wrap
---
> @dirrm share/guile/1.6/g-wrap
Index: devel/g-wrap/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/g-wrap/buildlink3.mk,v
retrieving revision 1.2
diff -r1.2 buildlink3.mk
14,15c14,15
< BUILDLINK_DEPENDS.g-wrap+=	g-wrap>=1.3.4nb3
< BUILDLINK_RECOMMENDED.g-wrap+=	g-wrap>=1.3.4nb4
---
> BUILDLINK_DEPENDS.g-wrap+=	g-wrap>=1.3.4nb6
> BUILDLINK_RECOMMENDED.g-wrap+=	g-wrap>=1.3.4nb6
20c20
< .include "../../lang/guile14/buildlink3.mk"
---
> .include "../../lang/guile/buildlink3.mk"
Index: devel/g-wrap/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/g-wrap/distinfo,v
retrieving revision 1.7
diff -r1.7 distinfo
6,7d5
< SHA1 (patch-ab) = 92f8e1ed55a3ba563837b36e2f39888734aebefe
< SHA1 (patch-ac) = 7bd1543e1941668d71507d8ee6e1c5f1614f6472
Index: devel/g-wrap/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/devel/g-wrap/patches/patch-ab,v
retrieving revision 1.3
diff -r1.3 patch-ab
1,13d0
< $NetBSD: patch-ab,v 1.3 2003/02/24 20:50:19 jschauma Exp $
< 
< --- bin/g-wrap-config.in.orig	Thu Nov  7 17:23:43 2002
< +++ bin/g-wrap-config.in	Thu Feb  6 17:23:29 2003
< @@ -56,7 +56,7 @@
<                 (lambda (lib) (stdout " @-libdir-@/lib" lib ".a"))
<                 (cdr libs))
<                (begin
< -                (stdout "-L@-libdir-@")
< +                (stdout "-Wl,-R@-libdir-@ -L@-libdir-@")
<                  (for-each
<                   (lambda (lib) (stdout " -l" lib))
<                   (cdr libs))))
Index: devel/g-wrap/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/devel/g-wrap/patches/patch-ac,v
retrieving revision 1.4
diff -r1.4 patch-ac
1,16d0
< $NetBSD: patch-ac,v 1.4 2004/05/03 15:58:55 wiz Exp $
< 
< --- bin/Makefile.in.orig	2002-11-08 05:40:46.000000000 +0100
< +++ bin/Makefile.in
< @@ -333,9 +333,9 @@ g-wrap: g-wrap.in Makefile
<  g-wrap-config: g-wrap-config.in
<  	rm -f $@.tmp
<  	sed < $@.in > $@.tmp \
< -	    -e 's:@-GUILE-@:${GUILE}:' \
< +	    -e 's:@-GUILE-@:${PREFIX}/${GUILE14_SUBDIR}/bin/guile:' \
<  	    -e 's:@-VERSION-@:${VERSION}:' \
< -	    -e 's:@-libdir-@:${libdir}:' \
< +	    -e 's:@-libdir-@:${libdir}:g' \
<  	    -e 's:@-includedir-@:${includedir}:' \
<  	    -e 's:@-GUILE_MODULE_DIR-@:${GUILEMODDIR}:'
<  	chmod +x $@.tmp