commit: 310835392951b46ecfb1e5fa32d4278007cd0b5f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 29 22:41:53 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 30 07:53:41 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31083539
games-strategy/hedgewars: drop 1.0.0-r100 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-strategy/hedgewars/Manifest | 1 - .../files/hedgewars-1.0.0-cmake-3.24.patch | 122 --------------------- .../hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch | 23 ---- .../hedgewars/hedgewars-1.0.0-r100.ebuild | 100 ----------------- 4 files changed, 246 deletions(-) diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest index d4427c98fb17..bc34a580880e 100644 --- a/games-strategy/hedgewars/Manifest +++ b/games-strategy/hedgewars/Manifest @@ -1,2 +1 @@ -DIST hedgewars-src-1.0.0.tar.bz2 177668452 BLAKE2B cbd99a4403b911023fb4a522ed1ed04272f07705321585b0e7a8f56785ef11bf8c654df95016b0af94f603c387f73804cbd95e13a92e875990adf5fec149e334 SHA512 9aeb904550239040a878a0e7ae5006aa4d824124b61d813b9e6f6dfe1bd1c8f5fe395e0fd6e58d685ef1259abd4669e03b985be129c620be15f6e5ad82519ec2 DIST hedgewars-src-1.0.2.tar.bz2 177564706 BLAKE2B 3644209cc42443b845d6a4497ba6ca8f34ffe249b99ac0ca26e5fcb5e86a0e705389e3b6db75d16b671cd2c899cecef2b6065d1755dfaab0860a6eb4c6ddb099 SHA512 dc79cc48eee305d8dd2b64fcbfe598d48f8aec918d9065a6af4aef9be4e4940ad858836fc6bda46e02128b80dbba8c443a4f8a702a16b0ac969f8d0a0e080502 diff --git a/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch b/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch deleted file mode 100644 index 7c76e4854f50..000000000000 --- a/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch +++ /dev/null @@ -1,122 +0,0 @@ -Description: Cherry-pick change 42f7e397894c5132b4706f478e62ce5d648119c1 into our custom embedded version -Author: Gianfranco Costamagna <[email protected]> -Forwarded: irc -Last-Update: 2022-08-05 - ---- hedgewars-1.0.0.orig/cmake_modules/CMakeSystemSpecificInformation.cmake -+++ hedgewars-1.0.0/cmake_modules/CMakeSystemSpecificInformation.cmake -@@ -1,70 +1,6 @@ --# XXX Emscripten: --# This file is copied as-is from the CMake source tree. Due to how CMake --# platform toolchain files work, we must have a copy of this file located --# relative to Emscripten platform toolchain file, or file inclusion order --# in cmGlobalGenerator::EnableLanguage will not find Emscripten.cmake --# toolchain file, and as a result, it is not possible to set the default --# compilation output suffix to .js, and as a consequence the script --# check_function_exists() will not function properly (it will try to --# build to wrong file suffix) -- --# CMake - Cross Platform Makefile Generator --# Copyright 2000-2014 Kitware, Inc. --# Copyright 2000-2011 Insight Software Consortium --# All rights reserved. -- --# Redistribution and use in source and binary forms, with or without --# modification, are permitted provided that the following conditions --# are met: -- --# * Redistributions of source code must retain the above copyright --# notice, this list of conditions and the following disclaimer. -- --# * Redistributions in binary form must reproduce the above copyright --# notice, this list of conditions and the following disclaimer in the --# documentation and/or other materials provided with the distribution. -- --# * Neither the names of Kitware, Inc., the Insight Software Consortium, --# nor the names of their contributors may be used to endorse or promote --# products derived from this software without specific prior written --# permission. -- --# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS --# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT --# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR --# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT --# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, --# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT --# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE --# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- --# ------------------------------------------------------------------------------ -- --# The above copyright and license notice applies to distributions of --# CMake in source and binary form. Some source files contain additional --# notices of original copyright by their contributors; see each source --# for details. Third-party software packages supplied with CMake under --# compatible licenses provide their own copyright notices documented in --# corresponding subdirectories. -- --# ------------------------------------------------------------------------------ -- --# CMake was initially developed by Kitware with the following sponsorship: -- --# * National Library of Medicine at the National Institutes of Health --# as part of the Insight Segmentation and Registration Toolkit (ITK). -- --# * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel --# Visualization Initiative. -- --# * National Alliance for Medical Image Computing (NAMIC) is funded by the --# National Institutes of Health through the NIH Roadmap for Medical Research, --# Grant U54 EB005149. -+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -+# file Copyright.txt or https://cmake.org/licensing for details. - --# * Kitware, Inc. - - # This file is included by cmGlobalGenerator::EnableLanguage. - # It is included after the compiler has been determined, so -@@ -78,8 +14,19 @@ - set(APPLE ) - set(UNIX ) - set(CYGWIN ) -+set(MSYS ) - set(WIN32 ) - -+function(_cmake_record_install_prefix ) -+ set(_CMAKE_SYSTEM_PREFIX_PATH_INSTALL_PREFIX_VALUE "${CMAKE_INSTALL_PREFIX}" PARENT_SCOPE) -+ set(count 0) -+ foreach(value IN LISTS CMAKE_SYSTEM_PREFIX_PATH) -+ if(value STREQUAL CMAKE_INSTALL_PREFIX) -+ math(EXPR count "${count}+1") -+ endif() -+ endforeach() -+ set(_CMAKE_SYSTEM_PREFIX_PATH_INSTALL_PREFIX_COUNT "${count}" PARENT_SCOPE) -+endfunction() - - # include Generic system information - include(CMakeGenericSystem) -@@ -91,17 +38,16 @@ include(${CMAKE_SYSTEM_INFO_FILE} OPTION - - if(NOT _INCLUDED_SYSTEM_INFO_FILE) - message("System is unknown to cmake, create:\n${CMAKE_SYSTEM_INFO_FILE}" -- " to use this system, please send your config file to " -- "[email protected] so it can be added to cmake") -+ " to use this system, please post your config file on " -+ "discourse.cmake.org so it can be added to cmake") - if(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt) - configure_file(${CMAKE_BINARY_DIR}/CMakeCache.txt - ${CMAKE_BINARY_DIR}/CopyOfCMakeCache.txt COPYONLY) - message("Your CMakeCache.txt file was copied to CopyOfCMakeCache.txt. " -- "Please send that file to [email protected].") -- endif() -+ "Please post that file on discourse.cmake.org.") -+ endif() - endif() - -- - # optionally include a file which can do extra-generator specific things, e.g. - # CMakeFindEclipseCDT4.cmake asks gcc for the system include dirs for the Eclipse CDT4 generator - if(CMAKE_EXTRA_GENERATOR) diff --git a/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch b/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch deleted file mode 100644 index b04dd0b69fa4..000000000000 --- a/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch +++ /dev/null @@ -1,23 +0,0 @@ - -# HG changeset patch -# User alfadur -# Date 1597053413 -10800 -# Node ID 6832dab555aefa6ef2830d9452a9a88c89299e85 -# Parent eee2b3eff91dec595a7cb486bcfd97036520e971 -workaround for FPC 3.2.0 ICE - -diff -r eee2b3eff91d -r 6832dab555ae hedgewars/uWorld.pas ---- a/hedgewars/uWorld.pas Sun Aug 09 14:43:02 2020 +0200 -+++ b/hedgewars/uWorld.pas Mon Aug 10 12:56:53 2020 +0300 -@@ -1168,8 +1168,8 @@ - procedure ShiftWorld(Dir: LongInt); inline; - begin - preShiftWorldDx:= WorldDx; -- WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth)); -- -+ Dir := Dir * LongInt(playWidth); -+ WorldDx:= WorldDx + Dir; - end; - - procedure UnshiftWorld(); inline; - diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild deleted file mode 100644 index a173b734abf3..000000000000 --- a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR=emake -LUA_COMPAT=( lua5-1 ) - -inherit cmake lua-single xdg-utils - -MY_P=${PN}-src-${PV} - -DESCRIPTION="A turn-based strategy, artillery, action and comedy game" -HOMEPAGE="https://www.hedgewars.org/"; -SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2"; - -LICENSE="GPL-2 Apache-2.0 FDL-1.3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -REQUIRED_USE="${LUA_REQUIRED_USE}" - -QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks -QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks - -# qtcore:5= - depends on private header -DEPEND="${LUA_DEPS} - >=dev-games/physfs-3.0.1 - dev-qt/qtcore:5= - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - media-libs/libpng:0= - media-libs/libsdl2:= - media-libs/sdl2-image:= - media-libs/sdl2-mixer:=[vorbis] - media-libs/sdl2-net:= - media-libs/sdl2-ttf:= - sys-libs/zlib - !x86? ( media-video/ffmpeg:= ) - " -RDEPEND="${DEPEND} - app-arch/xz-utils - >=media-fonts/dejavu-2.28 - media-fonts/wqy-zenhei" -BDEPEND=" - dev-qt/linguist-tools:5 - !x86? ( >=dev-lang/fpc-2.4 ) - x86? ( - >=dev-lang/ghc-6.10 - dev-haskell/parsec - )" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.15.patch" - "${FILESDIR}/${PN}-1.0.0-cmake_lua_version.patch" - # http://hg.hedgewars.org/hedgewars/rev/6832dab555ae - "${FILESDIR}/${PN}-1.0.0-fpc-3.2.patch" - # Patch by Debian - "${FILESDIR}/${P}-cmake-3.24.patch" # bug 870010 -) - -S="${WORKDIR}"/${MY_P} - -src_configure() { - local mycmakeargs=( - -DMINIMAL_FLAGS=ON - -DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}" - -Dtarget_binary_install_dir="${EPREFIX}/usr/bin" - -Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)" - -DNOSERVER=TRUE - -DBUILD_ENGINE_C=$(usex x86) - -DNOVIDEOREC=$(usex !x86) - -DCMAKE_VERBOSE_MAKEFILE=TRUE - # Need to tell the build system where the fonts are located - # as it uses PhysFS' symbolic link protection mode which - # prevents us from symlinking the fonts into the right directory - # https://hg.hedgewars.org/hedgewars/rev/76ad55807c24 - # https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7 - -DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu" - # upstream sets RPATH that leads to weird breakage - # https://bugzilla.redhat.com/show_bug.cgi?id=1200193 - -DCMAKE_SKIP_RPATH=ON - -DLUA_VERSION=$(lua_get_version) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - doman man/${PN}.6 -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -}
