[gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/, games-strategy/colobot/files/

[gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/, games-strategy/colobot/files/

[Michał Górny]

commit:     075e0e10899dabb9e8c1dfc22b3b19a28a436c32
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 08:55:11 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 14 10:19:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075e0e10

games-strategy/colobot: Fix build failure due to missing include

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/colobot-0.1.12.ebuild       |  7 ++++++-
 .../colobot/files/colobot-0.1.12-includes.patch    | 23 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index 1611ef4a1d6..7f53954e401 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,11 @@ DEPEND="
 RDEPEND="${DEPEND}
 	games-strategy/colobot-data"
 
+PATCHES=(
+	# https://github.com/colobot/colobot/pull/1300
+	"${FILESDIR}"/${P}-includes.patch
+)
+
 src_prepare() {
 	cmake-utils_src_prepare
 

diff --git a/games-strategy/colobot/files/colobot-0.1.12-includes.patch b/games-strategy/colobot/files/colobot-0.1.12-includes.patch
new file mode 100644
index 00000000000..1fb3a2730c4
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.1.12-includes.patch
@@ -0,0 +1,23 @@
+From 2cfab017938e1cf44f633647eec2ccc2ed1da38b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 14 May 2020 10:35:01 +0200
+Subject: [PATCH] Fix missing <limits> include
+
+Add missing <limits> include for std::numeric_limits.  This fixes
+build failure after boost stopped implicitly including it for us.
+---
+ src/script/script.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/script/script.h b/src/script/script.h
+index bc64dc232..dd4e02ff4 100644
+--- a/src/script/script.h
++++ b/src/script/script.h
+@@ -27,6 +27,7 @@
+ #include "CBot/CBot.h"
+ 
+ #include <memory>
++#include <limits>
+ #include <string>
+ #include <boost/optional.hpp>
+ 

[gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/, games-strategy/colobot/files/

[Sam James]

commit:     d2083bcde987b24ea09164d7fb71d46bdc77adb2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 04:20:41 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 04:31:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2083bcd

games-strategy/colobot: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/899034
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/colobot/colobot-0.2.0_alpha.ebuild  |  4 +++-
 .../colobot/files/colobot-0.2.0_alpha-gcc13.patch  | 26 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
index b49ad40a24db..ceef225ca257 100644
--- a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
+++ b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,8 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	# https://github.com/colobot/colobot/pull/1453
 	"${FILESDIR}"/colobot-0.1.12-sndfile-link.patch
+	# https://github.com/colobot/colobot/pull/1576
+	"${FILESDIR}"/colobot-0.2.0_alpha-gcc13.patch
 )
 
 src_prepare() {

diff --git a/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch b/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch
new file mode 100644
index 000000000000..f74dcb56db25
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch
@@ -0,0 +1,26 @@
+https://github.com/colobot/colobot/pull/1576
+
+From 96d32db288ccd5ab13afdb2a063ad9e03170c4ee Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 19 Apr 2023 05:18:06 +0100
+Subject: [PATCH] Fix build with GCC 13
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
+are no longer transitively included.
+
+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Bug: https://bugs.gentoo.org/899034
+--- a/src/CBot/CBotFileUtils.h
++++ b/src/CBot/CBotFileUtils.h
+@@ -19,6 +19,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <iostream>
+ #include <string>
+ 
+-- 
+2.40.0
+

[gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/, games-strategy/colobot/files/

[Andreas Sturmlechner]

commit:     31d48a02e93b51307987c9d813c2e9a745146511
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 19:59:20 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 17:30:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d48a02

games-strategy/colobot: drop 0.2.0_alpha

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-strategy/colobot/Manifest                    |  1 -
 games-strategy/colobot/colobot-0.2.0_alpha.ebuild  | 77 ----------------------
 .../files/colobot-0.1.12-sndfile-link.patch        | 40 -----------
 .../colobot/files/colobot-0.2.0_alpha-gcc13.patch  | 26 --------
 .../colobot/files/colobot-0.2.0_alpha-werror.patch | 20 ------
 5 files changed, 164 deletions(-)

diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 206d428dd6b8..8f295403be8b 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,2 +1 @@
-DIST colobot-gold-0.2.0-alpha.tar.gz 1514455 BLAKE2B 9cc1480d342cfa14b12e437c41ce8e65b173cd30ca5f62e574ac17f452e6cd0622b5c2706fcfd427222cf78fce1700cb07b82fac75dd9b4a3ace4389ea3381bc SHA512 9c35ce6da319ef20ff68a9722f0b683adaa2fcada2b89bb322ba5772dfd9371adacd045ae160550780083902c024400c29e1d1f11dcb8b6547ba7d48e401c4c3
 DIST colobot-gold-0.2.1-alpha.tar.gz 1331366 BLAKE2B a4ff7eb10514b829a066654d6800cdf4ddf7c3331c60e8a552b78feb9e153bf666d1a16395be58e3093c98fc2caad8145fd436f66f5afc6b9f9c5d91e9094700 SHA512 cdfe410b30a89bd98513347ba64bbd0569d9f9f9227b063bf99c86101a099de0893b24c2d2e85e718ec0e64e0e428fb6dbdbf88d35f814d99ed31a7f3632f9cd

diff --git a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
deleted file mode 100644
index f16813414298..000000000000
--- a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-MY_P=colobot-gold-${PV/_/-}
-DESCRIPTION="A real-time strategy game, where you can program your bots"
-HOMEPAGE="https://colobot.info/"
-SRC_URI="https://github.com/colobot/colobot/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_P}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="devbuild doc +openal test tools"
-RESTRICT="!test? ( test )"
-
-# perl for pod2man
-BDEPEND="
-	app-text/po4a
-	dev-lang/perl
-	sys-devel/gettext"
-DEPEND="
-	dev-games/physfs
-	dev-libs/boost:=
-	media-libs/glew:0
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libsdl2:=
-	media-libs/libsndfile:=
-	media-libs/libvorbis:=
-	media-libs/sdl2-image
-	media-libs/sdl2-ttf
-	media-sound/vorbis-tools
-	openal? ( media-libs/openal )"
-RDEPEND="${DEPEND}
-	~games-strategy/colobot-data-${PV}"
-
-PATCHES=(
-	# https://github.com/colobot/colobot/pull/1453
-	"${FILESDIR}"/colobot-0.1.12-sndfile-link.patch
-	# https://github.com/colobot/colobot/pull/1576
-	"${FILESDIR}"/colobot-0.2.0_alpha-gcc13.patch
-	# No -Werror
-	"${FILESDIR}"/colobot-0.2.0_alpha-werror.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# we need to call it explicitly to help Ninja figure out the deps
-	cd desktop || die
-	po4a po4a.cfg || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEV_BUILD=$(usex devbuild)
-		-DTESTS=$(usex test)
-		-DTOOLS=$(usex tools)
-		-DINSTALL_DOCS=$(usex doc)
-		-DOPENAL_SOUND=$(usex openal)
-		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
-		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/games-strategy/colobot/files/colobot-0.1.12-sndfile-link.patch b/games-strategy/colobot/files/colobot-0.1.12-sndfile-link.patch
deleted file mode 100644
index 349bb91c487b..000000000000
--- a/games-strategy/colobot/files/colobot-0.1.12-sndfile-link.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f13ca0c15efc80da7034ae1d06224e31591cfc46 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 19 Aug 2021 09:11:16 +0200
-Subject: [PATCH] Fix missing linking to sndfile with OPENAL_SOUND=OFF
-
-Fix the CMake files to use sndfile even if OPENAL_SOUND is disabled.
-The package code (via sndfile_wrapper.cpp) uses sndfile unconditionally,
-and it currently fails to build with -DOPENAL_SOUND=OFF:
-
-    [293/293] Linking CXX executable colobot
-    FAILED: colobot
-    : && /usr/bin/c++ -std=gnu++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-declarations -Wno-error=deprecated-declarations -Wsuggest-override  -g -O0 -rdynamic src/CMakeFiles/colobot.dir/app/main.cpp.o -o colobot -L/tmp/colobot/src/CBot -Wl,-rpath,/tmp/colobot/src/CBot:/tmp/colobot/build/src/CBot:  src/libcolobotbase.a  src/CBot/libCBot.so  lib/localename/liblocalename.a  -Wl,-Bstatic  -lSDL2main  -Wl,-Bdynamic  -lSDL2  -lpthread  -lSDL2_image  -lSDL2_ttf  -lGL  -lGLU  -lpng  -lz  -lGLEW  /usr/lib64/libboost_system.so.1.76.0  /usr/lib64/libboost_filesystem.so.1.76.0  /usr/lib64/libboost_regex.so.1.76.0  -lphysfs && :
-    /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: src/libcolobotbase.a(sndfile_wrapper.cpp.o): undefined reference to symbol 'sf_close@@libsndfile.so.1.0'
-    /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib64/libsndfile.so.1: error adding symbols: DSO missing from command line
-    collect2: error: ld returned 1 exit status
-    ninja: build stopped: subcommand failed.
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90843488..95927733 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -303,10 +303,11 @@ find_package(Boost COMPONENTS system filesystem regex REQUIRED)
- 
- find_package(GLEW REQUIRED)
- 
-+find_package(LibSndFile REQUIRED)
-+
- if (OPENAL_SOUND)
-     find_package(OpenAL REQUIRED)
-     include_directories(${OPENAL_INCLUDE_DIR})
--    find_package(LibSndFile REQUIRED)
- endif()
- 
- 
--- 
-2.33.0
-

diff --git a/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch b/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch
deleted file mode 100644
index f74dcb56db25..000000000000
--- a/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/colobot/colobot/pull/1576
-
-From 96d32db288ccd5ab13afdb2a063ad9e03170c4ee Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 19 Apr 2023 05:18:06 +0100
-Subject: [PATCH] Fix build with GCC 13
-
-GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
-are no longer transitively included.
-
-See https://gnu.org/software/gcc/gcc-13/porting_to.html.
-
-Bug: https://bugs.gentoo.org/899034
---- a/src/CBot/CBotFileUtils.h
-+++ b/src/CBot/CBotFileUtils.h
-@@ -19,6 +19,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <iostream>
- #include <string>
- 
--- 
-2.40.0
-

diff --git a/games-strategy/colobot/files/colobot-0.2.0_alpha-werror.patch b/games-strategy/colobot/files/colobot-0.2.0_alpha-werror.patch
deleted file mode 100644
index b326a0c0f7af..000000000000
--- a/games-strategy/colobot/files/colobot-0.2.0_alpha-werror.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -155,7 +155,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- 
-     message(STATUS "Detected GCC version 4.7+")
- 
--    set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-declarations")
-+    set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wall -Wold-style-cast -pedantic-errors -Wmissing-declarations")
-     set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
- 
-     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
-@@ -177,7 +177,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
-     endif()
- 
--    set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
-+    set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
-     set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
-     set(RELEASE_CXX_FLAGS "-O2")
-     set(DEBUG_CXX_FLAGS "-g -O0")