From 090d3ad25045c0b14a5aeb12cd5dc4b4bc24b41a Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Thu, 25 May 2006 21:50:54 +0000 Subject: Fix installation and build with gcc-4.1, bug #133851 & #133852 (Portage version: 2.1_rc2-r1) --- games-strategy/boson/ChangeLog | 7 ++++++- games-strategy/boson/boson-0.11.ebuild | 5 ++++- games-strategy/boson/files/boson-0.11-gcc41.patch | 10 ++++++++++ games-strategy/boson/files/boson-0.11-install.patch | 11 +++++++++++ games-strategy/boson/files/digest-boson-0.11 | 2 ++ 5 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 games-strategy/boson/files/boson-0.11-gcc41.patch create mode 100644 games-strategy/boson/files/boson-0.11-install.patch (limited to 'games-strategy/boson') diff --git a/games-strategy/boson/ChangeLog b/games-strategy/boson/ChangeLog index 1b4117f9d227..5aecf71bdbd9 100644 --- a/games-strategy/boson/ChangeLog +++ b/games-strategy/boson/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-strategy/boson # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/ChangeLog,v 1.15 2006/05/12 15:42:10 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/ChangeLog,v 1.16 2006/05/25 21:50:54 tupone Exp $ + + 25 May 2006; +files/boson-0.11-gcc41.patch, + +files/boson-0.11-install.patch, boson-0.11.ebuild: + Fix installation, bug #133851 by nyhm + Fix for gcc-4.1, bug #133852 by nyhm 12 May 2006; Chris Gianelloni -boson-0.10.ebuild, boson-0.11.ebuild: diff --git a/games-strategy/boson/boson-0.11.ebuild b/games-strategy/boson/boson-0.11.ebuild index c0369d48185c..c86f96421ec7 100644 --- a/games-strategy/boson/boson-0.11.ebuild +++ b/games-strategy/boson/boson-0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation and Thomas Capricelli # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.11.ebuild,v 1.4 2006/05/12 15:42:10 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.11.ebuild,v 1.5 2006/05/25 21:50:54 tupone Exp $ inherit kde @@ -22,6 +22,9 @@ need-kde 3 S=${WORKDIR}/${PN}-all-${PV} +PATCHES="${FILESDIR}/${P}"-gcc41.patch +PATCHES1="${FILESDIR}/${P}"-install.patch + src_compile() { myconf="$(use_with opengl gl)" MAKEOPTS="${MAKEOPTS} -j1" diff --git a/games-strategy/boson/files/boson-0.11-gcc41.patch b/games-strategy/boson/files/boson-0.11-gcc41.patch new file mode 100644 index 000000000000..f692b139578c --- /dev/null +++ b/games-strategy/boson/files/boson-0.11-gcc41.patch @@ -0,0 +1,10 @@ +--- ufo/include/ufo/gl/ugl_builtinfontrenderer.hpp ++++ ufo/include/ufo/gl/ugl_builtinfontrenderer.hpp +@@ -42,6 +42,7 @@ + + class UFontPlugin; + class UPluginBase; ++class UGL_BuiltinFontMetrics; + + // damn ms vc6 + struct UBuiltinFontStruct { diff --git a/games-strategy/boson/files/boson-0.11-install.patch b/games-strategy/boson/files/boson-0.11-install.patch new file mode 100644 index 000000000000..4d076c87f2d7 --- /dev/null +++ b/games-strategy/boson/files/boson-0.11-install.patch @@ -0,0 +1,11 @@ +--- themes/cursors/Makefile.in ++++ themes/cursors/Makefile.in +@@ -452,7 +452,7 @@ + if test -f $(srcdir)/$$i/$$f; then \ + $(INSTALL_DATA) $(srcdir)/$$i/$$f $(DESTDIR)$(cursordir)/$$i/$$f ;\ + fi \ +- done\ ++ done;\ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/games-strategy/boson/files/digest-boson-0.11 b/games-strategy/boson/files/digest-boson-0.11 index 4102e08d3c8f..a6e9b99449b9 100644 --- a/games-strategy/boson/files/digest-boson-0.11 +++ b/games-strategy/boson/files/digest-boson-0.11 @@ -1 +1,3 @@ MD5 1fc50d67fd5e6b8f52116155f7c2531d boson-all-0.11.tar.bz2 34512377 +RMD160 4b5e857287778bf62187083d2ba3c545844dda0f boson-all-0.11.tar.bz2 34512377 +SHA256 e8c0ac944bb1fd3cb74b1a66f47e73c3ca26ccb91a5f055256aa6d9e9d9d88ae boson-all-0.11.tar.bz2 34512377 -- cgit v1.2.3-65-gdbad