Wesnoth: make it run.

- there is no libpango, so remove that from the requires.
- fix an undefined reference after the game is installed.
This commit is contained in:
Adrien Destugues
2017-08-14 15:51:38 +02:00
parent 1e8cd3ff5c
commit 2b2433dae9
2 changed files with 40 additions and 3 deletions

View File

@@ -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 <pulkomandy@pulkomandy.tk>
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 <pulkomandy@pulkomandy.tk>
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<ttip> shuffle(const std::vector<ttip>& tips);
class ttip
{
public:
+ ~ttip();
+
const t_string& text() const
{
return text_;
--
2.7.0

View File

@@ -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