Fix for goffice-0.6 (#203979) and SX crashes (#204473).

Package-Manager: portage-2.1.4_rc14

6 files changed, 195 insertions, 11 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index e7cbabfb4948..8a1f0c4d2359 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gnucash
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.145 2007/12/20 15:20:13 tove Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.146 2008/01/07 08:39:19 tove Exp $
+
+*gnucash-2.2.2-r1 (07 Jan 2008)
+
+  07 Jan 2008; Torsten Veller <tove@gentoo.org>
+  +files/gnucash-2.2.2-goffice.patch,
+  +files/gnucash-2.2.2-sx-fix-r16766.patch, +gnucash-2.2.2-r1.ebuild:
+  Fix for goffice-0.6 (#203979) and SX crashes (#204473).
 
   20 Dec 2007; Torsten Veller <tove@gentoo.org> gnucash-2.2.2.ebuild:
   Add goffice dependency again (#202862)
@@ -25,7 +32,7 @@
   Hopefully fixes bug #196417. Also #158013 and #174967.
   Documentation is now a separate package (app-doc/gnucash-docs).
 
-  19 Oct 2007; <jeff@gentoo.org> gnucash-2.2.0.ebuild, gnucash-2.2.1.ebuild:
+  19 Oct 2007; <je_fro@gentoo.org> gnucash-2.2.0.ebuild, gnucash-2.2.1.ebuild:
   Changed goffice dependency as per bug #191555. Big Thanks(tm) to rbridge.
 
 *gnucash-2.2.1 (09 Sep 2007)
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index d07b25cf9eb6..a56417a3cddf 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,10 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnucash-2.2.2-goffice.patch 948 RMD160 fdc2541d1f2f470cc8303f43141b9aeadd1f1b40 SHA1 52df4fba4920a5b84e1fc3170d0cb368bc1e5d0c SHA256 430851c641e1150f5a0e8c73df029928b386bddd5b34bc3ed7b269efecd29dcd
+MD5 adc41070a46fd4a8de77331aaad4a424 files/gnucash-2.2.2-goffice.patch 948
+RMD160 fdc2541d1f2f470cc8303f43141b9aeadd1f1b40 files/gnucash-2.2.2-goffice.patch 948
+SHA256 430851c641e1150f5a0e8c73df029928b386bddd5b34bc3ed7b269efecd29dcd files/gnucash-2.2.2-goffice.patch 948
 AUX gnucash-2.2.2-icons.patch 1289 RMD160 02926143b16dad015ab07915871ce9b6081b2ed1 SHA1 183c8a062248197dfaa978bf8c3fe7f7d0b1e82c SHA256 845522f0a056695e803b7e1fb74ead63846480bb4b5bdd1223d59c38e3c02a48
 MD5 f0d1d2a8991df4f7c3b05f4d71b1f19e files/gnucash-2.2.2-icons.patch 1289
 RMD160 02926143b16dad015ab07915871ce9b6081b2ed1 files/gnucash-2.2.2-icons.patch 1289
 SHA256 845522f0a056695e803b7e1fb74ead63846480bb4b5bdd1223d59c38e3c02a48 files/gnucash-2.2.2-icons.patch 1289
+AUX gnucash-2.2.2-sx-fix-r16766.patch 796 RMD160 289d03783fbfcc24c925e8023cdd8de8f219c466 SHA1 f923e39e760afd8aecad2ac6a8b461c16e81f662 SHA256 24790ffbb1e81395b09c97dbadd17979352a7d90c02fd60879283c99581a8a57
+MD5 25b4908cd6111465f9e63262380f2338 files/gnucash-2.2.2-sx-fix-r16766.patch 796
+RMD160 289d03783fbfcc24c925e8023cdd8de8f219c466 files/gnucash-2.2.2-sx-fix-r16766.patch 796
+SHA256 24790ffbb1e81395b09c97dbadd17979352a7d90c02fd60879283c99581a8a57 files/gnucash-2.2.2-sx-fix-r16766.patch 796
 DIST gnucash-2.0.5.tar.bz2 7372056 RMD160 b3d853f376143121f29b14ff81d09e044183584f SHA1 802ac3c8fd6f2448bad96a78b20c8fec9d6b89ad SHA256 b7e2efcdc79ba864a1730af9e0197cdbf586c9008196eaffffce8f020f1fb479
 DIST gnucash-2.2.1.tar.bz2 6978600 RMD160 4f06292a1b6e98a1cb5a00a5f396d387705a3a1d SHA1 d181d0bf7af2664cada62f63ab29b6ade92ae1b1 SHA256 c39f0d22529dedda722e21d3c44798ddf507c0a1f4e130ee6b7e4ddceb395728
 DIST gnucash-2.2.2.tar.bz2 7076072 RMD160 e64602283ccd51f0298a7ee637a49742932e5e3d SHA1 157b4ac6f211ab82041fa6a0b9a5bf93ffda2aac SHA256 66a4c54d2f1784826d3a44e27e237d36aeff6009e58eef6a31f340b68201086e
@@ -18,14 +26,18 @@ EBUILD gnucash-2.2.1-r1.ebuild 2687 RMD160 96861a788661df4b61b47c6746758bf81143c
 MD5 ce36553bf8d85d280fce8c434c9d867d gnucash-2.2.1-r1.ebuild 2687
 RMD160 96861a788661df4b61b47c6746758bf81143cd11 gnucash-2.2.1-r1.ebuild 2687
 SHA256 3900b8781918f904ff317e3430525bc9b12befad39f6621e5283e6c710d70cb8 gnucash-2.2.1-r1.ebuild 2687
+EBUILD gnucash-2.2.2-r1.ebuild 2986 RMD160 6cb823ea018616156c232ab7d6fdf2a3def9cfc0 SHA1 8561fb7abcbe834e66d655964a2f2247240b6833 SHA256 bb8bf90a51633084dd7cc13a559b2d1160d80973d24e5e21b40cd5e8d1b1ab33
+MD5 c4181b6beb7a868b9dbd299c9c044051 gnucash-2.2.2-r1.ebuild 2986
+RMD160 6cb823ea018616156c232ab7d6fdf2a3def9cfc0 gnucash-2.2.2-r1.ebuild 2986
+SHA256 bb8bf90a51633084dd7cc13a559b2d1160d80973d24e5e21b40cd5e8d1b1ab33 gnucash-2.2.2-r1.ebuild 2986
 EBUILD gnucash-2.2.2.ebuild 2895 RMD160 08c28179cb6ceaa9bcb52b8eef3d2a1bfe7be727 SHA1 5615f58014dcfc928efb8bff1161e3fcbd8580c8 SHA256 961ddef489a185b5f7cf4367e727bc9493fae714dea50ae00c4f23f30fe8149e
 MD5 dce412c620085f038e8b7fb021db4bc4 gnucash-2.2.2.ebuild 2895
 RMD160 08c28179cb6ceaa9bcb52b8eef3d2a1bfe7be727 gnucash-2.2.2.ebuild 2895
 SHA256 961ddef489a185b5f7cf4367e727bc9493fae714dea50ae00c4f23f30fe8149e gnucash-2.2.2.ebuild 2895
-MISC ChangeLog 22136 RMD160 be0e898ec5401f49be4fa9f4a29cdebd7930d0e8 SHA1 48bc103a4331ba054b6eb23179450f833477c046 SHA256 24e6a3fc6bb4cffd7f9815500dbcfa80f1e4999e8ec4578a19ec61af59fa2ab6
-MD5 5b7ba80350fc07cb5e37bf7cd17ab773 ChangeLog 22136
-RMD160 be0e898ec5401f49be4fa9f4a29cdebd7930d0e8 ChangeLog 22136
-SHA256 24e6a3fc6bb4cffd7f9815500dbcfa80f1e4999e8ec4578a19ec61af59fa2ab6 ChangeLog 22136
+MISC ChangeLog 22386 RMD160 610e9641f1895072dd5b53cc5a0b6ca30dce7caa SHA1 52702ffc0900d21924117e3ca4c8927e7e594d4c SHA256 c20b4b8ce0702ba7a8f715279d3a3a4351e957cbe266576ae0aa1ac17d739fc9
+MD5 fc43b09e21f4b86a24e83bc578e6f001 ChangeLog 22386
+RMD160 610e9641f1895072dd5b53cc5a0b6ca30dce7caa ChangeLog 22386
+SHA256 c20b4b8ce0702ba7a8f715279d3a3a4351e957cbe266576ae0aa1ac17d739fc9 ChangeLog 22386
 MISC metadata.xml 255 RMD160 eed2a430ff95a969fb224cec79676fc1651de745 SHA1 7f6701628873130644bd55c3898c8baf59279c74 SHA256 8405513ba61307253676b41faad6234e851a4d136c47fb92fb08eab1d5f0ea76
 MD5 5a997c1c189832cfc13e114ed77828e2 metadata.xml 255
 RMD160 eed2a430ff95a969fb224cec79676fc1651de745 metadata.xml 255
@@ -39,10 +51,13 @@ SHA256 230cc51a3eb1742ed883f389ebaa325e51328f38994090d1d834e10b221cbca2 files/di
 MD5 3c669ec26ffd8b12a204efa9ffb735ab files/digest-gnucash-2.2.2 482
 RMD160 ff7cf4ae5665c178ae9905a7b680da2d3b7968c3 files/digest-gnucash-2.2.2 482
 SHA256 192e3a93a4b76816fc57ef38076a19098e0a39f2496cc2774e86ba16deab5f26 files/digest-gnucash-2.2.2 482
+MD5 3c669ec26ffd8b12a204efa9ffb735ab files/digest-gnucash-2.2.2-r1 482
+RMD160 ff7cf4ae5665c178ae9905a7b680da2d3b7968c3 files/digest-gnucash-2.2.2-r1 482
+SHA256 192e3a93a4b76816fc57ef38076a19098e0a39f2496cc2774e86ba16deab5f26 files/digest-gnucash-2.2.2-r1 482
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHaohIV3J2n04EauwRAoceAKCSeKTnnKAt+EDwQlvnJGfPVj4uxgCfYfEj
-3M7qOAF5bmWnh1cusNtvb/c=
-=hOUS
+iEYEARECAAYFAkeB5T4ACgkQV3J2n04Eaux8awCgo09CBGiHaEhf56BKNVNS40aA
+AaYAn2WhwbhrbgViTbPMRXE8WEzsUrTw
+=1zGc
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnucash/files/digest-gnucash-2.2.2-r1 b/app-office/gnucash/files/digest-gnucash-2.2.2-r1
new file mode 100644
index 000000000000..257cd8be4e98
--- /dev/null
+++ b/app-office/gnucash/files/digest-gnucash-2.2.2-r1
@@ -0,0 +1,6 @@
+MD5 dd8ee31c057ecbccd298841c57426582 gnucash-2.2.2.tar.bz2 7076072
+RMD160 e64602283ccd51f0298a7ee637a49742932e5e3d gnucash-2.2.2.tar.bz2 7076072
+SHA256 66a4c54d2f1784826d3a44e27e237d36aeff6009e58eef6a31f340b68201086e gnucash-2.2.2.tar.bz2 7076072
+MD5 0d2f7eb0b4b59312e5b13f269f2735d4 gnucash-icon.svg.bz2 5046
+RMD160 e9389e5d2468416c5d2168ce30fb4ff57dd27872 gnucash-icon.svg.bz2 5046
+SHA256 a679c12477536b5f43c01d0448ddfe03de195d9954bfebc087bba1f549214d71 gnucash-icon.svg.bz2 5046
diff --git a/app-office/gnucash/files/gnucash-2.2.2-goffice.patch b/app-office/gnucash/files/gnucash-2.2.2-goffice.patch
new file mode 100644
index 000000000000..35638a76430b
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.2.2-goffice.patch
@@ -0,0 +1,24 @@
+Index: gnucash/trunk/configure.in
+===================================================================
+--- gnucash/trunk/configure.in (revision 16816)
++++ gnucash/trunk/configure.in (revision 16834)
+@@ -1115,13 +1115,13 @@
+     goffice=0
+     goffice_with_cairo=0
+-    PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [
++    PKG_CHECK_MODULES(GOFFICE, libgoffice-0.6 >= 0.6.0, [goffice=1], [
++      PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [goffice=1], [goffice=0])
++    ])
++    if test x$goffice = x1
++    then
+       AC_DEFINE(HAVE_GOFFICE_0_5,1,[System has goffice 0.5.1 or better])
+       AC_DEFINE(GOFFICE_WITH_CAIRO,1,[GOffice has been built with cairo support])
+-      goffice=1
+       goffice_with_cairo=1
+-    ], [goffice=0])
+-
+-    if test x$goffice = x0
+-    then
++    else
+       PKG_CHECK_MODULES(GOFFICE, libgoffice-0.4 >= 0.4.0, [goffice=1], [
+         PKG_CHECK_MODULES(GOFFICE, libgoffice-0.3 >= 0.3.0, [goffice=1], [
diff --git a/app-office/gnucash/files/gnucash-2.2.2-sx-fix-r16766.patch b/app-office/gnucash/files/gnucash-2.2.2-sx-fix-r16766.patch
new file mode 100644
index 000000000000..3bfb9458c1e0
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.2.2-sx-fix-r16766.patch
@@ -0,0 +1,19 @@
+http://svn.gnucash.org/trac/changeset/16766
+Index: /gnucash/trunk/src/app-utils/gnc-sx-instance-model.c
+===================================================================
+--- /gnucash/trunk/src/app-utils/gnc-sx-instance-model.c (revision 16670)
++++ /gnucash/trunk/src/app-utils/gnc-sx-instance-model.c (revision 16766)
+@@ -262,5 +262,5 @@
+ {
+     Account *template_root, *sx_template_acct;
+-    char sx_guid_str[GUID_ENCODING_LENGTH];
++    char sx_guid_str[GUID_ENCODING_LENGTH+1];
+ 
+     template_root = gnc_book_get_template_root(gnc_get_current_book());
+@@ -924,5 +924,5 @@
+     if (*split_acct == NULL)
+     {
+-        char guid_str[GUID_ENCODING_LENGTH];
++        char guid_str[GUID_ENCODING_LENGTH+1];
+         GString *err;
+         guid_to_string_buff((const GUID*)acct_guid, guid_str);
diff --git a/app-office/gnucash/gnucash-2.2.2-r1.ebuild b/app-office/gnucash/gnucash-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..92e218f42964
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.2.2-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.2-r1.ebuild,v 1.1 2008/01/07 08:39:19 tove Exp $
+
+inherit autotools eutils gnome2
+
+DOC_VER="2.2.0"
+
+DESCRIPTION="A personal finance manager."
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-icon.svg.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="ofx hbci chipcard debug quotes"
+
+RDEPEND=">=dev-libs/glib-2.6.3
+	|| ( ( >=dev-scheme/guile-1.8.3 >=dev-scheme/slib-3.1.4  )
+	     (  <dev-scheme/guile-1.8.3  =dev-scheme/slib-3.1.1* ) )
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/popt-1.5
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libgnomeui-2.4
+	>=gnome-base/libgnomeprint-2.10
+	>=gnome-base/libgnomeprintui-2.10
+	>=gnome-base/libglade-2.4
+	|| (
+		=gnome-extra/gtkhtml-3.12*
+		=gnome-extra/gtkhtml-3.10*
+	)
+	>=dev-libs/libxml2-2.5.10
+	>=gnome-base/gconf-2
+	>=app-text/scrollkeeper-0.3
+	x11-libs/goffice
+	ofx? ( >=dev-libs/libofx-0.7.0 )
+	hbci? ( net-libs/aqbanking
+		chipcard? ( sys-libs/libchipcard )
+	)
+	quotes? ( dev-perl/DateManip
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/HTML-TableExtract )
+	dev-util/intltool
+	media-libs/libart_lgpl
+	x11-libs/pango"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/libtool"
+
+PDEPEND=">=app-doc/gnucash-docs-${DOC_VER}"
+ELTCONF="--patch-only"
+DOC="AUTHORS ChangeLog* DOCUMENTERS HACKING NEWS TODO README* doc/README*"
+
+pkg_setup() {
+	local will_die=false
+	local flags="deprecated regex"
+	if ! built_with_use --missing true dev-scheme/guile ${flags} ; then
+		eerror "dev-scheme/guile must be built with \"${flags}\" use flags"
+		will_die=true
+	fi
+	if ! built_with_use gnome-extra/libgsf gnome ; then
+		eerror "gnome-extra/libgsf must be built with gnome use flag"
+		will_die=true
+	fi
+	if ! built_with_use x11-libs/goffice gnome ; then
+		eerror "x11-libs/goffice must be built with gnome use flag"
+		will_die=true
+	fi
+
+	if ${will_die} ; then
+		die "Please rebuild the packages with the use flags above."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cp "${WORKDIR}"/gnucash-icon.svg "${S}"/src/pixmaps || die
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-icons.patch
+	epatch "${FILESDIR}"/${P}-sx-fix-r16766.patch
+	epatch "${FILESDIR}"/${P}-goffice.patch
+	AT_M4DIR=macros eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ofx) \
+		$(use_enable hbci) \
+		--disable-doxygen \
+		--enable-locale-specific-tax \
+		--disable-error-on-warning \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_test() {
+	GUILE_WARN_DEPRECATED=no \
+	emake -j1 check \
+	|| die "Make check failed. See above for details."
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	ewarn ""
+	ewarn "If you are using Scheduled Transactions, the data file saved by"
+	ewarn "GnuCash 2.2 is NOT backward-compatible with GnuCash 2.0."
+	ewarn "Please make a safe backup of your 2.0 data before upgrading to 2.2"
+	ewarn ""
+}