* [gentoo-commits] repo/gentoo:master commit in: kde-apps/libkdcraw/, kde-apps/libkdcraw/files/
@ 2017-01-29 12:41 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2017-01-29 12:41 UTC (permalink / raw
To: gentoo-commits
commit: 0c44a69cfad936e0cb969503083a5099d2f7ef70
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 12:41:31 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 12:41:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c44a69c
kde-apps/libkdcraw: Fix build w/ ecm 5.31
Add upstream patch to fix build with next extra cmake modules version. This add
cflags -fno-operator-names by default, which breaks the build here.
Thanks-to: karolherbst
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../libkdcraw/files/libkdcraw-16.12.1-ecm531.patch | 31 ++++++++++++++++++++++
kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild | 2 ++
2 files changed, 33 insertions(+)
diff --git a/kde-apps/libkdcraw/files/libkdcraw-16.12.1-ecm531.patch b/kde-apps/libkdcraw/files/libkdcraw-16.12.1-ecm531.patch
new file mode 100644
index 00000000..4199334
--- /dev/null
+++ b/kde-apps/libkdcraw/files/libkdcraw-16.12.1-ecm531.patch
@@ -0,0 +1,31 @@
+commit 0c7d309289c78631be4b595119d4783fe21cf65b
+Author: Aleix Pol <aleixpol@kde.org>
+Date: Wed Jan 18 12:13:20 2017 +0100
+
+ Fix build
+
+ frameworks/libkdcraw/src/kdcraw_p.h:49:5: warning: 'not' is not defined,
+ evaluates to 0
+
+diff --git a/src/kdcraw_p.h b/src/kdcraw_p.h
+index f639ca4..71b36b3 100644
+--- a/src/kdcraw_p.h
++++ b/src/kdcraw_p.h
+@@ -31,7 +31,7 @@
+ #include <QByteArray>
+
+ // Pragma directives to reduce warnings from LibRaw header files.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+@@ -46,7 +46,7 @@
+ #include <libraw.h>
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
diff --git a/kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild b/kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild
index bbd65e4..1daec0d 100644
--- a/kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild
@@ -17,3 +17,5 @@ DEPEND="
>=media-libs/libraw-0.16:=
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-ecm531.patch" )
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/libkdcraw/, kde-apps/libkdcraw/files/
@ 2022-12-20 19:00 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-12-20 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 78098dcdcada83ae1d861e02a7cb230de3e6c670
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 18:49:02 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 18:59:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78098dcd
kde-apps/libkdcraw: Fix build against >=media-libs/libraw-0.21.0
Closes: https://bugs.gentoo.org/887355
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libkdcraw-22.12.0-libraw-0.21.patch | 28 ++++++++++++++++++++++
kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild | 2 ++
2 files changed, 30 insertions(+)
diff --git a/kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch b/kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch
new file mode 100644
index 000000000000..1c03556777f3
--- /dev/null
+++ b/kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch
@@ -0,0 +1,28 @@
+From 0843c601cbb9a9bb5774ed01b7d90e68fd17950a Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sun, 18 Dec 2022 15:59:51 +0100
+Subject: [PATCH] Fix build with libraw 0.21
+
+---
+ src/kdcraw.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/kdcraw.cpp b/src/kdcraw.cpp
+index 376a37d..1433c4b 100644
+--- a/src/kdcraw.cpp
++++ b/src/kdcraw.cpp
+@@ -357,7 +357,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI
+ d->setProgress(0.3);
+
+ raw.imgdata.params.output_bps = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++ raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+ raw.imgdata.params.shot_select = shotSelect;
++#endif
+ ret = raw.unpack();
+
+ if (ret != LIBRAW_SUCCESS)
+--
+GitLab
+
diff --git a/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild b/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild
index 7cee686a58c3..1997ea10e90a 100644
--- a/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild
@@ -18,3 +18,5 @@ DEPEND="
>=media-libs/libraw-0.16:=
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-libraw-0.21.patch ) # bug 887355
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-20 19:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-29 12:41 [gentoo-commits] repo/gentoo:master commit in: kde-apps/libkdcraw/, kde-apps/libkdcraw/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2022-12-20 19:00 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox