subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: games\-arcade\/supertux\/files\/, games\-arcade\/supertux\/"

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2022-12-04 Thread Pacho Ramos

commit: 6975aded48ce0b855445ead7203905795daee608
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Dec  4 21:16:56 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Dec  4 21:23:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6975aded

games-arcade/supertux: Fix CVE-2021-41556

Bug: https://bugs.gentoo.org/843008
Signed-off-by: Pacho Ramos  gentoo.org>

 .../supertux-0.6.3-squirrel-CVE-2021-41556.patch   | 36 
 games-arcade/supertux/supertux-0.6.3-r2.ebuild | 64 ++
 2 files changed, 100 insertions(+)

diff --git 
a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch 
b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch
new file mode 100644
index ..a63e7a6c4e69
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch
@@ -0,0 +1,36 @@
+From 23a0620658714b996d20da3d4dd1a0dcf9b0bd98 Mon Sep 17 00:00:00 2001
+From: albertodemichelis 
+Date: Thu, 16 Sep 2021 22:36:53 +0800
+Subject: [PATCH] check max member count in class
+
+---
+ squirrel/sqclass.cpp | 3 +++
+ squirrel/sqclass.h   | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/squirrel/sqclass.cpp b/squirrel/sqclass.cpp
+index fc619616..53a29763 100644
+--- a/external/squirrel/squirrel/sqclass.cpp
 b/external/squirrel/squirrel/sqclass.cpp
