deepin-image-viewer.spec

@@ -1,15 +1,17 @@
 Name:           deepin-image-viewer
-Version:        5.7.15
+Version:        1.3.17
 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-linguist 
+BuildRequires:  qt5-qttools-devel
+BuildRequires:  dtkcore2-devel
+BuildRequires:  dtkwidget2-devel
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5DBus)
@@ -19,39 +21,35 @@ 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
-%autosetup -p1
+%setup -q
- 
+sed -i 's|lrelease|lrelease-qt5|g' viewer/generate_translations.sh
+sed -i 's|lrelease|lrelease-qt5|g' viewer/viewer.pro
+
+
 %build
-# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
+
-export PATH=%{_qt5_bindir}:$PATH
+%qmake_qt5 PREFIX=%{_prefix}
-%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
@@ -60,26 +58,12 @@ export PATH=%{_qt5_bindir}:$PATH
 %{_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
 

libraw.patch

@@ -1,13 +0,0 @@
-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;