Subject: pkg/28523: [AHA] (4 years old) outdated, (broken) gnucash requires version 0.31 and guile insteed of guile14
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Andreas Hallmann <hallmann@hallhard.darktech.org>
List: pkgsrc-bugs
Date: 12/03/2004 08:57:00
>Number:         28523
>Category:       pkg
>Synopsis:       [AHA] <devel/guile-gtk> (4 years old) outdated, (broken) gnucash requires version 0.31 and guile insteed of guile14
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 03 08:57:00 +0000 2004
>Originator:     Andreas Hallmann
>Release:        NetBSD 1.6.2_STABLE
>Organization:
>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:
	guile-gtk 0.19 is 4 years old now.
	gnucash needs the last version for gtk1. 
	This is the 2 years old guile-gtk-1.2-0.31.

	
>How-To-Repeat:
	
>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

Patch to devel/guile-gtk
########################
Index: devel/guile-gtk/DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/devel/guile-gtk/DESCR,v
retrieving revision 1.1
diff -r1.1 DESCR
1c1
<   Guile-gtk is a library written to make GTK accessible from guile.
---
> Guile-gtk is a library written to make GTK+-1.2 accessible from guile.
10a11,12
> 
> Since 11 September 2003, guile-gtk is GNU.
Index: devel/guile-gtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/guile-gtk/Makefile,v
retrieving revision 1.20
diff -r1.20 Makefile
1,2c1
< # $NetBSD: Makefile,v 1.20 2004/11/13 21:28:28 jlam Exp $
< #
---
> # $NetBSD$
4,5c3,4
< DISTNAME=		guile-gtk-0.19
< PKGREVISION=		6
---
> DISTNAME=		guile-gtk-1.2-0.31
> PKGNAME=		guile-gtk-0.31
7,10c6
< MASTER_SITES=		http://www.ping.de/sites/zagadka/guile-gtk/download/ \
< 			http://erin.netpedia.net/download/ \
< 			http://erin.linuxbox.com/guile-gtk/download/ \
< 			http://linux.cem.itesm.mx/~jarios/guile-gtk/download/
---
> MASTER_SITES=		${MASTER_SITE_GNU:=savannah/files/guile-gtk/}
13c9
< HOMEPAGE=		http://www.ping.de/sites/zagadka/guile-gtk/
---
> HOMEPAGE=		http://www.gnu.org/software/guile-gtk
17,18c13,18
< USE_X11=		# defined
< USE_LIBTOOL=		# defined
---
> USE_X11=		yes
> USE_PKGLOCALEDIR=	yes
> USE_LIBTOOL=		yes
> LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
> GNU_CONFIGURE=		yes
> UNLIMIT_RESOURCES=	datasizes
20,25c20
< GNU_CONFIGURE=		# defined
< CONFIGURE_ARGS+=	--datadir=${PREFIX}/${GUILE14_SUBDIR}/share
< PLIST_SUBST+=		GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
< MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
< 
< .include "../../lang/guile14/buildlink3.mk"
---
> .include "../../lang/guile/buildlink3.mk"
26a22
> .include "../../converters/libiconv/buildlink3.mk"
27a24
> 
Index: devel/guile-gtk/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/guile-gtk/PLIST,v
retrieving revision 1.3
diff -r1.3 PLIST
1c1
< @comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:26 jlam Exp $
---
> @comment $NetBSD$
3,4c3
< bin/guile-gtk
< bin/guile-gtk-1.2
---
> bin/build-guile-gtk-1.2
7,19c6,23
< ${GUILE14_SUBDIR}/share/guile-gtk/gdk-1.2.defs
< ${GUILE14_SUBDIR}/share/guile-gtk/gtk-1.2.defs
< ${GUILE14_SUBDIR}/share/guile/gtk-1.2/gdk.scm
< ${GUILE14_SUBDIR}/share/guile/gtk-1.2/gtk.scm
< ${GUILE14_SUBDIR}/share/guile/gtk/config.scm
< ${GUILE14_SUBDIR}/share/guile/gtk/dynlink-old.scm
< ${GUILE14_SUBDIR}/share/guile/gtk/dynlink.scm
< ${GUILE14_SUBDIR}/share/guile/gtk/event-repl.scm
< ${GUILE14_SUBDIR}/share/guile/gtk/gdk.scm
< ${GUILE14_SUBDIR}/share/guile/gtk/gtk.scm
< @dirrm ${GUILE14_SUBDIR}/share/guile/gtk
< @dirrm ${GUILE14_SUBDIR}/share/guile/gtk-1.2
< @dirrm ${GUILE14_SUBDIR}/share/guile-gtk
---
> share/guile-gtk/gdk-1.2.defs
> share/guile-gtk/gtk-1.2.defs
> share/guile/gtk-1.2/config.scm
> share/guile/gtk-1.2/dynlink.scm
> share/guile/gtk-1.2/gdk.scm
> share/guile/gtk-1.2/gtk.scm
> share/guile/gtk-1.2/repl.scm
> share/guile/gtk-1.2/threads.scm
> share/guile/gtk/config.scm
> share/guile/gtk/dynlink.scm
> share/guile/gtk/gdk.scm
> share/guile/gtk/gtk.scm
> share/guile/gtk/repl.scm
> share/guile/gtk/threads.scm
> @dirrm share/guile/gtk-1.2
> @dirrm share/guile/gtk
> @dirrm share/guile-gtk
> 
Index: devel/guile-gtk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/guile-gtk/buildlink3.mk,v
retrieving revision 1.2
diff -r1.2 buildlink3.mk
14,15c14,15
< BUILDLINK_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb4
< BUILDLINK_RECOMMENDED.guile-gtk+=	guile-gtk>=0.19nb5
---
> BUILDLINK_DEPENDS.guile-gtk+=	guile-gtk>=0.31
> BUILDLINK_RECOMMENDED.guile-gtk+=	guile-gtk>=0.31
19c19
< .include "../../lang/guile14/buildlink3.mk"
---
> .include "../../lang/guile/buildlink3.mk"
Index: devel/guile-gtk/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/guile-gtk/distinfo,v
retrieving revision 1.4
diff -r1.4 distinfo
1c1
< $NetBSD: distinfo,v 1.4 2003/02/05 21:35:06 dmcmahill Exp $
---
> $NetBSD$
3,5c3,4
< SHA1 (guile-gtk-0.19.tar.gz) = 22e445fb0574cee76c0d18dbdc28090b63b88302
< Size (guile-gtk-0.19.tar.gz) = 278896 bytes
< SHA1 (patch-aa) = 54753539855280704593b9ee7da330ec6934bfdf
---
> SHA1 (guile-gtk-1.2-0.31.tar.gz) = c745891e6f38b0e3f723db1d9b478da451d797c8
> Size (guile-gtk-1.2-0.31.tar.gz) = 375504 bytes