Fix building with GCC 4.4 wrt #269258, thanks to Martin Väth.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 30 insertions, 76 deletions

diff --git a/app-dicts/stardict/ChangeLog b/app-dicts/stardict/ChangeLog
index 4a64ca3e7122..efab4d5b964f 100644
--- a/app-dicts/stardict/ChangeLog
+++ b/app-dicts/stardict/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/stardict
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.52 2009/02/24 15:26:07 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.53 2009/07/24 17:28:30 ssuominen Exp $
+
+  24 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  stardict-3.0.1-r2.ebuild, +files/stardict-3.0.1-gcc44.patch:
+  Fix building with GCC 4.4 wrt #269258, thanks to Martin Väth.
 
   24 Feb 2009; Peter Volkov <pva@gentoo.org> stardict-3.0.1-r2.ebuild:
   Fixed dependency on festival, bug #260106, thank Oleksandr Pilipenko for
diff --git a/app-dicts/stardict/files/stardict-3.0.1-gcc44.patch b/app-dicts/stardict/files/stardict-3.0.1-gcc44.patch
new file mode 100644
index 000000000000..084b6b645603
--- /dev/null
+++ b/app-dicts/stardict/files/stardict-3.0.1-gcc44.patch
@@ -0,0 +1,22 @@
+--- src/lib/data.cpp
++++ src/lib/data.cpp
+@@ -22,6 +22,8 @@
+ #  include "config.h"
+ #endif
+ 
++#include <cstdio>
++
+ #include "kmp.h"
+ 
+ #include "data.hpp"
+--- src/lib/stardict_client.cpp
++++ src/lib/stardict_client.cpp
+@@ -22,6 +22,8 @@
+ #  include "config.h"
+ #endif
+ 
++#include <cstdio>
++
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
diff --git a/app-dicts/stardict/stardict-3.0.1-r2.ebuild b/app-dicts/stardict/stardict-3.0.1-r2.ebuild
index 03dde0231e8b..6ef9d3f4931a 100644
--- a/app-dicts/stardict/stardict-3.0.1-r2.ebuild
+++ b/app-dicts/stardict/stardict-3.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-3.0.1-r2.ebuild,v 1.2 2009/02/24 15:26:07 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-3.0.1-r2.ebuild,v 1.3 2009/07/24 17:28:30 ssuominen Exp $
 
 inherit gnome2 eutils autotools
 
@@ -56,6 +56,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch
 	epatch "${FILESDIR}"/${P}-transparent_trayicon.patch
 	epatch "${FILESDIR}"/${P}-changelog-minor-typo-fixes.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 
 	# Fix compatibility with gucharmap-2, bug #240728
 	epatch "${FILESDIR}/${P}-gucharmap2.patch"
diff --git a/app-dicts/stardict/stardict-3.0.1.ebuild b/app-dicts/stardict/stardict-3.0.1.ebuild
deleted file mode 100644
index 2a922274ccc2..000000000000
--- a/app-dicts/stardict/stardict-3.0.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-3.0.1.ebuild,v 1.6 2008/04/14 16:02:15 armin76 Exp $
-
-inherit gnome2 eutils autotools
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-#       their indexes seem to be in a different format. So we'll keep them
-#       seperate for now.
-
-IUSE="festival espeak gnome gucharmap spell"
-DESCRIPTION="A GNOME2 international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stardict/${P}.tar.bz2"
-
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-# when adding keywords, remember to add to stardict.eclass
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
-		>=gnome-base/libgnome-2.2.0
-		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
-		>=gnome-base/orbit-2.6
-		app-text/scrollkeeper )
-	spell? ( app-text/enchant )
-	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.12"
-
-RDEPEND="${DEP}
-	espeak? ( >=app-accessibility/espeak-1.29 )
-	festival? ( =app-accessibility/festival-1.96_beta )"
-
-DEPEND="${DEP}
-	>=dev-util/intltool-0.22
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.in-EST.diff
-	epatch "${FILESDIR}"/${P}-gconf-m4.diff
-	AT_M4DIR="m4" eautoreconf
-	gnome2_omf_fix
-}
-
-src_compile() {
-	export PKG_CONFIG=$(type -P pkg-config)
-	# Festival plugin crashes, bug 188684. Disable for now.
-	G2CONF="$(use_enable gnome gnome-support)
-		$(use_enable spell)
-		$(use_enable gucharmap)
-		$(use_enable espeak espeak)
-		--disable-festival
-		--disable-advertisement
-		--disable-updateinfo"
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	elog "Note: festival text to speach (TTS) plugin is not built. To use festival"
-	elog 'TTS plugin, please, enable "Use TTS program." at:'
-	elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
-	elog '"echo %s | festival --tts"'
-	elog
-	elog "You will now need to install stardict dictionary files. If"
-	elog "you have not, execute the below to get a list of dictionaries:"
-	elog
-	elog "  emerge -s stardict-"
-}