From 1c390bc207fed7172d6b62f8fac370c3b9d2aea6 Mon Sep 17 00:00:00 2001
From: hillwood <>
Date: Jan 28 2023 19:09:51 +0000
Subject: Update deepin-image-viewer to version 5.9.9 / rev 8 via SR 1061716
https://build.opensuse.org/request/show/1061716
by user hillwood + dimstar_suse
- Add update-libraw-api.patch, update api for libraw
- Update version to 5.9.9
* Fix bugs
- Update version to 5.9.7
* Fix bugs
- Drop fix-library-link.patch (forwarded request 1061715 from hillwood)
---
diff --git a/.files b/.files
index a0d1ede..8e94497 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 38214ba..a0e1baf 100644
--- a/.rev
+++ b/.rev
@@ -64,4 +64,19 @@
Automatic submission by obs-autosubmit
1000769
+
+ fa67ce04cb8b056f93c2e571f7c86f1e
+ 5.9.9
+
+ dimstar_suse
+ - Add update-libraw-api.patch, update api for libraw
+
+- Update version to 5.9.9
+ * Fix bugs
+
+- Update version to 5.9.7
+ * Fix bugs
+- Drop fix-library-link.patch (forwarded request 1061715 from hillwood)
+ 1061716
+
diff --git a/deepin-image-viewer-5.9.4.tar.gz b/deepin-image-viewer-5.9.4.tar.gz
deleted file mode 120000
index 9c724f6..0000000
--- a/deepin-image-viewer-5.9.4.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeib6wc3xbrngrtrezdmdcml45huf5ic5ekap24hilfbtgxbaly5gcy
\ No newline at end of file
diff --git a/deepin-image-viewer-5.9.9.tar.gz b/deepin-image-viewer-5.9.9.tar.gz
new file mode 120000
index 0000000..b3fb857
--- /dev/null
+++ b/deepin-image-viewer-5.9.9.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeiae6y7hbm5wibz6fhmtashqhmhyafbbuuexk66s5begb4ycwo7e7y
\ No newline at end of file
diff --git a/deepin-image-viewer.changes b/deepin-image-viewer.changes
index b52e87e..6276969 100644
--- a/deepin-image-viewer.changes
+++ b/deepin-image-viewer.changes
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Sat Jan 28 07:26:47 UTC 2023 - Hillwood Yang
+
+- Add update-libraw-api.patch, update api for libraw
+
+-------------------------------------------------------------------
+Sat Jan 21 15:39:18 UTC 2023 - Hillwood Yang
+
+- Update version to 5.9.9
+ * Fix bugs
+
+-------------------------------------------------------------------
+Sat Nov 26 11:55:32 UTC 2022 - Hillwood Yang
+
+- Update version to 5.9.7
+ * Fix bugs
+- Drop fix-library-link.patch
+
+-------------------------------------------------------------------
Fri Aug 26 02:07:21 UTC 2022 - Hillwood Yang
- Update version to 5.9.4
diff --git a/deepin-image-viewer.spec b/deepin-image-viewer.spec
index b977d16..d5cbc5e 100644
--- a/deepin-image-viewer.spec
+++ b/deepin-image-viewer.spec
@@ -1,7 +1,7 @@
#
# spec file for package deepin-image-viewer
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2017-2022 Hillwood Yang
#
# All modifications and additions to the file contributed by third parties
@@ -24,15 +24,18 @@
%endif
Name: deepin-image-viewer
-Version: 5.9.4
+Version: 5.9.9
Release: 0
Summary: Deepin Image Viewer
License: GPL-3.0-or-later
Group: Productivity/Graphics/Viewers
URL: https://github.com/linuxdeepin/deepin-image-viewer
Source0: https://github.com/linuxdeepin/deepin-image-viewer/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0: fix-library-link.patch
Source99: %{name}.appdata.xml
+%if 0%{?suse_version} > 1500
+# PATCH-FIX-UPSTREAM update-libraw-api.patch hillwood@opensuse.org - Update api for libraw
+Patch0: update-libraw-api.patch
+%endif
BuildRequires: deepin-gettext-tools
%ifarch ppc ppc64 ppc64le s390 s390x
BuildRequires: deepin-desktop-base
@@ -85,7 +88,6 @@ sed -i 's/Exec=deepin-image-viewer/Exec=env QT_QPA_PLATFORMTHEME=deepin deepin-i
src/%{name}.desktop
sed -i 's|"../libimageviewer/image-viewer_global.h"||g' \
src/src/module/view/homepagewidget.cpp
-sed -i '/target_link_libraries/s/imageviewer/imageviewer tiff/g' src/CMakeLists.txt
%build
%cmake -DCMAKE_BUILD_TYPE=Release \
@@ -102,20 +104,20 @@ cp %{SOURCE99} %{buildroot}%{_datadir}/appdata/
RELEASE_DATE=$(stat --format="%%y" %{SOURCE0} | grep -Po "\\d{4}-\\d{2}-\\d{2}")
sed -i "s/@VERSION@/%{version}/g;s/@DATE@/$RELEASE_DATE/g" \
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
-# Fix desktop file
+
+# Fix desktop profile
%suse_update_desktop_file -r -G "Deepin Image Viewer" %{name} Graphics 2DGraphics RasterGraphics Viewer
+
# Find translations
%find_lang %{name} --with-qt
%fdupes %{buildroot}
%files
-%doc README.md
-%license LICENSE
+%doc README.md README.zh_CN.md
+%license LICENSE.txt
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/icons/
-%dir %{_datadir}/%{name}/translations
-%{_datadir}/%{name}/translations/deepin-image-viewer.qm
%{_datadir}/deepin-manual/manual-assets/application/%{name}
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/%{name}.desktop
@@ -125,6 +127,8 @@ sed -i "s/@VERSION@/%{version}/g;s/@DATE@/$RELEASE_DATE/g" \
%{_datadir}/dbus-1/services/com.deepin.ImageViewer.service
%files lang -f %{name}.lang
+%dir %{_datadir}/%{name}/translations
%lang(ast) %{_datadir}/deepin-image-viewer/translations/deepin-image-viewer_ast.qm
+%{_datadir}/%{name}/translations/deepin-image-viewer.qm
%changelog
diff --git a/fix-library-link.patch b/fix-library-link.patch
deleted file mode 100644
index 6510733..0000000
--- a/fix-library-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur deepin-image-viewer-5.9.2/src/CMakeLists.txt deepin-image-viewer-5.9.2-new/src/CMakeLists.txt
---- deepin-image-viewer-5.9.2/src/CMakeLists.txt 2022-05-31 15:13:49.000000000 +0800
-+++ deepin-image-viewer-5.9.2-new/src/CMakeLists.txt 2022-06-11 21:19:16.127075228 +0800
-@@ -65,6 +65,7 @@
- pkg_check_modules(3rd_lib REQUIRED
- dtkwidget
- dtkcore
-+ libtiff-4
- )
-
- ## translations
diff --git a/update-libraw-api.patch b/update-libraw-api.patch
new file mode 100644
index 0000000..2f962a7
--- /dev/null
+++ b/update-libraw-api.patch
@@ -0,0 +1,12 @@
+diff -Nur deepin-image-viewer-5.9.9/qimage-plugins/libraw/rawiohandler.cpp deepin-image-viewer-5.9.9-new/qimage-plugins/libraw/rawiohandler.cpp
+--- deepin-image-viewer-5.9.9/qimage-plugins/libraw/rawiohandler.cpp 2022-12-12 16:23:39.000000000 +0800
++++ deepin-image-viewer-5.9.9-new/qimage-plugins/libraw/rawiohandler.cpp 2023-01-28 15:02:40.618286558 +0800
+@@ -63,7 +63,7 @@
+
+ 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;