patch to work with wxGTK:3.0

(bug #564082)

Package-Manager: portage-2.2.20.1

2 files changed, 66 insertions, 0 deletions

diff --git a/games-board/blokish/blokish-0.9.4-r2.ebuild b/games-board/blokish/blokish-0.9.4-r2.ebuild
new file mode 100644
index 000000000000..8f3fabaea11a
--- /dev/null
+++ b/games-board/blokish/blokish-0.9.4-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils autotools wxwidgets games
+
+MY_P="${PN}_v${PV}"
+DESCRIPTION="Open source clone of the four-player board game Blokus"
+HOMEPAGE="http://sourceforge.net/projects/blokish/"
+SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	virtual/glu
+	virtual/opengl"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-wxgtk.patch
+	sed -i \
+		-e "s:wx-config:${WX_CONFIG}:" \
+		configure.in makefile.am || die
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	doicon src/${PN}.xpm
+	make_desktop_entry ${PN} Blokish ${PN}
+
+	dohtml docs/*
+	prepgamesdirs
+}
diff --git a/games-board/blokish/files/blokish-0.9.4-wxgtk.patch b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
new file mode 100644
index 000000000000..008702ee9976
--- /dev/null
+++ b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
@@ -0,0 +1,21 @@
+diff -ru blokish.orig/src/blokish.cpp blokish/src/blokish.cpp
+--- blokish.orig/src/blokish.cpp	2007-04-01 17:01:26.000000000 -0400
++++ blokish/src/blokish.cpp	2015-11-15 21:48:32.426081482 -0500
+@@ -903,7 +903,7 @@
+   void OnSaveGame(wxCommandEvent &event)
+   {
+ 		WaitForAIToFinish();
+-    wxString filename = wxFileSelector(wxString::FromAscii("Select a filename to save as"), wxString::FromAscii(""), wxString::FromAscii("default.sav"), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxSAVE);
++    wxString filename = wxFileSelector(wxString::FromAscii("Select a filename to save as"), wxString::FromAscii(""), wxString::FromAscii("default.sav"), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxFD_SAVE);
+     if(!filename.empty())
+     {
+       std::ofstream outFile(filename.fn_str(), std::ios::binary);
+@@ -915,7 +915,7 @@
+   void OnLoadGame(wxCommandEvent &event)
+   {
+ 		WaitForAIToFinish();
+-    wxString filename = wxFileSelector(wxString::FromAscii("Select a game to load"), wxString::FromAscii(""), wxString::FromAscii(""), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxOPEN | wxFILE_MUST_EXIST);
++    wxString filename = wxFileSelector(wxString::FromAscii("Select a game to load"), wxString::FromAscii(""), wxString::FromAscii(""), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+     if(!filename.empty())
+     {
+       std::ifstream inFile(filename.fn_str(), std::ios::binary);