From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/, sci-astronomy/kstars/files/
Date: Thu, 20 May 2021 21:51:44 +0000 (UTC) [thread overview]
Message-ID: <1621547493.5a36d6651fcd49e5f9c2264ab52ec0dba552eb4c.asturm@gentoo> (raw)
commit: 5a36d6651fcd49e5f9c2264ab52ec0dba552eb4c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 20 21:51:20 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 20 21:51:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a36d665
sci-astronomy/kstars: Fix build with IUSE="-raw fits"
Closes: https://bugs.gentoo.org/790638
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kstars-3.5.3-fits-w-o-libraw.patch | 25 ++++++++++++++++++++++
sci-astronomy/kstars/kstars-3.5.3.ebuild | 2 ++
2 files changed, 27 insertions(+)
diff --git a/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch b/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch
new file mode 100644
index 00000000000..a0bb66046f0
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch
@@ -0,0 +1,25 @@
+From 1adf58605d18ee24c68ca6762a94de75a09d738a Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Mon, 26 Apr 2021 12:53:19 +0200
+Subject: [PATCH] Fix build without BUILD_KSTARS_LITE and libraw
+
+---
+ kstars/fitsviewer/fitsdata.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kstars/fitsviewer/fitsdata.cpp b/kstars/fitsviewer/fitsdata.cpp
+index 8300e9687..ca59d808e 100644
+--- a/kstars/fitsviewer/fitsdata.cpp
++++ b/kstars/fitsviewer/fitsdata.cpp
+@@ -524,7 +524,7 @@ bool FITSData::loadRAWImage(const QByteArray &buffer, const QString &extension,
+ Q_UNUSED(extension);
+
+ #if !defined(KSTARS_LITE) && !defined(HAVE_LIBRAW)
+- lastError = i18n("Unable to find dcraw and cjpeg. Please install the required tools to convert CR2/NEF to JPEG.");
++ m_LastError = i18n("Unable to find dcraw and cjpeg. Please install the required tools to convert CR2/NEF to JPEG.");
+ return false;
+ #else
+
+--
+GitLab
+
diff --git a/sci-astronomy/kstars/kstars-3.5.3.ebuild b/sci-astronomy/kstars/kstars-3.5.3.ebuild
index 8c5431d2e41..49493cc295d 100644
--- a/sci-astronomy/kstars/kstars-3.5.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.3.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
"
+PATCHES=( "${FILESDIR}/${P}-fits-w-o-libraw.patch" ) # bug 790638
+
src_configure() {
local mycmakeargs=(
-DFETCH_TRANSLATIONS=OFF
next reply other threads:[~2021-05-20 21:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 21:51 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-25 17:04 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/, sci-astronomy/kstars/files/ Andreas Sturmlechner
2023-07-25 14:05 Andreas Sturmlechner
2022-11-03 8:40 Andreas Sturmlechner
2022-10-07 10:08 Andreas Sturmlechner
2021-10-02 11:26 Andreas Sturmlechner
2018-04-26 3:32 Andreas Sturmlechner
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=1621547493.5a36d6651fcd49e5f9c2264ab52ec0dba552eb4c.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