[gentoo-commits] repo/gentoo:master commit in: games-strategy/endless-sky/, games-strategy/endless-sky/files/
commit: 466dd3ad91db9f2259c687f52f87835e45e191b9
Author: Sam James gentoo org>
AuthorDate: Thu Jan 6 23:59:40 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 7 00:01:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466dd3ad
games-strategy/endless-sky: don't compress man page; use system catch2
- Don't compress man page
- Use system copy of Catch 2 for tests (works w/ glibc-2.34 now, didn't
notice earlier b/c tested on a stable box); still not running tests yet,
need to resolve linking issue.
- Respect AR
Signed-off-by: Sam James gentoo.org>
games-strategy/endless-sky/endless-sky-0.9.14.ebuild | 9 +++--
.../endless-sky-0.9.14-dont-compress-man-page.patch | 20
.../files/endless-sky-0.9.14-use-system-catch2.patch | 14 ++
3 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
b/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
index f0f7509aa8a8..0a6641ac67ee 100644
--- a/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
+++ b/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
@@ -13,6 +13,8 @@
SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz -> ${P
LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
# Needs work; doesn't link against SDL 2
RESTRICT="test"
@@ -24,15 +26,18 @@ RDEPEND="media-libs/glew:0=
media-libs/libpng:=
media-libs/openal
virtual/opengl"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/catch:0 )"
PATCHES=(
"${FILESDIR}"/${PN}-0.9.14-respect-cflags.patch
"${FILESDIR}"/${PN}-0.9.14-no-games-path.patch
+ "${FILESDIR}"/${PN}-0.9.14-dont-compress-man-page.patch
+ "${FILESDIR}"/${PN}-0.9.14-use-system-catch2.patch
)
src_compile() {
- tc-export CXX
+ tc-export AR CXX
escons
}
diff --git
a/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
new file mode 100644
index ..d3836c088f31
--- /dev/null
+++
b/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
@@ -0,0 +1,20 @@
+From 07f273e6f72a01158934158c3e8ff84c530367c9 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Thu, 6 Jan 2022 23:57:32 +
+Subject: [PATCH 2/2] Don't compress man page
+
+--- a/SConstruct
b/SConstruct
+@@ -176,10 +176,9 @@ if env.get("PREFIX").startswith("/usr/"):
+ "gtk-update-icon-cache -t $DESTDIR$PREFIX/share/icons/hicolor/")
+
+ # Install the man page.
+-env.Command(
++env.Install(
+ "$DESTDIR$PREFIX/share/man/man6/endless-sky.6.gz",
+- "endless-sky.6",
+- "gzip -c $SOURCE > $TARGET")
++ "endless-sky.6")
+
+ # Install the data files.
+ def RecursiveInstall(env, target, source):
diff --git
a/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch
new file mode 100644
index ..9b38e28a60fe
--- /dev/null
+++
b/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch
@@ -0,0 +1,14 @@
+From e8119dcdcb42479896a35cec5dc85c17c1901b2e Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Thu, 6 Jan 2022 23:56:59 +
+Subject: [PATCH 1/2] Use system copy of catch2
+
+In particular, we get glibc-2.34 fixes for free then.
+--- a/tests/include/es-test.hpp
b/tests/include/es-test.hpp
+@@ -23,4 +23,4 @@ PARTICULAR PURPOSE. See the GNU General Public License for
more details.
+ // #define CATCH_CONFIG_WINDOWS_CRTDBG
+ #endif
+
+-#include "catch.hpp"
++#include
[gentoo-commits] repo/gentoo:master commit in: games-strategy/endless-sky/, games-strategy/endless-sky/files/
commit: db521d678981944d99b3aa4e81c741d30bded791
Author: Sam James gentoo org>
AuthorDate: Wed Apr 19 03:07:02 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 19 03:07:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db521d67
games-strategy/endless-sky: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/894782
Signed-off-by: Sam James gentoo.org>
.../endless-sky/endless-sky-0.9.16.1.ebuild| 1 +
.../files/endless-sky-0.9.16.1-gcc13.patch | 45 ++
2 files changed, 46 insertions(+)
diff --git a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
index 3d0b78c57dff..709d7de7ed87 100644
--- a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
+++ b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.9.14-dont-compress-man-page.patch
"${FILESDIR}"/${PN}-0.9.16.1-respect-cflags.patch
"${FILESDIR}"/${PN}-0.9.16.1-test-libs.patch
+ "${FILESDIR}"/${PN}-0.9.16.1-gcc13.patch
)
src_compile() {
diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch
new file mode 100644
index ..428e67da568e
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/894782
+https://github.com/endless-sky/endless-sky/commit/a85df936c24feba6eb5f7f484c160aff0a60d6cb
+https://github.com/endless-sky/endless-sky/commit/7483f72cc72511786ba3aac13b4cbe0848a2aefc
+
+From a85df936c24feba6eb5f7f484c160aff0a60d6cb Mon Sep 17 00:00:00 2001
+From: Heiko Becker
+Date: Sat, 28 Jan 2023 16:29:40 +0100
+Subject: [PATCH] chore: Fix build with gcc 13 by including (#8235)
+
+--- a/source/ImageBuffer.h
b/source/ImageBuffer.h
+@@ -16,6 +16,7 @@ this program. If not, see
[gentoo-commits] repo/gentoo:master commit in: games-strategy/endless-sky/, games-strategy/endless-sky/files/
commit: fe9c8bf4085e3d78dd6589d4884a57b1714fe0b3
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Feb 24 09:08:39 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Feb 24 09:26:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9c8bf4
games-strategy/endless-sky: drop 0.9.14
Signed-off-by: Ionen Wolkens gentoo.org>
games-strategy/endless-sky/Manifest| 1 -
.../endless-sky/endless-sky-0.9.14.ebuild | 64 --
.../files/endless-sky-0.9.14-respect-cflags.patch | 20 ---
.../endless-sky-0.9.14-use-system-catch2.patch | 14 -
4 files changed, 99 deletions(-)
diff --git a/games-strategy/endless-sky/Manifest
b/games-strategy/endless-sky/Manifest
index 3c3a337e0421..c978ae4a65e1 100644
--- a/games-strategy/endless-sky/Manifest
+++ b/games-strategy/endless-sky/Manifest
@@ -1,2 +1 @@
-DIST endless-sky-0.9.14.tar.gz 124358153 BLAKE2B
5845c3b595f0feba7fc5f6ce1ead88b34e9426c3db53cf013fc67f9197d2cabad8fae39056fa6f4d6da76fceb43a9709397b95daba855d1b1ebf3c25a04ba007
SHA512
861fddc8e2f167d335247f3ce1efb59bb4a5951cb0aa5e4a10517fded096db7e69ac17cf0e813f2a1ec040bef57c5d6b6e8e90d952debc9b2caa38d1fb91abe5
DIST endless-sky-0.9.16.1.tar.gz 184582283 BLAKE2B
3c35df96b54546811713b123bf43993df6ba5271988decd7408722263c2edd904c84888db61c2d22554b3f60edebd25db7913e7784f309ff936d37c815bc6650
SHA512
83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56
diff --git a/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
b/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
deleted file mode 100644
index 8a815e3b53e5..
--- a/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-inherit python-any-r1 scons-utils toolchain-funcs xdg
-
-DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal
Velocity"
-HOMEPAGE="https://endless-sky.github.io";
-SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Needs work; doesn't link against SDL 2
-RESTRICT="test"
-
-RDEPEND="media-libs/glew:0=
- media-libs/libsdl2
- media-libs/libjpeg-turbo:=
- media-libs/libmad
- media-libs/libpng:=
- media-libs/openal
- virtual/opengl"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/catch:0 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.14-respect-cflags.patch
- "${FILESDIR}"/${PN}-0.9.14-no-games-path.patch
- "${FILESDIR}"/${PN}-0.9.14-dont-compress-man-page.patch
- "${FILESDIR}"/${PN}-0.9.14-use-system-catch2.patch
-)
-
-src_compile() {
- tc-export AR CXX
-
- escons
-}
-
-src_test() {
- escons test
-}
-
-src_install() {
- escons PREFIX="${ED}"/usr/ install
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- einfo "Endless Sky provides high-res sprites for high-dpi screens."
- einfo "If you want to use them, download"
- einfo
- einfo " https://github.com/endless-sky/endless-sky-high-dpi/releases";
- einfo
- einfo "and extract it to ~/.local/share/endless-sky/plugins/."
- einfo
- einfo "Enjoy."
-}
diff --git
a/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch
deleted file mode 100644
index 8bea82409af0..
--- a/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://src.fedoraproject.org/rpms/endless-sky/raw/rawhide/f/endless-sky-0.9.14-remove-additional-ccflags.patch
a/SConstruct
-+++ b/SConstruct
-@@ -46,15 +46,7 @@
- # $ CXXFLAGS=-msse3 scons
- # $ CXXFLAGS=-march=native scons
- # or modify the `flags` variable:
--flags = ["-std=c++11", "-Wall", "-Werror", "-Wold-style-cast"]
--if env["mode"] != "debug":
-- flags += ["-O3", "-flto"]
-- env.Append(LINKFLAGS = ["-O3", "-flto"])
--if env["mode"] == "debug":
-- flags += ["-g"]
--elif env["mode"] == "profile":
-- flags += ["-pg"]
-- env.Append(LINKFLAGS = ["-pg"])
-+flags = ["-std=c++11"]
- env.Append(CCFLAGS = flags)
-
- # Always use `ar` to create the symbol table, and don't use ranlib at all,
since it fails to preserve
diff --git
a/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch
deleted file mode 100644
index 9b38e28a60fe..
---
a/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From e8119dcdcb42479896a35cec5dc85c17c1901b2e Mon Sep
