Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/
Date: Sat, 09 May 2020 01:13:01
Message-Id: 1588986772.703cb390bc2c3788f1be67600330517265b7cd47.polynomial-c@gentoo
1 commit: 703cb390bc2c3788f1be67600330517265b7cd47
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 9 01:12:16 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat May 9 01:12:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703cb390
7
8 games-arcade/supertux: Bump to version 0.6.2_rc1
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 games-arcade/supertux/Manifest | 1 +
14 .../files/supertux-0.6.2_rc1-boost-1.73.patch | 25 +++++++++
15 games-arcade/supertux/supertux-0.6.2_rc1.ebuild | 61 ++++++++++++++++++++++
16 3 files changed, 87 insertions(+)
17
18 diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
19 index 8f44c648f7e..b2865395711 100644
20 --- a/games-arcade/supertux/Manifest
21 +++ b/games-arcade/supertux/Manifest
22 @@ -1,2 +1,3 @@
23 DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59 SHA512 7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
24 DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866 SHA512 9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
25 +DIST SuperTux-v0.6.2-rc.1-Source.tar.gz 172372034 BLAKE2B cd0825ba957bb8d3114ffefa623b32fce55467aef6ae2455fc3b7bf78ceeb58797a8ff7b2e920376e9ee1b7412ff3b5f7a9f238e2da8a9d99d9bf659d51d2ec4 SHA512 cc33e6340bbe0a7cc8f9bf11ebcecdf50e08d224de73837f5a34d67b7b4b739b1e9d148553198208cb097651d923696a28351c4ea40eaca7166b51657bb45113
26
27 diff --git a/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch b/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
28 new file mode 100644
29 index 00000000000..55fa95b70fb
30 --- /dev/null
31 +++ b/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
32 @@ -0,0 +1,25 @@
33 +From dec7fb943c532f855e5c0ae2eb39d2d82a46a506 Mon Sep 17 00:00:00 2001
34 +From: Lars Wendler <polynomial-c@g.o>
35 +Date: Sat, 9 May 2020 03:04:02 +0200
36 +Subject: [PATCH] Fix build with boost-1.73
37 +
38 +---
39 + src/editor/object_settings.hpp | 2 ++
40 + 1 file changed, 2 insertions(+)
41 +
42 +diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
43 +index bc9049a94..15b77b1e4 100644
44 +--- a/src/editor/object_settings.hpp
45 ++++ b/src/editor/object_settings.hpp
46 +@@ -22,6 +22,8 @@
47 +
48 + #include "editor/object_option.hpp"
49 +
50 ++#include <algorithm>
51 ++
52 + class Color;
53 + enum class Direction;
54 + enum class WalkMode;
55 +--
56 +2.26.2
57 +
58
59 diff --git a/games-arcade/supertux/supertux-0.6.2_rc1.ebuild b/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
60 new file mode 100644
61 index 00000000000..be67a6a7509
62 --- /dev/null
63 +++ b/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
64 @@ -0,0 +1,61 @@
65 +# Copyright 1999-2020 Gentoo Authors
66 +# Distributed under the terms of the GNU General Public License v2
67 +
68 +EAPI=7
69 +
70 +: ${CMAKE_MAKEFILE_GENERATOR:=emake}
71 +inherit cmake flag-o-matic
72 +
73 +MY_PV="${PV/_rc/-rc.}"
74 +MY_P="SuperTux-v${MY_PV}-Source"
75 +
76 +DESCRIPTION="A game similar to Super Mario Bros."
77 +HOMEPAGE="https://supertux.org/"
78 +SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
79 +
80 +LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
81 +SLOT="0"
82 +KEYWORDS="~amd64 ~x86"
83 +IUSE="debug"
84 +
85 +RDEPEND=">=dev-games/physfs-3.0
86 + dev-libs/boost:=
87 + media-libs/glew:=
88 + virtual/opengl
89 + media-libs/libvorbis
90 + media-libs/openal
91 + >=media-libs/libsdl2-2.0.1[joystick,video]
92 + >=media-libs/sdl2-image-2.0.0[png,jpeg]
93 + >=net-misc/curl-7.21.7"
94 +DEPEND="${RDEPEND}
95 + virtual/pkgconfig"
96 +
97 +S="${WORKDIR}/${MY_P}"
98 +
99 +PATCHES=(
100 + "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
101 + "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
102 + "${FILESDIR}"/${PN}-0.6.2_rc1-boost-1.73.patch
103 +)
104 +
105 +src_prepare() {
106 + cmake_src_prepare
107 +
108 + # This is not a developer release so switch the logo to the non-dev one.
109 + sed -e 's@logo_dev@logo@' \
110 + -i data/images/objects/logo/logo.sprite || die
111 +}
112 +
113 +src_configure() {
114 + append-cxxflags -std=c++11
115 +
116 + local mycmakeargs=(
117 + -DWERROR=OFF
118 + -DINSTALL_SUBDIR_BIN=bin
119 + -DINSTALL_SUBDIR_DOC=share/doc/${PF}
120 + -DINSTALL_SUBDIR_SHARE=share/${PN}2
121 + -DENABLE_SQDBG="$(usex debug)"
122 + -DUSE_SYSTEM_PHYSFS=ON
123 + )
124 + cmake_src_configure
125 +}