Compare commits

...

13 Commits

Author SHA1 Message Date
openeuler-ci-bot
10c81e263b
!15 Fix compilation failure caused by libraw upgrade
From: @leeffo 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
2023-07-06 08:43:57 +00:00
leeffo
c7c2019ab0 Fix compilation failure caused by libraw upgrade 2023-07-06 15:59:01 +08:00
openeuler-ci-bot
93c4af2ce4
!13 [sync] PR-12: [update] update version to 5.7.15
From: @openeuler-sync-bot 
Reviewed-by: @yeqinglong01 
Signed-off-by: @yeqinglong01
2022-07-29 06:38:16 +00:00
konglidong
66464b1af1 update version to 5.7.15
(cherry picked from commit fcc0c7e9783161b61107ec5a69afcdbdac0e03cf)
2022-07-28 17:26:42 +08:00
openeuler-ci-bot
8e5d7d6c16
!11 [sync] PR-8: fix build error
From: @openeuler-sync-bot 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
2022-06-17 06:57:16 +00:00
liweiganga
cbc76e2359 fix build error
(cherry picked from commit 457b849af90cdb1441fe714a7eb2e779e0fbab1c)
2022-06-17 14:37:53 +08:00
openeuler-ci-bot
835fe1783c !5 Update deepin-image-viewer to 5.6.3.49
From: @weidongkl
Reviewed-by: @yeqinglong01
Signed-off-by: @yeqinglong01
2021-07-20 06:45:11 +00:00
weidong
2ef1d3c876 Update deepin-image-viewer 2021-07-20 14:34:19 +08:00
openeuler-ci-bot
284d959408 !4 fix compile error
Merge pull request !4 from panchenbo/master
2020-09-04 12:45:22 +08:00
panchenbo
5294df25e2 fix compile error 2020-09-04 12:06:41 +08:00
openeuler-ci-bot
a3f453c506 !3 fix compile error
Merge pull request !3 from panchenbo/master
2020-08-28 11:01:52 +08:00
openeuler-ci-bot
2b68686682 !2 add yaml and fix spec
Merge pull request !2 from panchenbo/master
2020-07-30 17:14:51 +08:00
openeuler-ci-bot
f1753e6dec !1 package init
Merge pull request !1 from panchenbo/master
2020-07-15 09:42:37 +08:00
4 changed files with 50 additions and 21 deletions

Binary file not shown.

View File

@ -1,17 +1,15 @@
Name: deepin-image-viewer
Version: 1.3.17
Version: 5.7.15
Release: 2
Summary: Deepin Image Viewer
License: GPLv3
URL: https://github.com/linuxdeepin/deepin-image-viewer
Source0: %{name}-%{version}.tar.gz
Source0: %{name}_%{version}.tar.gz
Patch0: libraw.patch
BuildRequires: gcc-c++
BuildRequires: freeimage-devel
BuildRequires: qt5-linguist
BuildRequires: qt5-qttools-devel
BuildRequires: dtkcore2-devel
BuildRequires: dtkwidget2-devel
BuildRequires: qt5-linguist
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5DBus)
@ -21,35 +19,39 @@ BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: dtkwidget-devel
BuildRequires: dtkcore-devel
BuildRequires: dtkgui-devel
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(libraw)
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: udisks2-qt5-devel
BuildRequires: libgio-qt libgio-qt-devel
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: qt5-qtbase-private-devel
Requires: hicolor-icon-theme
Requires: qt5-qtimageformats
%description
%{summary}.
%prep
%setup -q
sed -i 's|lrelease|lrelease-qt5|g' viewer/generate_translations.sh
sed -i 's|lrelease|lrelease-qt5|g' viewer/viewer.pro
%autosetup -p1
%build
%qmake_qt5 PREFIX=%{_prefix}
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
export PATH=%{_qt5_bindir}:$PATH
%qmake_qt5 PREFIX=%{_prefix} DEFINES+="VERSION=%{version}"
%make_build
%install
%make_install INSTALL_ROOT=%{buildroot}
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
%files
%doc README.md
%license LICENSE
@ -58,12 +60,26 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
%{_datadir}/dbus-1/services/*.service
%{_datadir}/%{name}/
%{_datadir}/dman/%{name}/
#%{_metainfodir}/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/deepin/apps/scalable/%{name}.svg
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/deepin-manual/manual-assets/application/*
%changelog
* Thu Jul 06 2023 leeffo <liweiganga@uniontech.com> - 5.7.15-2
- fix: fix compilation failure caused by libraw upgrade
* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.7.15-1
- update to 5.7.15
* Mon Feb 07 2022 liweigang <liweiganga@uniontech.com> - 5.6.3.49-2
- fix build error
* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.6.3.49-1
- Update 5.6.3.49
* Fri Sep 4 2020 chenbo pan <panchenbo@uniontech.com> - 1.3.17-3
- fix compile fail
* Fri Aug 28 2020 chenbo pan <panchenbo@uniontech.com> - 1.3.17-2
- fix compile fail

Binary file not shown.

13
libraw.patch Normal file
View File

@ -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;