[gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/files/, games-strategy/widelands/
commit: f594b85a3282c5f399b1ca52cef3c27374d5392c
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Jul 19 11:01:10 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jul 19 11:49:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f594b85a
games-strategy/widelands: fix build with gcc-12
Due to new gcc-12 warnings that die to -Werror=uninitialized,
both adjust the variable and drop these -Werror= (upstream also
disable -Werror with gcc-12 but for other reasons, see patch).
Closes: https://bugs.gentoo.org/859277
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/widelands-1.0-gcc12-werror.patch | 29 ++
games-strategy/widelands/widelands-1.0.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch
b/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch
new file mode 100644
index ..a00603a7969c
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch
@@ -0,0 +1,29 @@
+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
index 6d14e5f8e931..62799a6e424f 100644
--- a/games-strategy/widelands/widelands-1.0.ebuild
+++ b/games-strategy/widelands/widelands-1.0.ebuild
@@ -44,6 +44,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-boost-1.77.patch
+ "${FILESDIR}"/${P}-gcc12-werror.patch
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/files/, games-strategy/widelands/
commit: 49a3db425ba69f62e6d3e4e0c26d1df8b1c4153d
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Jul 25 00:48:39 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Jul 25 01:35:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a3db42
games-strategy/widelands: drop 0.21
Signed-off-by: Ionen Wolkens gentoo.org>
games-strategy/widelands/Manifest | 1 -
.../files/widelands-0.20_rc1-cxxflags.patch| 24 -
games-strategy/widelands/widelands-0.21.ebuild | 58 --
3 files changed, 83 deletions(-)
diff --git a/games-strategy/widelands/Manifest
b/games-strategy/widelands/Manifest
index 0f87ebe4120..413b5f84b64 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,2 +1 @@
DIST widelands-1.0.tar.gz 792124780 BLAKE2B
03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47
SHA512
1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
-DIST widelands-build21-source.tar.gz 381374149 BLAKE2B
17f0491bf7bcd10449bcc274be94aec4a0a64625c19f52426a0d460c3356e04a59b51683e72b4492ba1f62bd6ea510250c3cedda89a7588b88a0071abb1cf0cf
SHA512
8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e
diff --git a/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
b/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
deleted file mode 100644
index ee8fda17ee4..000
--- a/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
widelands-build19-rc1/CMakeLists.txt
-+++ widelands-build19-rc1/CMakeLists.txt
-@@ -146,19 +146,13 @@
- option(OPTION_ASAN "Build with AddressSanitizer" ON)
- elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
- if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
--message(STATUS "GCC >6.2.0 breaks -03, setting -02")
--set(WL_OPTIMIZE_FLAGS "-O2")
-- else()
--set(WL_OPTIMIZE_FLAGS "-O3")
-+message(STATUS "GCC >6.2.0 breaks -03")
- endif ()
- set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
- option(OPTION_ASAN "Build with AddressSanitizer" OFF)
- elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
- if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
--message(STATUS "GCC >6.2.0 breaks -03, setting -02")
--set(WL_OPTIMIZE_FLAGS "-O2")
-- else()
--set(WL_OPTIMIZE_FLAGS "-O3")
-+message(STATUS "GCC >6.2.0 breaks -03")
- endif ()
- set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
- option(OPTION_ASAN "Build with AddressSanitizer" ON)
diff --git a/games-strategy/widelands/widelands-0.21.ebuild
b/games-strategy/widelands/widelands-0.21.ebuild
deleted file mode 100644
index 398bc433cb5..000
--- a/games-strategy/widelands/widelands-0.21.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 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
-
-MY_PV="build$(ver_cut 2)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Game similar to Settlers 2"
-HOMEPAGE="https://www.widelands.org/";
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}-source.tar.gz";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT
OFL-1.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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
- sys-libs/zlib:=
- virtual/libintl"
-DEPEND="
- ${RDEPEND}
- dev-libs/boost"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.20_rc1-cxxflags.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
-}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/files/, games-strategy/widelands/
commit: 6a0928ec00e9fc80de30ef0383a9d32eaabb1521
Author: Lars Wendler gentoo org>
AuthorDate: Thu May 2 14:47:17 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu May 2 14:52:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0928ec
games-strategy/widelands: Removed old.
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
games-strategy/widelands/Manifest | 1 -
.../widelands/files/widelands-0.18-cxxflags.patch | 12
games-strategy/widelands/widelands-0.18-r1.ebuild | 69 --
3 files changed, 82 deletions(-)
diff --git a/games-strategy/widelands/Manifest
b/games-strategy/widelands/Manifest
index b570f4d1511..b621b800bf4 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,3 +1,2 @@
-DIST widelands-build18-src.tar.bz2 183443325 BLAKE2B
100555b7a800cac1094a768edd40e6b44d6bd0d36386c6f057e0cd81f9b03404b249f259c85d3fae655d7343bb50c41a70f228651530c13092e50190fdd2f9b8
SHA512
9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72
DIST widelands-build20-rc1.tar.bz2 232490916 BLAKE2B
7dd13c325fa0dc891a5ab3cc643ae86025c5e853909d172b39d9d1cd2a41132d099f3d03349322b03dc52353f1465391ec006a83e70eb6554be133199efd96b8
SHA512
2d713db8e4a0774e8a6615b6f0dbec4f29870d69fa9bf48db8694316f7320b58ee5afa5a7796e0886471c9c787954c21f478b1364f52ce01a23212a7512465a6
DIST widelands-build20.tar.bz2 232364340 BLAKE2B
1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1
SHA512
25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
diff --git a/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
b/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
deleted file mode 100644
index f6b65400bf8..000
--- a/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru widelands-build18-src.orig/CMakeLists.txt
widelands-build18-src/CMakeLists.txt
widelands-build18-src.orig/CMakeLists.txt 2014-02-22 04:06:51.0
-0500
-+++ widelands-build18-src/CMakeLists.txt 2016-03-23 23:04:50.536259815
-0400
-@@ -271,7 +271,7 @@
- ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR
WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
- ENDIF (CMAKE_COMPILER_IS_GNUCXX)
-
--set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD}
${WL_COMPILERFLAG_OPTIMIZATIONS}
-DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}"
CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-+set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD}
-DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}"
CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-
- #If building with MSVC, then check for 3rdparty libs
- if (DEFINED MSVC)
diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild
b/games-strategy/widelands/widelands-0.18-r1.ebuild
deleted file mode 100644
index adee0947e0b..000
--- a/games-strategy/widelands/widelands-0.18-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils versionator cmake-utils
-
-MY_PV=build$(get_version_component_range 2)
-MY_P=${PN}-${MY_PV}-src
-
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/";
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range
2)/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-lang/lua:0
- >=dev-libs/boost-1.48:=
- media-libs/glew:0=
- media-libs/libpng:0=
- media-libs/libsdl[video]
- media-libs/sdl-gfx
- media-libs/sdl-image[jpeg,png]
- media-libs/sdl-mixer[vorbis]
- media-libs/sdl-net
- media-libs/sdl-ttf
- sys-libs/zlib[minizip]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
- "${FILESDIR}"/${P}-cxxflags.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
- sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWL_VERSION_STANDARD=true
-
- # Game is NOT happy being moved from /usr/share/games
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/games/${PN}
-
- -DWL_INSTALL_PREFIX="${EPREFIX}"/usr/games
- -DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/
[gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/files/, games-strategy/widelands/
commit: ee0132f10b8752aa31f73ca0f50e671278a965fb
Author: Lars Wendler gentoo org>
AuthorDate: Wed Apr 24 19:54:46 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Apr 24 19:54:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0132f1
games-strategy/widelands: Bump to version 0.20_rc1
Closes: https://bugs.gentoo.org/600856
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
games-strategy/widelands/Manifest | 1 +
.../files/widelands-0.20_rc1-cxxflags.patch| 24
games-strategy/widelands/widelands-0.20_rc1.ebuild | 72 ++
3 files changed, 97 insertions(+)
diff --git a/games-strategy/widelands/Manifest
b/games-strategy/widelands/Manifest
index 49fdccdde39..cf7962786e0 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1 +1,2 @@
DIST widelands-build18-src.tar.bz2 183443325 BLAKE2B
100555b7a800cac1094a768edd40e6b44d6bd0d36386c6f057e0cd81f9b03404b249f259c85d3fae655d7343bb50c41a70f228651530c13092e50190fdd2f9b8
SHA512
9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72
+DIST widelands-build20-rc1.tar.bz2 232490916 BLAKE2B
7dd13c325fa0dc891a5ab3cc643ae86025c5e853909d172b39d9d1cd2a41132d099f3d03349322b03dc52353f1465391ec006a83e70eb6554be133199efd96b8
SHA512
2d713db8e4a0774e8a6615b6f0dbec4f29870d69fa9bf48db8694316f7320b58ee5afa5a7796e0886471c9c787954c21f478b1364f52ce01a23212a7512465a6
diff --git a/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
b/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
new file mode 100644
index 000..ee8fda17ee4
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
@@ -0,0 +1,24 @@
+--- widelands-build19-rc1/CMakeLists.txt
widelands-build19-rc1/CMakeLists.txt
+@@ -146,19 +146,13 @@
+ option(OPTION_ASAN "Build with AddressSanitizer" ON)
+ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
+ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
+-message(STATUS "GCC >6.2.0 breaks -03, setting -02")
+-set(WL_OPTIMIZE_FLAGS "-O2")
+- else()
+-set(WL_OPTIMIZE_FLAGS "-O3")
++message(STATUS "GCC >6.2.0 breaks -03")
+ endif ()
+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ option(OPTION_ASAN "Build with AddressSanitizer" OFF)
+ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
+-message(STATUS "GCC >6.2.0 breaks -03, setting -02")
+-set(WL_OPTIMIZE_FLAGS "-O2")
+- else()
+-set(WL_OPTIMIZE_FLAGS "-O3")
++message(STATUS "GCC >6.2.0 breaks -03")
+ endif ()
+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ option(OPTION_ASAN "Build with AddressSanitizer" ON)
diff --git a/games-strategy/widelands/widelands-0.20_rc1.ebuild
b/games-strategy/widelands/widelands-0.20_rc1.ebuild
new file mode 100644
index 000..9cfddcf425f
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.20_rc1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop cmake-utils
+
+MY_PV="build$(ver_cut 2-)"
+MY_P="${PN}-${MY_PV/_/-}"
+
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/";
+SRC_URI="https://launchpad.net/widelands/build$(ver_cut
2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-lang/lua:0
+ dev-libs/icu:=
+ >=dev-libs/boost-1.48:=
+ media-libs/glew:0=
+ media-libs/libpng:0=
+ media-libs/libsdl2[video]
+ media-libs/sdl2-gfx
+ media-libs/sdl2-image[jpeg,png]
+ media-libs/sdl2-mixer[vorbis]
+ media-libs/sdl2-net
+ media-libs/sdl2-ttf
+ sys-libs/zlib:=[minizip]"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+S="${WORKDIR}/${MY_P/20/19}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DOPTION_BUILD_WEBSITE_TOOLS=OFF
+
+ # Upstream's cmake files are totally fscked up...
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/doc/${PF}
+ # Game is NOT happy being moved from /usr/share/games
+ -DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # move game binary to correct location
+ dodir /usr/bin
+ mv "${ED}"/usr/share/doc/${PF}/${PN} "${ED}"/usr/bin || die
+
+ newicon data/images/
[gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/files/, games-strategy/widelands/
commit: b8ffc51a58e7d300dff95f4d3a101196cf83d424
Author: David Seifert gentoo org>
AuthorDate: Wed May 3 20:24:32 2017 +
Commit: David Seifert gentoo org>
CommitDate: Wed May 3 20:25:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ffc51a
games-strategy/widelands: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
games-strategy/widelands/Manifest | 1 -
.../widelands/files/widelands-0.17-cxxflags.patch | 33 ---
.../widelands/files/widelands-0.17-gcc47.patch | 12
games-strategy/widelands/widelands-0.17.ebuild | 68 --
games-strategy/widelands/widelands-0.18.ebuild | 63
5 files changed, 177 deletions(-)
diff --git a/games-strategy/widelands/Manifest
b/games-strategy/widelands/Manifest
index 321553871a8..23fd39ae368 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,2 +1 @@
-DIST widelands-build17-src.tar.bz2 175547379 SHA256
be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5 SHA512
ace4127ba00bbe788cb266d2c508b2d9b0651c99f65f08a3c7d680f8998e64e26252f7095c1b62d94012b99ef1a6dc2f8be08d17f2e8f1ab864abc650c658f2d
WHIRLPOOL
35454b86d467058017ac71da8fae23b3556fe8e6ced5cf94fbd07ff21b2b38eca444be6168224d3023cd1af81867a3e6e45dd1773ef54675769ec51403b24cfa
DIST widelands-build18-src.tar.bz2 183443325 SHA256
6dffd9178f93ff7a9c3c0c9b31b7d3b8eb060c79fbd98901e6311837390b7de3 SHA512
9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72
WHIRLPOOL
ca46c70d951f83c00c37465bc0da9eb94d8d66be50e00c015ee6264ebc99669eca08aeb4117fbcd97fcb7c0e689af4947ad96c231746fc4a2626bb6ac4005be1
diff --git a/games-strategy/widelands/files/widelands-0.17-cxxflags.patch
b/games-strategy/widelands/files/widelands-0.17-cxxflags.patch
deleted file mode 100644
index 419d5d78a35..000
--- a/games-strategy/widelands/files/widelands-0.17-cxxflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Julian Ospald
-Date: Wed May 16 12:06:13 UTC 2012
-
-respect CXXFLAGS
-
CMakeLists.txt
-+++ CMakeLists.txt
-@@ -209,24 +209,7 @@
-
- # CMAKE only defines "-g", but we need -DDEBUG also, and we need
-DNOPARACHUTE (for SDL) in Debug
- set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG
-DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_STRICT}"
CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
--
--#This can be removed if no one uses gcc 4.5.1 or 4.5.2 any more
--IF (${CMAKE_COMPILER_IS_GNUCXX})
--EXEC_PROGRAM (
--${CMAKE_CXX_COMPILER}
--ARGS --version
--OUTPUT_VARIABLE WLBUILD_COMPILERVERSION
--)
--STRING(REGEX REPLACE ".*(4)\\.(5)\\.([0-9]).*" "\\1.\\2.\\3"
WLBUILD_COMPILERVERSION_REP ${WLBUILD_COMPILERVERSION})
--IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR
WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
--message("Suffering from gcc bug, disabling -O3")
--set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set by
widelands CMakeLists.txt" FORCE)
--ELSE (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR
WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--#This line is the default and should be preserved.
--set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Set by
widelands CMakeLists.txt" FORCE)
--ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR
WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
-+set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Release compiler flags"
FORCE)
-
- #If building with MSVC, then check for 3rdparty libs
- if (DEFINED MSVC)
diff --git a/games-strategy/widelands/files/widelands-0.17-gcc47.patch
b/games-strategy/widelands/files/widelands-0.17-gcc47.patch
deleted file mode 100644
index 9ea19c3571d..000
--- a/games-strategy/widelands/files/widelands-0.17-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/main.cc'
src/main.cc2012-02-15 21:25:34 +
-+++ src/main.cc2012-05-02 07:43:01 +
-@@ -28,6 +28,7 @@
- #include
- #include
- #include
-+#include
-
- #include
-
-
diff --git a/games-strategy/widelands/widelands-0.17.ebuild
b/games-strategy/widelands/widelands-0.17.ebuild
deleted file mode 100644
index e8e0ddf80eb..000
--- a/games-strategy/widelands/widelands-0.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator cmake-utils games
-
-MY_PV=build$(get_version_component_range 2)
-MY_P=${PN}-${MY_PV}-src
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/";
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range
2)/+download/${
[gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/files/, games-strategy/widelands/
commit: 5e96afa824c89ae2999606381f2600357bbe74bc
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Mar 24 06:59:04 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Thu Mar 24 15:09:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e96afa8
games-strategy/widelands: version bump (bug #502286)
Package-Manager: portage-2.2.26
games-strategy/widelands/Manifest | 1 +
.../widelands/files/widelands-0.18-cxxflags.patch | 12
games-strategy/widelands/widelands-0.18.ebuild | 64 ++
3 files changed, 77 insertions(+)
diff --git a/games-strategy/widelands/Manifest
b/games-strategy/widelands/Manifest
index 9c0c011..3215538 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1 +1,2 @@
DIST widelands-build17-src.tar.bz2 175547379 SHA256
be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5 SHA512
ace4127ba00bbe788cb266d2c508b2d9b0651c99f65f08a3c7d680f8998e64e26252f7095c1b62d94012b99ef1a6dc2f8be08d17f2e8f1ab864abc650c658f2d
WHIRLPOOL
35454b86d467058017ac71da8fae23b3556fe8e6ced5cf94fbd07ff21b2b38eca444be6168224d3023cd1af81867a3e6e45dd1773ef54675769ec51403b24cfa
+DIST widelands-build18-src.tar.bz2 183443325 SHA256
6dffd9178f93ff7a9c3c0c9b31b7d3b8eb060c79fbd98901e6311837390b7de3 SHA512
9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72
WHIRLPOOL
ca46c70d951f83c00c37465bc0da9eb94d8d66be50e00c015ee6264ebc99669eca08aeb4117fbcd97fcb7c0e689af4947ad96c231746fc4a2626bb6ac4005be1
diff --git a/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
b/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
new file mode 100644
index 000..f6b6540
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
@@ -0,0 +1,12 @@
+diff -ru widelands-build18-src.orig/CMakeLists.txt
widelands-build18-src/CMakeLists.txt
+--- widelands-build18-src.orig/CMakeLists.txt 2014-02-22 04:06:51.0
-0500
widelands-build18-src/CMakeLists.txt 2016-03-23 23:04:50.536259815
-0400
+@@ -271,7 +271,7 @@
+ ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR
WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
+ ENDIF (CMAKE_COMPILER_IS_GNUCXX)
+
+-set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD}
${WL_COMPILERFLAG_OPTIMIZATIONS}
-DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}"
CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
++set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD}
-DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}"
CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+
+ #If building with MSVC, then check for 3rdparty libs
+ if (DEFINED MSVC)
diff --git a/games-strategy/widelands/widelands-0.18.ebuild
b/games-strategy/widelands/widelands-0.18.ebuild
new file mode 100644
index 000..43425ef
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.18.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator cmake-utils games
+
+MY_PV=build$(get_version_component_range 2)
+MY_P=${PN}-${MY_PV}-src
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/";
+SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range
2)/+download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/lua:0
+ media-libs/libsdl[video]
+ media-libs/sdl-image[jpeg,png]
+ media-libs/sdl-mixer[vorbis]
+ media-libs/sdl-gfx
+ media-libs/sdl-net
+ media-libs/libpng:0
+ sys-libs/zlib[minizip]
+ media-libs/glew
+ media-libs/sdl-ttf
+ >=dev-libs/boost-1.48"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+CMAKE_BUILD_TYPE=Release
+PREFIX=${GAMES_DATADIR}/${PN}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cxxflags.patch
+ sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
+ sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ '-DWL_VERSION_STANDARD=true'
+ "-DWL_INSTALL_PREFIX=${GAMES_PREFIX}"
+ "-DWL_INSTALL_DATADIR=${GAMES_DATADIR}/${PN}"
+ "-DWL_INSTALL_LOCALEDIR=${GAMES_DATADIR}/${PN}/locale"
+ "-DWL_INSTALL_BINDIR=${GAMES_BINDIR}"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+ newicon pics/wl-ico-128.png ${PN}.png
+ make_desktop_entry ${PN} Widelands
+ dodoc ChangeLog CREDITS
+ p
