public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "strategictraveler" <strategictraveler@proton.me>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
Date: Sat, 01 Feb 2025 20:07:25 +0000 (UTC)	[thread overview]
Message-ID: <1738440415.4ea7c172cc881a89518f087735cc36b784d9ae75.strategictraveler@gentoo> (raw)

commit:     4ea7c172cc881a89518f087735cc36b784d9ae75
Author:     strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Sat Feb  1 19:58:32 2025 +0000
Commit:     strategictraveler <strategictraveler <AT> proton <DOT> me>
CommitDate: Sat Feb  1 20:06:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4ea7c172

games-roguelike/cataclysm-dda: Fix font paths & revise sed args

Signed-off-by: strategictraveler <strategictraveler <AT> proton.me>

 games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild   | 7 +++++--
 games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index 94a7b52cc..35db97b99 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -91,12 +91,15 @@ src_prepare() {
 		"src/translation_manager_impl.cpp" \
 		"tests/translation_system_test.cpp" || die
 
+	sed -i "s#data#${EPREFIX}/usr/share/${PN}-${SLOT}#" \
+		"data/fontdata.json" || die
+
 	# from upstream 1ab7d17
 	# NOTE: remove when bumping
-	sed -i -e "s/const size_type/size_type/" \
+	sed -i "s/const size_type/size_type/" \
 		"src/third-party/flatbuffers/stl_emulation.h" || die
 
-	sed -i -e "s/cataclysm-tiles/cataclysm-tiles-${SLOT}/g" \
+	sed -i "s/cataclysm-tiles/cataclysm-tiles-${SLOT}/g" \
 		"data/xdg/org.cataclysmdda.CataclysmDDA.desktop" || die
 
 	local f="org.cataclysmdda.CataclysmDDA"

diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index 7ab9d3db1..7c2566e5d 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -90,7 +90,10 @@ src_prepare() {
 		"src/translation_manager_impl.cpp" \
 		"tests/translation_system_test.cpp" || die
 
-	sed -i -e "s/cataclysm-tiles/cataclysm-tiles-${SLOT}/g" \
+	sed -i "s#data#${EPREFIX}/usr/share/${PN}-${SLOT}#" \
+		"data/fontdata.json" || die
+
+	sed -i "s/cataclysm-tiles/cataclysm-tiles-${SLOT}/g" \
 		"data/xdg/org.cataclysmdda.CataclysmDDA.desktop" || die
 
 	local f="org.cataclysmdda.CataclysmDDA"


             reply	other threads:[~2025-02-01 20:07 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-01 20:07 strategictraveler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-02 11:42 [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/ strategictraveler
2025-02-01 20:07 strategictraveler
2025-02-01 20:07 strategictraveler
2025-01-15 13:54 Takuya Wakazono
2025-01-14 11:58 strategictraveler
2025-01-03 17:49 strategictraveler
2024-12-24 19:27 strategictraveler
2024-12-24 10:10 strategictraveler
2024-12-22 13:57 Takuya Wakazono
2024-12-13 14:15 Takuya Wakazono
2024-12-11 13:23 Takuya Wakazono
2024-12-11 12:13 Takuya Wakazono

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1738440415.4ea7c172cc881a89518f087735cc36b784d9ae75.strategictraveler@gentoo \
    --to=strategictraveler@proton.me \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox