From c7c2019ab0306e7115b2344ad8c3eb28240eba2f Mon Sep 17 00:00:00 2001 From: leeffo Date: Thu, 6 Jul 2023 15:59:01 +0800 Subject: [PATCH] Fix compilation failure caused by libraw upgrade --- deepin-image-viewer.spec | 8 ++++++-- libraw.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 libraw.patch diff --git a/deepin-image-viewer.spec b/deepin-image-viewer.spec index 86d71fe..03d3e5f 100644 --- a/deepin-image-viewer.spec +++ b/deepin-image-viewer.spec @@ -1,10 +1,11 @@ Name: deepin-image-viewer Version: 5.7.15 -Release: 1 +Release: 2 Summary: Deepin Image Viewer License: GPLv3 URL: https://github.com/linuxdeepin/deepin-image-viewer Source0: %{name}_%{version}.tar.gz +Patch0: libraw.patch BuildRequires: gcc-c++ BuildRequires: freeimage-devel @@ -40,7 +41,7 @@ Requires: qt5-qtimageformats %{summary}. %prep -%autosetup +%autosetup -p1 %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -64,6 +65,9 @@ export PATH=%{_qt5_bindir}:$PATH %{_datadir}/deepin-manual/manual-assets/application/* %changelog +* Thu Jul 06 2023 leeffo - 5.7.15-2 +- fix: fix compilation failure caused by libraw upgrade + * Mon Jul 18 2022 konglidong - 5.7.15-1 - update to 5.7.15 diff --git a/libraw.patch b/libraw.patch new file mode 100644 index 0000000..24fa3a1 --- /dev/null +++ b/libraw.patch @@ -0,0 +1,13 @@ +diff --git a/qimage-plugins/libraw/rawiohandler.cpp b/qimage-plugins/libraw/rawiohandler.cpp +index 9fd56da..bd669f0 100644 +--- a/qimage-plugins/libraw/rawiohandler.cpp ++++ b/qimage-plugins/libraw/rawiohandler.cpp +@@ -84,7 +84,7 @@ bool RawIOHandlerPrivate::load(QIODevice *device) + + stream = new Datastream(device); + raw = new LibRaw; +- raw->imgdata.params.use_rawspeed = 1; ++ raw->imgdata.rawparams.use_rawspeed = 1; + if (raw->open_datastream(stream) != LIBRAW_SUCCESS) { + delete raw; + raw = nullptr; -- Gitee