public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/
Date: Sun, 04 May 2025 22:06:34 +0000 (UTC)	[thread overview]
Message-ID: <1746396349.de3908baf258bf900fe251e9c4fb15644d84f94d.asturm@gentoo> (raw)

commit:     de3908baf258bf900fe251e9c4fb15644d84f94d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  4 22:00:16 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  4 22:05:49 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3908ba

media-gfx/librecad: Drop plocales mishandling

Just set LRELEASE properly instead.

Don't add this back unless you enlist as maintainer.

Bug: https://bugs.gentoo.org/847394
Bug: https://bugs.gentoo.org/947545
Bug: https://bugs.gentoo.org/955171
Closes: https://bugs.gentoo.org/955436
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/librecad/librecad-2.2.1.1.ebuild         | 28 +++-------------------
 .../librecad-2.2.2_alpha1_pre20250501.ebuild       | 28 +++-------------------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.2.1.1.ebuild b/media-gfx/librecad/librecad-2.2.1.1.ebuild
index 3e2c3e9bade4..726b0b098d9a 100644
--- a/media-gfx/librecad/librecad-2.2.1.1.ebuild
+++ b/media-gfx/librecad/librecad-2.2.1.1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl he hi hu id_ID it ja ka ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sr sv ta th tr uk zh_cn zh_tw"
-inherit desktop edo plocale qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
 HOMEPAGE="https://www.librecad.org/"
@@ -43,35 +42,14 @@ BDEPEND="
 src_prepare() {
 	default
 
-	# Stock script doesn't work correctly on Gentoo (see bug #847394)
-	# and also it compiles all translations regardles of selected locales.
-	# To avoid this just comment out locale building and do it manually
-	sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die
-
-	plocale_find_changes 'librecad/ts' 'librecad_' '.ts'
+	sed -e "/^LRELEASE/s:lrelease:$(qt6_get_bindir)/lrelease:" \
+		-i scripts/postprocess-unix.sh || die
 }
 
 src_configure() {
 	eqmake5 -r
 }
 
