From 2b2433dae9ce4763fe4d2c62705b77e66dad50c1 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 14 Aug 2017 15:51:38 +0200 Subject: [PATCH] Wesnoth: make it run. - there is no libpango, so remove that from the requires. - fix an undefined reference after the game is installed. --- .../wesnoth/patches/wesnoth-1.12.6.patchset | 40 ++++++++++++++++++- games-strategy/wesnoth/wesnoth-1.12.6.recipe | 3 +- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/games-strategy/wesnoth/patches/wesnoth-1.12.6.patchset b/games-strategy/wesnoth/patches/wesnoth-1.12.6.patchset index 4cdbf5138..96d196717 100644 --- a/games-strategy/wesnoth/patches/wesnoth-1.12.6.patchset +++ b/games-strategy/wesnoth/patches/wesnoth-1.12.6.patchset @@ -1,4 +1,4 @@ -From 6cbcff90cfc6871c72d7bcb27b486db1dd18d948 Mon Sep 17 00:00:00 2001 +From 93c9db9b739c196b8e7707f29b640251f9b955d9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 26 Mar 2017 19:46:53 +0200 Subject: Hack in libnetwork. @@ -32,3 +32,41 @@ index 8b09e30..a2f40f6 100644 -- 2.7.0 + +From 64b8e91631d62acd90ef738432671b273d43648e Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 14 Aug 2017 15:50:37 +0200 +Subject: Fix undefined reference at runtime. + + +diff --git a/src/gui/auxiliary/tips.cpp b/src/gui/auxiliary/tips.cpp +index 65d2121..49cff12 100644 +--- a/src/gui/auxiliary/tips.cpp ++++ b/src/gui/auxiliary/tips.cpp +@@ -31,6 +31,10 @@ ttip::ttip(const t_string& text, + { + } + ++ttip::~ttip() ++{ ++} ++ + namespace tips + { + +diff --git a/src/gui/auxiliary/tips.hpp b/src/gui/auxiliary/tips.hpp +index 6b79955..397d1cf 100644 +--- a/src/gui/auxiliary/tips.hpp ++++ b/src/gui/auxiliary/tips.hpp +@@ -55,6 +55,8 @@ std::vector shuffle(const std::vector& tips); + class ttip + { + public: ++ ~ttip(); ++ + const t_string& text() const + { + return text_; +-- +2.7.0 + diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.recipe b/games-strategy/wesnoth/wesnoth-1.12.6.recipe index cc625ff36..c760a9e39 100644 --- a/games-strategy/wesnoth/wesnoth-1.12.6.recipe +++ b/games-strategy/wesnoth/wesnoth-1.12.6.recipe @@ -22,7 +22,7 @@ fantasy battles." HOMEPAGE="http://wesnoth.org/" COPYRIGHT="2003-2015 The Battle for Wesnoth" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="http://sourceforge.net/projects/wesnoth/files/wesnoth-1.12/wesnoth-$portVersion/wesnoth-$portVersion.tar.bz2" CHECKSUM_SHA256="a50f384cead15f68f31cfa1a311e76a12098428702cb674d3521eb169eb92e4e" PATCHES="wesnoth-$portVersion.patchset" @@ -50,7 +50,6 @@ REQUIRES=" lib:libgobject_2.0$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libpangocairo_1.0$secondaryArchSuffix - lib:libpango$secondaryArchSuffix lib:libsdl_1.2$secondaryArchSuffix lib:libsdl_image_1.2$secondaryArchSuffix lib:libsdl_mixer_1.2$secondaryArchSuffix