commit: 9646f579b1acb2f1a089800dafd997cac7587aaa Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Jul 21 05:04:39 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Jul 21 05:37:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9646f579
games-engines/devilutionx: drop 1.2.1-r1 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-engines/devilutionx/Manifest | 1 - .../devilutionx/devilutionx-1.2.1-r1.ebuild | 72 ---------------------- .../devilutionx-1.2.0_pre-no_bundled_font.patch | 40 ------------ .../files/devilutionx-1.2.1-disable-ccache.patch | 16 ----- games-engines/devilutionx/metadata.xml | 1 - 5 files changed, 130 deletions(-) diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest index c0aa8501e30f..f2549f29e76a 100644 --- a/games-engines/devilutionx/Manifest +++ b/games-engines/devilutionx/Manifest @@ -1,2 +1 @@ -DIST devilutionx-1.2.1.tar.gz 3573200 BLAKE2B c3055bfa8ae0a670e21561673e23277fb76e2b24d269fdd86d13510f68a0e841ec96ab06cf98739913870884d82037b5297ce168e6cba1f8795de6ea72620649 SHA512 9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18 DIST devilutionx-1.4.0.tar.xz 19752052 BLAKE2B 3a79e9d88cc2f5623dfd7d4ad2a0a547361cde8d95197be36dc7076e0b56fa1a915c57bf5537f5e4508201c3b5a283ab90d13db93b3836b0f12c6108abf1578a SHA512 9519c0bd52798f35fc986fab867b0005010f089b35200b5d54b7ed94145c2df54270a570cd3b0ff1c260f645d624a145e3581d744b48ae513919eb2258331bcf diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild deleted file mode 100644 index 2a2abba3eba0..000000000000 --- a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Sometimes build with ninja fails. -# Please check occasionally if we can revert back to ninja. -# Latest known issue: -# -#CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake - -DESCRIPTION="Diablo engine for modern operating systems" -HOMEPAGE="https://github.com/diasurgical/devilutionX"; -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"; -else - SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/devilutionX-${PV}" -fi - -LICENSE="public-domain" -SLOT="0" - -IUSE="debug lto" - -RDEPEND=" - dev-libs/libsodium:= - media-fonts/sil-charis - media-libs/libsdl2[haptic] - media-libs/sdl2-mixer - media-libs/sdl2-ttf -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508 - "${FILESDIR}/${PN}-1.2.1-disable-ccache.patch" #813768 -) - -DOCS=( docs/CHANGELOG.md ) - -src_configure() { - local mycmakeargs=( - -DASAN="OFF" - -DDEBUG="$(usex debug)" - -DDISABLE_LTO="$(usex !lto)" - # Must be off to force dynamic linking. - # See bug #791031 - -DDIST="OFF" - -DUBSAN="OFF" - ) - - if [[ "${PV}" != 9999 ]] ; then - mycmakeargs+=( -DVERSION_NUM="${PV}" ) - fi - - cmake_src_configure -} - -pkg_postinst() { - einfo "In order to play the game you need to install the file" - einfo " diabdat.mpq" - einfo "from the original game CD into the following directory:" - einfo " \${HOME}/.local/share/diasurgical/devilution/" -} diff --git a/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch deleted file mode 100644 index 01f4006dd13f..000000000000 --- a/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6e75bb9550bd8b4c6249fcfc0cd488224336060e Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Wed, 31 Mar 2021 17:55:03 +0200 -Subject: [PATCH] Fix font location - -https://bugs.gentoo.org/704508 ---- - SourceS/paths.cpp | 2 +- - SourceX/DiabloUI/fonts.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SourceS/paths.cpp b/SourceS/paths.cpp -index dd60fcb5..1c4f9d69 100644 ---- a/SourceS/paths.cpp -+++ b/SourceS/paths.cpp -@@ -11,7 +11,7 @@ - #endif - - #ifndef TTF_FONT_NAME --#define TTF_FONT_NAME "CharisSILB.ttf" -+#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf" - #endif - - namespace dvl { -diff --git a/SourceX/DiabloUI/fonts.cpp b/SourceX/DiabloUI/fonts.cpp -index 178dcbe9..5f825886 100644 ---- a/SourceX/DiabloUI/fonts.cpp -+++ b/SourceX/DiabloUI/fonts.cpp -@@ -66,7 +66,7 @@ void LoadTtfFont() - std::string ttf_font_path = GetTtfPath() + GetTtfName(); - #ifdef __linux__ - if (!FileExists(ttf_font_path.c_str())) { -- ttf_font_path = "/usr/share/fonts/truetype/" + GetTtfName(); -+ ttf_font_path = "/usr/share/fonts/" + GetTtfName(); - } - #endif - font = TTF_OpenFont(ttf_font_path.c_str(), 17); --- -2.31.1 - diff --git a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch deleted file mode 100644 index 177287810c94..000000000000 --- a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch +++ /dev/null @@ -1,16 +0,0 @@ -We let users enable ccache by themselves. Avoids sandbox violation. -https://bugs.gentoo.org/813768 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,11 +54,6 @@ if(NOT VERSION_NUM) - endif() - endif() - --find_program(CCACHE_PROGRAM ccache) --if(CCACHE_PROGRAM) -- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") --endif() -- - if(VERSION_NUM MATCHES untagged) - project(DevilutionX - LANGUAGES C CXX) diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml index ae8bad0665fb..f75265ef16b8 100644 --- a/games-engines/devilutionx/metadata.xml +++ b/games-engines/devilutionx/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo Games Project</name> </maintainer> <use> - <flag name="lto">Build with link time optimization enabled</flag> <flag name="sodium">Enable network packet encryption using <pkg>dev-libs/libsodium</pkg></flag> <flag name="zerotier">Enable ZeroTier for online public games</flag> </use>
