Added patch to build gcalctool on Gentoo/FreeBSD as per bug #103574. See also gnome bug #314375. Fix already applied for next upstream version.

(Portage version: 2.0.51.22)

6 files changed, 77 insertions, 16 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index cf8483a80727..dd15ef25f815 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.75 2005/08/20 14:47:58 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.76 2005/08/25 23:51:45 flameeyes Exp $
+
+*gcalctool-5.5.42-r2 (25 Aug 2005)
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gcalctool-5.5.42-malloc.patch, +gcalctool-5.5.42-r2.ebuild,
+  gcalctool-5.6.26.ebuild:
+  Added patch to build gcalctool on Gentoo/FreeBSD as per bug #103574. See
+  also gnome bug #314375. Fix already applied for next upstream version.
 
 *gcalctool-5.6.26 (20 Aug 2005)
 
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
index be26b79605f2..e54a24d145d7 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 c3c55b4122ff08d7c78ab59cde7685c1 gcalctool-5.5.42-r2.ebuild 1076
+MD5 7c12ba655006dfcc4476eb32ddc41438 gcalctool-5.6.26.ebuild 1330
+MD5 6bf0ca3755e10fd1ea5a22caa8e10744 ChangeLog 8217
 MD5 29870e49b9f45f10bd5079e5a963c2d9 gcalctool-5.5.41.ebuild 930
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 2cd7ded23e487bf37203e480a61d6ea5 gcalctool-5.5.42-r1.ebuild 1038
-MD5 814c7a6a9f73e8103933d951b50a20a9 gcalctool-5.6.26.ebuild 1282
-MD5 6bf0ca3755e10fd1ea5a22caa8e10744 ChangeLog 8217
+MD5 65a63bafe87741895d52ee30ab304b93 files/digest-gcalctool-5.5.42-r1 70
 MD5 643f5117320cc2c403b8eceff4d156b9 files/gcalctool-5.5.42-hexdec-fix.patch 4268
 MD5 a01a5d488c2ed06f72fddb474cd50966 files/digest-gcalctool-5.6.26 70
-MD5 65a63bafe87741895d52ee30ab304b93 files/digest-gcalctool-5.5.42-r1 70
+MD5 65a63bafe87741895d52ee30ab304b93 files/digest-gcalctool-5.5.42-r2 70
+MD5 6885edfd95cdbdf6c3963d6eeb58147d files/gcalctool-5.5.42-malloc.patch 380
 MD5 804e74faec2cab4025478c0bfc0e4bfd files/digest-gcalctool-5.5.41 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC8v6gIKl8Uu19MoRAljGAJ92EvOXhIV77hpiYZNqPKiYcb3VhACeMPcX
-0yNRgJ7+rkCav+oS/Scfjw4=
-=SVpQ
------END PGP SIGNATURE-----
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r2 b/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r2
new file mode 100644
index 000000000000..76f9798750de
--- /dev/null
+++ b/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r2
@@ -0,0 +1 @@
+MD5 0f42e6e437f64c844b7b30e3255b02aa gcalctool-5.5.42.tar.bz2 1072489
diff --git a/gnome-extra/gcalctool/files/gcalctool-5.5.42-malloc.patch b/gnome-extra/gcalctool/files/gcalctool-5.5.42-malloc.patch
new file mode 100644
index 000000000000..66b7827e4c74
--- /dev/null
+++ b/gnome-extra/gcalctool/files/gcalctool-5.5.42-malloc.patch
@@ -0,0 +1,13 @@
+Index: gcalctool-5.5.42/gcalctool/syntax_translation.c
+===================================================================
+--- gcalctool-5.5.42.orig/gcalctool/syntax_translation.c
++++ gcalctool-5.5.42/gcalctool/syntax_translation.c
+@@ -21,7 +21,7 @@
+ 
+ #include <stdio.h>
+ #include <libintl.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <assert.h>
+ #include <string.h>
+ 
diff --git a/gnome-extra/gcalctool/gcalctool-5.5.42-r2.ebuild b/gnome-extra/gcalctool/gcalctool-5.5.42-r2.ebuild
new file mode 100644
index 000000000000..e61ded50df54
--- /dev/null
+++ b/gnome-extra/gcalctool/gcalctool-5.5.42-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.5.42-r2.ebuild,v 1.1 2005/08/25 23:51:45 flameeyes Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="A scientific calculator for Gnome2"
+HOMEPAGE="http://calctool.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gconf-1.2
+	>=dev-libs/atk-1.6"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	app-text/scrollkeeper
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# fix for bug #95463
+	epatch ${FILESDIR}/${P}-hexdec-fix.patch
+	epatch ${FILESDIR}/${P}-malloc.patch
+}
+
+src_install() {
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+	# remove symlink that conflicts with <2.3 gnome-utils
+	rm -f ${D}/usr/bin/gnome-calculator
+
+}
+USE_DESTDIR="1"
diff --git a/gnome-extra/gcalctool/gcalctool-5.6.26.ebuild b/gnome-extra/gcalctool/gcalctool-5.6.26.ebuild
index 833970e47276..886e122fb1fc 100644
--- a/gnome-extra/gcalctool/gcalctool-5.6.26.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.6.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.6.26.ebuild,v 1.1 2005/08/20 14:47:58 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.6.26.ebuild,v 1.2 2005/08/25 23:51:45 flameeyes Exp $
 
 inherit gnome2 eutils
 
@@ -42,6 +42,8 @@ src_unpack() {
 					help/zh_CN/Makefile.in \
 					help/zh_HK/Makefile.in \
 					help/zh_TW/Makefile.in
+	
+	epatch ${FILESDIR}/${PN}-5.5.42-malloc.patch
 }
 
 src_install() {