[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/, games-engines/devilutionx/files/
commit: 8fa751d866e2588957ba1502ba0984247f78440c
Author: Sam James gentoo org>
AuthorDate: Tue Mar 22 22:04:33 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 10 22:58:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fa751d8
games-engines/devilutionx: fix automagic ccache usage
We let users enable this by themselves via e.g. FEATURES=ccache. Maintainer
timeout.
Closes: https://bugs.gentoo.org/813768
Signed-off-by: Sam James gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/24714
Signed-off-by: Sam James gentoo.org>
games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild | 3 ++-
games-engines/devilutionx/devilutionx-.ebuild | 3 ++-
.../files/devilutionx-1.2.1-disable-ccache.patch| 17 +
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
index 9dd19f639bcb..2a2abba3eba0 100644
--- a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,6 +41,7 @@ BDEPEND="
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 )
diff --git a/games-engines/devilutionx/devilutionx-.ebuild
b/games-engines/devilutionx/devilutionx-.ebuild
index 9dd19f639bcb..2a2abba3eba0 100644
--- a/games-engines/devilutionx/devilutionx-.ebuild
+++ b/games-engines/devilutionx/devilutionx-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,6 +41,7 @@ BDEPEND="
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 )
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
new file mode 100644
index ..a89b53e63d34
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
@@ -0,0 +1,17 @@
+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)
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/, games-engines/devilutionx/files/
commit: 4e3c1d7c6209e4b36fb34ee9c72d8d34a456ae8a
Author: Lars Wendler gentoo org>
AuthorDate: Wed Mar 31 16:05:39 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Mar 31 16:05:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e3c1d7c
games-engines/devilutionx: New bundled font patch for live ebuild
Closes: https://bugs.gentoo.org/779547
Signed-off-by: Lars Wendler gentoo.org>
games-engines/devilutionx/devilutionx-.ebuild | 2 +-
.../devilutionx-1.2.0_pre-no_bundled_font.patch| 40 ++
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/games-engines/devilutionx/devilutionx-.ebuild
b/games-engines/devilutionx/devilutionx-.ebuild
index 3c50e3ab9fb..70c9bb47460 100644
--- a/games-engines/devilutionx/devilutionx-.ebuild
+++ b/games-engines/devilutionx/devilutionx-.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508
+ "${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
)
src_configure() {
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
new file mode 100644
index 000..01f4006dd13
--- /dev/null
+++
b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch
@@ -0,0 +1,40 @@
+From 6e75bb9550bd8b4c6249fcfc0cd488224336060e Mon Sep 17 00:00:00 2001
+From: Lars Wendler
+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
+
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/, games-engines/devilutionx/files/
commit: 3385fcbbd1266555c3927623a747d760f65558d4
Author: Lars Wendler gentoo org>
AuthorDate: Mon Feb 22 13:00:23 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Feb 22 13:00:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3385fcbb
games-engines/devilutionx: Revbump to fix remaining font issue
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler gentoo.org>
...ilutionx-1.1.0-r1.ebuild => devilutionx-1.1.0-r2.ebuild} | 0
.../files/devilutionx-1.1.0-no_bundled_font.patch | 13 -
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
similarity index 100%
rename from games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
rename to games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
diff --git
a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
index 7944a8221d2..69131b562c8 100644
--- a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
+++ b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
@@ -38,6 +38,17 @@ https://bugs.gentoo.org/704508
# -G DEB
set(CPACK_PACKAGE_CONTACT "and...@jenbo.dk")
+--- devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp
devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp
+@@ -69,7 +69,7 @@
+ #ifdef __linux__
+ if (!FileExists(ttf_font_path))
+ {
+- ttf_font_path = "/usr/share/fonts/truetype/" TTF_FONT_NAME;
++ ttf_font_path = "/usr/share/fonts/" TTF_FONT_NAME;
+ }
+ #endif
+ font = TTF_OpenFont(ttf_font_path, 17);
--- devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
+++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
@@ -11,7 +11,7 @@
@@ -45,7 +56,7 @@ https://bugs.gentoo.org/704508
#ifndef TTF_FONT_NAME
-#define TTF_FONT_NAME "CharisSILB.ttf"
-+#define TTF_FONT_NAME "CharisSIL-B.ttf"
++#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf"
#endif
namespace dvl {
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/, games-engines/devilutionx/files/
commit: c10ee37782c5045e949a2758cdb5fd0e6dbe8aa2
Author: Lars Wendler gentoo org>
AuthorDate: Sun Jan 17 23:18:08 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun Jan 17 23:20:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10ee377
games-engines/devilutionx: Avoid bundled font again
Bug: https://bugs.gentoo.org/704508
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler gentoo.org>
.../devilutionx/devilutionx-1.1.0-r1.ebuild| 65 ++
.../files/devilutionx-1.1.0-no_bundled_font.patch | 51 +
2 files changed, 116 insertions(+)
diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
b/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
new file mode 100644
index 000..913e1f40eef
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 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 desktop
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX;
+if [[ "${PV}" == ]] ; 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.1.0-no_bundled_font.patch" #704508
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DASAN="OFF"
+ -DDEBUG="$(usex debug)"
+ -DDISABLE_LTO="$(usex !lto)"
+ -DDIST="ON"
+ -DUBSAN="OFF"
+ )
+ cmake_src_configure
+
+ # Build system still doesn't reliably set release version in the build
+ sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" || die
+}
+
+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.1.0-no_bundled_font.patch
b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
new file mode 100644
index 000..7944a8221d2
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/704508
+
+--- devilutionX-1.1.0/CMakeLists.txt
devilutionX-1.1.0/CMakeLists.txt
+@@ -298,7 +298,6 @@
+ SourceX/main.cpp
+ SourceX/devilutionx.exe.manifest
+ Packaging/macOS/AppIcon.icns
+- Packaging/resources/CharisSILB.ttf
+ Packaging/windows/devilutionx.rc)
+
+ if(NOT NONET)
+@@ -339,9 +338,6 @@
+
+ add_executable(${BIN_TARGET} WIN32 MACOSX_BUNDLE ${devilutionx_SRCS})
+
+-# Copy the font to the build directory to it works from the build directory
+-file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION
"${CMAKE_CURRENT_BINARY_DIR}")
+-
+ # Use file GENERATE instead of configure_file because configure_file
+ # does not support generator expressions.
+ get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+@@ -563,7 +559,6 @@
+
+ if(APPLE)
+ set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources)
+- set_source_files_properties("./Packaging/resources/CharisSILB.ttf"
PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+ set(MACOSX_BUNDLE_GUI_IDENTIFIER com.diasurgical.devilutionx)
+ set(MACOSX_BUNDLE_COPYRIGHT Unlicense)
+ set(MACOSX_BUNDLE_BUNDLE_NAME devilutionx)
+@@ -624,9 +619,6 @@
+ DESTINATION "share/icons/hicolor/512x512/apps"
+ RENAME "${project_name}.png"
+ )
+-install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
+- DESTINATION "share/fonts/truetype"
+-)
+
+ # -G DEB
+ set(CPACK_PACKAGE_CONTACT "and...@jenbo.dk")
+--- devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
+@@ -11,7 +11,7 @@
+ #endif
+
+ #ifndef TTF_FONT_NAME
+-#define TTF_FONT_NAME "CharisSILB.ttf"
++#define TTF_FONT_NAME "CharisSIL-B.ttf"
+ #endif
+
+ namespace dvl {