+@@ -61,6 +61,9 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr 
,const SQObjectPtr
+ _defaultvalues[_member_idx(temp)].val = val;
+ return true;
+ }
++  if (_members->CountUsed() >= MEMBER_MAX_COUNT) {
++  return false;
++  }
+ if(belongs_to_static_table) {
+ SQInteger mmidx;
+ if((sq_type(val) == OT_CLOSURE || sq_type(val) == OT_NATIVECLOSURE) &&
+diff --git a/squirrel/sqclass.h b/squirrel/sqclass.h
+index 7d402172..60d3d21b 100644
+--- a/external/squirrel/squirrel/sqclass.h
 b/external/squirrel/squirrel/sqclass.h
+@@ -17,6 +17,7 @@ typedef sqvector SQClassMemberVec;
+ 
+ #define MEMBER_TYPE_METHOD 0x0100
+ #define MEMBER_TYPE_FIELD 0x0200
++#define MEMBER_MAX_COUNT 0x00FF
+ 
+ #define _ismethod(o) (_integer(o)_TYPE_METHOD)
+ #define _isfield(o) (_integer(o)_TYPE_FIELD)

diff --git a/games-arcade/supertux/supertux-0.6.3-r2.ebuild 
b/games-arcade/supertux/supertux-0.6.3-r2.ebuild
new file mode 100644
index ..2126e741ddad
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.3-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake
+
+MY_PV="${PV/_rc/-rc.}"
+MY_P="SuperTux-v${MY_PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros"
+HOMEPAGE="https://www.supertux.org;
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
+# content of ${HOME} to ${HOME}/.local/share/supertux2/
+# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
+RDEPEND="
+   !=media-libs/libsdl2-2.0.14-r0
+   >=dev-games/physfs-3.0
+   dev-libs/boost:=[nls]
+   media-libs/freetype
+   media-libs/glew:=
+   media-libs/libpng:0=
+   >=media-libs/libsdl2-2.0.1[joystick,video]
+   media-libs/libvorbis
+   media-libs/openal
+   >=media-libs/sdl2-image-2.0.0[png,jpeg]
+   >=net-misc/curl-7.21.7
+   virtual/opengl
+"
+DEPEND="${RDEPEND}
+   media-libs/glm"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+   "${FILESDIR}"/${PN}-0.6.3-missing-include.patch
+   "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2021-41556.patch
+   "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2022-30292.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DWERROR=OFF
+   -DINSTALL_SUBDIR_BIN=bin
+   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+   -DINSTALL_SUBDIR_SHARE=share/${PN}2
+   -DENABLE_SQDBG="$(usex debug)"
+   -DUSE_SYSTEM_PHYSFS=ON
+   -DIS_SUPERTUX_RELEASE=ON
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2022-12-04 Thread Pacho Ramos

commit: 866ce00a7cae59ca2c77650addabc3128127ecb8
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Dec  4 14:47:55 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Dec  4 14:49:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866ce00a

games-arcade/supertux: Fix CVE-2022-30292

For 0.6.3 we need to patch the bundled squirrel copy, in next upstream
versions it should be possible to finally build it against system copy.

Bug: https://bugs.gentoo.org/843008
Signed-off-by: Pacho Ramos  gentoo.org>

 .../supertux-0.6.3-squirrel-CVE-2022-30292.patch   | 21 
 games-arcade/supertux/supertux-0.6.3-r1.ebuild | 63 ++
 2 files changed, 84 insertions(+)

diff --git 
a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch 
b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch
new file mode 100644
index ..0a605616d606
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch
@@ -0,0 +1,21 @@
+From a6413aa690e0bdfef648c68693349a7b878fe60d Mon Sep 17 00:00:00 2001
+From: Alberto Demichelis 
+Date: Mon, 2 May 2022 12:04:58 +0200
+Subject: [PATCH] fix in thread.call
+
+---
+ squirrel/sqbaselib.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/external/squirrel/squirrel/sqbaselib.cpp 
b/external/squirrel/squirrel/sqbaselib.cpp
+index 8eff97c..5055f18 100644
+--- a/external/squirrel/squirrel/sqbaselib.cpp
 b/external/squirrel/squirrel/sqbaselib.cpp
+@@ -1149,6 +1149,7 @@ static SQInteger thread_call(HSQUIRRELVM v)
+ SQObjectPtr o = stack_get(v,1);
+ if(sq_type(o) == OT_THREAD) {
+ SQInteger nparams = sq_gettop(v);
++sq_reservestack(_thread(o), nparams + 3);
+ _thread(o)->Push(_thread(o)->_roottable);
+ for(SQInteger i = 2; i<(nparams+1); i++)
+ sq_move(_thread(o),v,i);

diff --git a/games-arcade/supertux/supertux-0.6.3-r1.ebuild 
b/games-arcade/supertux/supertux-0.6.3-r1.ebuild
new file mode 100644
index ..e670bfd6f25a
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake
+
+MY_PV="${PV/_rc/-rc.}"
+MY_P="SuperTux-v${MY_PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros"
+HOMEPAGE="https://www.supertux.org;
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
+# content of ${HOME} to ${HOME}/.local/share/supertux2/
+# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
+RDEPEND="
+   !=media-libs/libsdl2-2.0.14-r0
+   >=dev-games/physfs-3.0
+   dev-libs/boost:=[nls]
+   media-libs/freetype
+   media-libs/glew:=
+   media-libs/libpng:0=
+   >=media-libs/libsdl2-2.0.1[joystick,video]
+   media-libs/libvorbis
+   media-libs/openal
+   >=media-libs/sdl2-image-2.0.0[png,jpeg]
+   >=net-misc/curl-7.21.7
+   virtual/opengl
+"
+DEPEND="${RDEPEND}
+   media-libs/glm"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+   "${FILESDIR}"/${PN}-0.6.3-missing-include.patch
+   "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2022-30292.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DWERROR=OFF
+   -DINSTALL_SUBDIR_BIN=bin
+   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+   -DINSTALL_SUBDIR_SHARE=share/${PN}2
+   -DENABLE_SQDBG="$(usex debug)"
+   -DUSE_SYSTEM_PHYSFS=ON
+   -DIS_SUPERTUX_RELEASE=ON
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2022-05-07 Thread David Seifert

commit: 35788251d79b5b511dab4ebd05c4da3377e92b33
Author: David Seifert  gentoo  org>
AuthorDate: Sat May  7 10:54:23 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May  7 10:54:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35788251

games-arcade/supertux: fix GCC 12 build

Closes: https://bugs.gentoo.org/840269
Signed-off-by: David Seifert  gentoo.org>

 .../supertux/files/supertux-0.6.3-missing-include.patch| 10 ++
 games-arcade/supertux/supertux-0.6.3.ebuild| 10 --
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch 
b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch
new file mode 100644
index ..4515c9a6003f
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/external/partio_zip/zip_manager.hpp
 b/external/partio_zip/zip_manager.hpp
+@@ -41,6 +41,7 @@
+ #ifndef __ZIP__
+ #define __ZIP__
+ 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/games-arcade/supertux/supertux-0.6.3.ebuild 
b/games-arcade/supertux/supertux-0.6.3.ebuild
index 0a9fb27d74ef..173ea4e074c1 100644
--- a/games-arcade/supertux/supertux-0.6.3.ebuild
+++ b/games-arcade/supertux/supertux-0.6.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 #: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake flag-o-matic
+inherit cmake
 
 MY_PV="${PV/_rc/-rc.}"
 MY_P="SuperTux-v${MY_PV}-Source"
@@ -12,6 +12,7 @@ MY_P="SuperTux-v${MY_PV}-Source"
 DESCRIPTION="A game similar to Super Mario Bros"
 HOMEPAGE="https://supertux.org/;
 
SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
 SLOT="0"
@@ -41,16 +42,13 @@ BDEPEND="
virtual/pkgconfig
 "
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+   "${FILESDIR}"/${PN}-0.6.3-missing-include.patch
 )
 
 src_configure() {
-   append-cxxflags -std=c++11
-
local mycmakeargs=(
-DWERROR=OFF
-DINSTALL_SUBDIR_BIN=bin

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2020-05-15 Thread Lars Wendler

commit: f3051f1c8d29f98f52b83d003e070efbf456e7d3
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 15 06:42:34 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 15 06:42:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3051f1c

games-arcade/supertux: Bump to version 0.6.2. Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest |  2 +-
 .../files/supertux-0.6.2_rc1-boost-1.73.patch  | 25 --
 ...rtux-0.6.2_rc1.ebuild => supertux-0.6.2.ebuild} |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 7ecf8ae966a..eaa21f15255 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1,2 @@
 DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 
313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866
 SHA512 
9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
-DIST SuperTux-v0.6.2-rc.1-Source.tar.gz 172372034 BLAKE2B 
cd0825ba957bb8d3114ffefa623b32fce55467aef6ae2455fc3b7bf78ceeb58797a8ff7b2e920376e9ee1b7412ff3b5f7a9f238e2da8a9d99d9bf659d51d2ec4
 SHA512 
cc33e6340bbe0a7cc8f9bf11ebcecdf50e08d224de73837f5a34d67b7b4b739b1e9d148553198208cb097651d923696a28351c4ea40eaca7166b51657bb45113
+DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 
1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708
 SHA512 
5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74

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
deleted file mode 100644
index 55fa95b70fb..000
--- a/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dec7fb943c532f855e5c0ae2eb39d2d82a46a506 Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-Date: Sat, 9 May 2020 03:04:02 +0200
-Subject: [PATCH] Fix build with boost-1.73
-

- src/editor/object_settings.hpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
-index bc9049a94..15b77b1e4 100644
 a/src/editor/object_settings.hpp
-+++ b/src/editor/object_settings.hpp
-@@ -22,6 +22,8 @@
- 
- #include "editor/object_option.hpp"
- 
-+#include 
-+
- class Color;
- enum class Direction;
- enum class WalkMode;
--- 
-2.26.2
-

diff --git a/games-arcade/supertux/supertux-0.6.2_rc1.ebuild 
b/games-arcade/supertux/supertux-0.6.2.ebuild
similarity index 96%
rename from games-arcade/supertux/supertux-0.6.2_rc1.ebuild
rename to games-arcade/supertux/supertux-0.6.2.ebuild
index be67a6a7509..a107f3e14c2 100644
--- a/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2.ebuild
@@ -35,7 +35,6 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-   "${FILESDIR}"/${PN}-0.6.2_rc1-boost-1.73.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2020-05-08 Thread Lars Wendler

commit: 703cb390bc2c3788f1be67600330517265b7cd47
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat May  9 01:12:16 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat May  9 01:12:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703cb390

games-arcade/supertux: Bump to version 0.6.2_rc1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest |  1 +
 .../files/supertux-0.6.2_rc1-boost-1.73.patch  | 25 +
 games-arcade/supertux/supertux-0.6.2_rc1.ebuild| 61 ++
 3 files changed, 87 insertions(+)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 8f44c648f7e..b2865395711 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1,3 @@
 DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 
196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59
 SHA512 
7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
 DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 
313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866
 SHA512 
9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
+DIST SuperTux-v0.6.2-rc.1-Source.tar.gz 172372034 BLAKE2B 
cd0825ba957bb8d3114ffefa623b32fce55467aef6ae2455fc3b7bf78ceeb58797a8ff7b2e920376e9ee1b7412ff3b5f7a9f238e2da8a9d99d9bf659d51d2ec4
 SHA512 
cc33e6340bbe0a7cc8f9bf11ebcecdf50e08d224de73837f5a34d67b7b4b739b1e9d148553198208cb097651d923696a28351c4ea40eaca7166b51657bb45113

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
new file mode 100644
index 000..55fa95b70fb
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
@@ -0,0 +1,25 @@
+From dec7fb943c532f855e5c0ae2eb39d2d82a46a506 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Sat, 9 May 2020 03:04:02 +0200
+Subject: [PATCH] Fix build with boost-1.73
+
+---
+ src/editor/object_settings.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
+index bc9049a94..15b77b1e4 100644
+--- a/src/editor/object_settings.hpp
 b/src/editor/object_settings.hpp
+@@ -22,6 +22,8 @@
+ 
+ #include "editor/object_option.hpp"
+ 
++#include 
++
+ class Color;
+ enum class Direction;
+ enum class WalkMode;
+-- 
+2.26.2
+

diff --git a/games-arcade/supertux/supertux-0.6.2_rc1.ebuild 
b/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
new file mode 100644
index 000..be67a6a7509
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake flag-o-matic
+
+MY_PV="${PV/_rc/-rc.}"
+MY_P="SuperTux-v${MY_PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros."
+HOMEPAGE="https://supertux.org/;
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-games/physfs-3.0
+   dev-libs/boost:=
+   media-libs/glew:=
+   virtual/opengl
+   media-libs/libvorbis
+   media-libs/openal
+   >=media-libs/libsdl2-2.0.1[joystick,video]
+   >=media-libs/sdl2-image-2.0.0[png,jpeg]
+   >=net-misc/curl-7.21.7"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+   "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+   "${FILESDIR}"/${PN}-0.6.2_rc1-boost-1.73.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   # This is not a developer release so switch the logo to the non-dev one.
+   sed -e 's@logo_dev@logo@' \
+   -i data/images/objects/logo/logo.sprite || die
+}
+
+src_configure() {
+   append-cxxflags -std=c++11
+
+   local mycmakeargs=(
+   -DWERROR=OFF
+   -DINSTALL_SUBDIR_BIN=bin
+   -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+   -DINSTALL_SUBDIR_SHARE=share/${PN}2
+   -DENABLE_SQDBG="$(usex debug)"
+   -DUSE_SYSTEM_PHYSFS=ON
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2018-12-25 Thread Lars Wendler

commit: 835d16aaf608ed4bb5e2a008279d1ec903581c60
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Dec 25 14:53:18 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Dec 25 14:53:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835d16aa

games-arcade/supertux: Bump to version 0.6.0

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest |  1 +
 .../supertux/files/supertux-0.6.0-icon.patch   | 11 
 .../supertux/files/supertux-0.6.0-license.patch| 11 
 .../supertux/files/supertux-0.6.0-obstack.patch| 19 +++
 games-arcade/supertux/supertux-0.6.0.ebuild| 60 ++
 5 files changed, 102 insertions(+)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 3451c717190..02fccc57d69 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1 +1,2 @@
 DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B 
ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123
 SHA512 
1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
+DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 
196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59
 SHA512 
7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b

diff --git a/games-arcade/supertux/files/supertux-0.6.0-icon.patch 
b/games-arcade/supertux/files/supertux-0.6.0-icon.patch
new file mode 100644
index 000..aac503c8cc9
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.0-icon.patch
@@ -0,0 +1,11 @@
+--- SuperTux-v0.6.0-Source/CMakeLists.txt
 SuperTux-v0.6.0-Source/CMakeLists.txt
+@@ -846,7 +846,7 @@
+ install(FILES ${DLLS} DESTINATION ${INSTALL_SUBDIR_BIN})
+   endif()
+ 
+-  install(FILES 
${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png 
${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.ico DESTINATION 
".")
++  install(FILES 
${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION 
".")
+ 
+   option(PACKAGE_VCREDIST "Package the VCREDIST libraries with the program" 
OFF)
+ 

diff --git a/games-arcade/supertux/files/supertux-0.6.0-license.patch 
b/games-arcade/supertux/files/supertux-0.6.0-license.patch
new file mode 100644
index 000..600a3fd0c96
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.0-license.patch
@@ -0,0 +1,11 @@
+--- SuperTux-v0.6.0-Source/CMakeLists.txt
 SuperTux-v0.6.0-Source/CMakeLists.txt
+@@ -895,7 +895,7 @@
+   install(FILES ${SQUIRREL_LIB_PATH} ${SQSTDLIB_LIB_PATH} ${PHYSFS_LIB_PATH} 
DESTINATION ${INSTALL_SUBDIR_BIN})
+ endif()
+ 
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md 
${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt 
${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md 
${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md 
DESTINATION ${INSTALL_SUBDIR_DOC})
+ 
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.stxt DESTINATION 
${INSTALL_SUBDIR_SHARE})
+ 

diff --git a/games-arcade/supertux/files/supertux-0.6.0-obstack.patch 
b/games-arcade/supertux/files/supertux-0.6.0-obstack.patch
new file mode 100644
index 000..a46ca3afd12
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.0-obstack.patch
@@ -0,0 +1,19 @@
+--- SuperTux-v0.6.0-Source/CMakeLists.txt
 SuperTux-v0.6.0-Source/CMakeLists.txt
+@@ -470,7 +470,6 @@
+ include_directories(${CMAKE_BINARY_DIR}/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
+-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
+ include_directories(SYSTEM 
${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/)
+ 
+@@ -481,7 +480,7 @@
+ 
+ ## Build list of sources for supertux binary
+ 
+-file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/obstack/*.c external/findlocale/findlocale.c)
++file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/findlocale/findlocale.c)
+ 
+ file(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp src/video/null/*.cpp)
+ file(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
"${PROJECT_BINARY_DIR}/tmp/*.rc")

diff --git a/games-arcade/supertux/supertux-0.6.0.ebuild 
b/games-arcade/supertux/supertux-0.6.0.ebuild
new file mode 100644
index 000..2fc8444ed9d
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

2016-09-27 Thread Lars Wendler

commit: fde5a5b1a939c074227d7e0830991566d7df316e
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Sep 27 10:47:34 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Sep 27 11:55:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde5a5b1

games-arcade/supertux: Bump to version 0.5.0

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler  gentoo.org>

 games-arcade/supertux/Manifest |  1 +
 .../supertux/files/supertux-0.4.0-desktop.patch|  4 +-
 .../supertux/files/supertux-0.4.0-flags.patch  |  4 +-
 .../supertux/files/supertux-0.4.0-icon.patch   |  4 +-
 .../supertux/files/supertux-0.4.0-license.patch|  4 +-
 .../supertux/files/supertux-0.5.0-obstack.patch| 19 ++
 .../files/supertux-0.5.0-tinygettext.patch | 30 ++
 games-arcade/supertux/supertux-0.5.0.ebuild| 67 ++
 8 files changed, 125 insertions(+), 8 deletions(-)

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 30519d3..d638673 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1 +1,2 @@
+DIST SuperTux-v0.5.0-Source.tar.gz 90564579 SHA256 
cfae0da40c41532fb414c3b17891c98396b59471fe583a8fc756b96aea61a73b SHA512 
dcd4d361eee34d8ab25e680cec328b0931a001f8ab97d0b40b03291e9214fdb64cc08fbccb81f524e5f6ba9921414bdf58dc29e27ff663a0160f678b6908b783
 WHIRLPOOL 
ffee5ad36bc305e9df5f9e4a31d3ea5bfb6684ee8c91ced44ed072e5262dd2c8e4fff676fd5abc2bdfa6ab942ec5d18b6864ebe0882eb3d0f78213e14fa51eb3
 DIST supertux-0.4.0.tar.bz2 79713147 SHA256 
d18dde3c415e619b4bb035e694ffc384be16576250c9df16929d9ec38daff782 SHA512 
66ca63c982b6076847662c187069eb965211439e5dfc628300f2a9bd0d2b4c0f7b53f6e7c2aed263c098cc9b77fedf132e73b1f3b3eacaf5535cae8300262fb5
 WHIRLPOOL 
12551b655f0459a37d3b91b1eff058ec383df34c9f3c29c1e8a63c070c12b32ec798b772053cd08b11d32b612bab1188b69678e71585279e94ad380052076f64

diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch 
b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
index b0e26e7..74a0872 100644
--- a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
+++ b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
@@ -1,5 +1,5 @@
 supertux2.desktop.orig
-+++ supertux2.desktop
+--- a/supertux2.desktop
 b/supertux2.desktop
 @@ -35,7 +35,7 @@
  Comment[pt]=Joga este clássico de plataformas 2D
  Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de 
Pular

diff --git a/games-arcade/supertux/files/supertux-0.4.0-flags.patch 
b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
index 97e3e74..a09176c 100644
--- a/games-arcade/supertux/files/supertux-0.4.0-flags.patch
+++ b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
@@ -1,5 +1,5 @@
 CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -329,7 +329,7 @@
  endif(COMPILER_SUPPORTS_CXX11)
  

diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch 
b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
index 14552f2..66be0eb 100644
--- a/games-arcade/supertux/files/supertux-0.4.0-icon.patch
+++ b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
@@ -1,5 +1,5 @@
 CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -571,7 +571,7 @@
  
SET(APPS 
"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")

diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch 
b/games-arcade/supertux/files/supertux-0.4.0-license.patch
index 37558aa..e35f85c 100644
--- a/games-arcade/supertux/files/supertux-0.4.0-license.patch
+++ b/games-arcade/supertux/files/supertux-0.4.0-license.patch
@@ -1,5 +1,5 @@
 CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -578,7 +578,7 @@
  
  INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})

diff --git a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch 
b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
new file mode 100644
index ..1b05369
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
@@ -0,0 +1,19 @@
+--- supertux-0.5.0/CMakeLists.txt
 supertux-0.5.0/CMakeLists.txt
+@@ -382,7 +382,6 @@
+ include_directories(${CMAKE_BINARY_DIR}/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
+-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
+ include_directories(SYSTEM 
${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
+ 
+ IF(WIN32)
+@@ -392,7 +391,7 @@
+ 
+ ## Build list of sources for supertux binary
+ 
+-FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/obstack/*.c external/findlocale/findlocale.c)
++FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
external/findlocale/findlocale.c)
+ 
+ FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/

7 matches

Site Navigation

Mail list logo

Footer information