-src_compile() {
-	default
-
-	build_locale() {
-		local lrelease="$(qt5_get_bindir)/lrelease"
-		edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \
-			-qm "unix/resources/qm/librecad_${1}.qm"
-		edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \
-			-qm "unix/resources/qm/plugins_${1}.qm"
-	}
-
-	plocale_for_each_locale build_locale
-	# We want the en locale to be always present. Otherwise it could
-	# be impossible to select the English command set which is quite crucial.
-	has en $(plocale_get_locales) || build_locale en
-}
-
 src_install() {
 	dobin unix/librecad
 	use tools && dobin unix/ttf2lff

diff --git a/media-gfx/librecad/librecad-2.2.2_alpha1_pre20250501.ebuild b/media-gfx/librecad/librecad-2.2.2_alpha1_pre20250501.ebuild
index a4e69b392ee1..f5278882f1cd 100644
--- a/media-gfx/librecad/librecad-2.2.2_alpha1_pre20250501.ebuild
+++ b/media-gfx/librecad/librecad-2.2.2_alpha1_pre20250501.ebuild
@@ -4,8 +4,7 @@
 EAPI=8
 
 COMMIT=2f5b68f347ba50fd8d6c4fee437cfedff63848b4
-PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl he hi hu id_ID it ja ka ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sr sv ta th tr uk zh_cn zh_tw"
-inherit desktop edo plocale qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
 HOMEPAGE="https://www.librecad.org/"
@@ -41,35 +40,14 @@ BDEPEND="
 src_prepare() {
 	default
 
-	# Stock script doesn't work correctly on gentoo (see bug #847394)
-	# and also it compiles all translations regardles of selected locales.
-	# To avoid this just comment out locale building and do it manually
-	sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die
-
-	plocale_find_changes 'librecad/ts' 'librecad_' '.ts'
+	sed -e "/^LRELEASE/s:lrelease:$(qt6_get_bindir)/lrelease:" \
+		-i scripts/postprocess-unix.sh || die
 }
 
 src_configure() {
 	eqmake6 -r
 }
 
-src_compile() {
-	default
-
-	build_locale() {
-		local lrelease="$(qt6_get_bindir)/lrelease"
-		edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \
-			-qm "unix/resources/qm/librecad_${1}.qm"
-		edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \
-			-qm "unix/resources/qm/plugins_${1}.qm"
-	}
-
-	plocale_for_each_locale build_locale
-	# We want the en locale to be always present. Otherwise it could
-	# be impossible to select the English command set which is quite crucial.
-	has en $(plocale_get_locales) || build_locale en
-}
-
 src_install() {
 	dobin unix/librecad
 	use tools && dobin unix/ttf2lff


             reply	other threads:[~2025-05-04 22:06 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-04 22:06 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-06-26 20:17 [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/ Andreas Sturmlechner
2025-06-23  0:21 Sam James
2025-06-23  0:21 Sam James
2025-05-13 20:48 Andreas Sturmlechner
2025-05-13 20:48 Andreas Sturmlechner
2025-05-06 18:17 Andreas Sturmlechner
2025-05-05 23:09 Sam James
2025-05-05 23:09 Sam James
2025-05-01 10:05 Andreas Sturmlechner
2025-05-01 10:05 Andreas Sturmlechner
2025-05-01 10:05 Andreas Sturmlechner
2025-03-25 19:15 Andreas Sturmlechner
2025-03-24 19:31 Sam James
2025-03-24 19:31 Sam James
2025-02-13  2:57 Sam James
2025-01-05 11:42 Miroslav Šulc
2024-10-25  7:31 Yixun Lan
2024-09-22  7:20 Sam James
2024-09-22  7:20 Sam James
2024-06-30  0:00 Conrad Kostecki
2023-03-17 18:26 Sam James
2023-03-17 17:22 Sam James
2023-02-05  9:13 Joonas Niilola
2023-01-25  4:29 John Helmert III
2022-11-28  7:05 Joonas Niilola
2022-01-22  8:41 Yixun Lan
2021-05-09 19:12 Andreas Sturmlechner
2020-06-05  9:43 Andreas Sturmlechner
2020-05-29  7:39 Agostino Sarubbo
2020-05-20 12:25 Andreas Sturmlechner
2020-05-20 12:25 Andreas Sturmlechner
2019-08-15 19:47 Slawek Lis
2019-02-02 21:07 Sergei Trofimovich
2018-12-16 23:53 Andreas Sturmlechner
2018-09-09  8:27 Mikle Kolyada
2018-09-02 23:46 Thomas Deutschmann
2018-07-01  0:03 Andreas Sturmlechner
2018-06-03 13:49 Aaron Bauman
2018-01-22  8:40 Jeroen Roovers
2018-01-15 22:01 Andreas Sturmlechner
2018-01-15 22:01 Andreas Sturmlechner
2018-01-15 22:01 Andreas Sturmlechner
2018-01-15 19:03 Tobias Klausmann
2017-11-27  6:50 Slawek Lis
2017-11-18 13:08 Jeroen Roovers
2017-10-31 18:07 Andreas Hüttel
2017-10-26 18:54 Thomas Deutschmann
2016-11-22  6:37 Slawek Lis
2016-11-22  6:37 Slawek Lis
2016-04-07 20:25 Sergei Trofimovich
2016-01-19  8:34 Patrice Clement
2016-01-19  8:34 Patrice Clement
2016-01-19  8:34 Patrice Clement
2015-09-13 20:27 Anthony G. Basile
2015-09-13 19:24 Slawek Lis
2015-09-08  6:30 Slawek Lis
2015-09-02  5:56 Slawek Lis

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=1746396349.de3908baf258bf900fe251e9c4fb15644d84f94d.asturm@gentoo \
    --to=asturm@gentoo.org \
    --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