summaryrefslogtreecommitdiff
path: root/games-strategy/widelands
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-12-02 08:55:38 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-12-02 08:55:38 +0000
commit5a1e5a6812ca9c9555657cce48fe09d2ffa44401 (patch)
tree5c040bbee9184b24f26b05031a2448e62f6df38a /games-strategy/widelands
parent2c4066122b66fa1eb3e37846f9a6e14529a553d8 (diff)
gentoo auto-resync : 02:12:2022 - 08:55:37
Diffstat (limited to 'games-strategy/widelands')
-rw-r--r--games-strategy/widelands/Manifest4
-rw-r--r--games-strategy/widelands/files/widelands-1.0-boost-1.77.patch16
-rw-r--r--games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch29
-rw-r--r--games-strategy/widelands/widelands-1.0.ebuild62
4 files changed, 0 insertions, 111 deletions
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 41777e41cee0..46e708657046 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,8 +1,4 @@
-AUX widelands-1.0-boost-1.77.patch 473 BLAKE2B c874688efafde34c19b9362b4a744c054076bbdb62ad4bddf3f3960774852fac514e768e20d78b1908b2d0274534304f6629ac2bbf87200f4f44f7730cd63981 SHA512 8b1d989c208f917bd26e9ab6000a1367f1dc9f6fa7dcdf681503541b1dd6d1a6433463c4f547ff387aeceb38156e7e8c73790f329746b6b55350f17b96289f9c
-AUX widelands-1.0-gcc12-werror.patch 1130 BLAKE2B 814e0ae5d710cbd0f02df6888deea17c33f934cde25d7e6cf78ad5dde106f4b1534012eaea9996b66ad12ff1ea2578e08802a581db5a9f17438cfe7d9e0fce78 SHA512 a303972d15f2ad2fb895992358759f7a3006c81c875afbbbac4cf4ec76ca93d3ad93754b26eea2315bd9c82f2967912019759117c7004843d659d2d767c2f7ee
-DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
DIST widelands-1.1.tar.gz 416104611 BLAKE2B e217ff5a4e3ba0431b96290dd4908d7ddadaf1850e890cee135a54f88162b30d75dbf5bc5f086d6c5e8c5e4410a0a788201117c3615e15a3e2acfd00e8f01272 SHA512 29dbeae0940468c8aad6f0fa610c8467bdb6ecf2ba5fe9175683b7cdaab5f977fa86beb71de29057c829e9738568d15e10bc22fa7fc9e58132151a1a02d72d9d
-EBUILD widelands-1.0.ebuild 1402 BLAKE2B 4298ca52bfbd4da0305d685aa395d1e439e07d748d64ad7b6c9e87788597a5c9b1e620c4fe403fcbf71678aafcd200682ecd642e070fd08a840d5d2cebb30ffa SHA512 7dce68948ac145f1e68dea3aad856bece3913cb4127d50ef45ee310a95839f3557459e4937047ffccc3009f9851497d9088fc87fc8b8a72a371d81be847b7887
EBUILD widelands-1.1.ebuild 1307 BLAKE2B aa7b006291aa96890aa2a9469b8bfb3af32d308d6b44dc15b8654bc9a3ee47649c902add180643e82614937c7c631716c8ccb57bd862799c3171ca06e32d3322 SHA512 84e6f55bd5c5fc0b2640db6d3494f4161cd4c11a8da6304023b0d7b1c8bd57a74cf8f9662c0c3a9fbf2a2c792b96787516f9295a67e05ed4c0a72dba51573628
EBUILD widelands-9999.ebuild 1307 BLAKE2B aa7b006291aa96890aa2a9469b8bfb3af32d308d6b44dc15b8654bc9a3ee47649c902add180643e82614937c7c631716c8ccb57bd862799c3171ca06e32d3322 SHA512 84e6f55bd5c5fc0b2640db6d3494f4161cd4c11a8da6304023b0d7b1c8bd57a74cf8f9662c0c3a9fbf2a2c792b96787516f9295a67e05ed4c0a72dba51573628
MISC metadata.xml 390 BLAKE2B 139ecbaa266c6fe37441b3e0dd05692dc9eff8301339b7ed358ff32e17c6a1a14cd52b2cf22f141381bcf76d5e9dd579575d204e5a3c1c3793b49ced61b090af SHA512 ecaa9b97ffb2302a7f356e53393f185b70b83563052066d4dd70ad7b725a9963c46b582e1a438f36d517cc52e0ff56316ea8be6c92b54fcdda1726776845f46f
diff --git a/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch b/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch
deleted file mode 100644
index 69c1cb8caf43..000000000000
--- a/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/808747
-
-https://github.com/widelands/widelands/commit/316eaea
-From: matthiakl <t-m.42@mailpost.spdns.org>
-Date: Sat, 14 Aug 2021 19:24:08 +0200
-Subject: [PATCH] Added missing direct incude (#5025)
---- a/src/network/bufferedconnection.h
-+++ b/src/network/bufferedconnection.h
-@@ -20,6 +20,7 @@
- #ifndef WL_NETWORK_BUFFEREDCONNECTION_H
- #define WL_NETWORK_BUFFEREDCONNECTION_H
-
-+#include <map>
- #include <memory>
- #include <mutex>
- #include <thread>
diff --git a/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch b/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch
deleted file mode 100644
index a00603a7969c..000000000000
--- a/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Drop -Werror= (uninitialized cause issues from gcc-12) and also backport
-fix for the offending variable.
-
-Note: upstream changed how -Werror is handled next release, currently pass
-a hard non-specific -Werror and disables it for gcc-12 (review on bump, see
-commit/PR below).
-
-https://bugs.gentoo.org/859277
-https://github.com/widelands/widelands/pull/5415
-https://github.com/widelands/widelands/commit/e4da6d624
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,8 +312,2 @@
- if(NOT MSVC)
-- # Turn some warnings into errors.
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
--
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
---- a/src/editor/editorinteractive.h
-+++ b/src/editor/editorinteractive.h
-@@ -87,4 +87,4 @@
- EditorIncreaseResourcesTool increase_resources;
-- EditorSetPortSpaceTool set_port_space;
- EditorUnsetPortSpaceTool unset_port_space;
-+ EditorSetPortSpaceTool set_port_space;
- EditorSetOriginTool set_origin;
diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
deleted file mode 100644
index 62799a6e424f..000000000000
--- a/games-strategy/widelands/widelands-1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit xdg cmake python-any-r1
-
-DESCRIPTION="Game similar to Settlers 2"
-HOMEPAGE="https://www.widelands.org/"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/widelands/widelands.git"
-else
- SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/icu:=
- media-libs/glew:0=
- media-libs/libglvnd
- media-libs/libpng:=
- media-libs/libsdl2[opengl,sound,video]
- media-libs/sdl2-image[jpeg,png]
- media-libs/sdl2-mixer[vorbis]
- media-libs/sdl2-ttf
- net-misc/curl
- sys-libs/zlib:=
- virtual/libintl"
-DEPEND="
- ${RDEPEND}
- dev-libs/boost"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}"/${P}-boost-1.77.patch
- "${FILESDIR}"/${P}-gcc12-werror.patch
-)
-
-src_configure() {
- CMAKE_BUILD_TYPE="Release"
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
- -DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
- -DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
- -DGTK_UPDATE_ICON_CACHE=OFF
- -DOPTION_BUILD_TESTS=$(usex test)
- )
-
- cmake_src_configure
-}