deepin-image-viewer: 5.9.13 -> 6.0.2

pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch

@@ -1,25 +0,0 @@
-From c2fa29800c64f5bda04203bb2eb1845b29c1de3c Mon Sep 17 00:00:00 2001
-From: rewine <luhongxu@deepin.org>
-Date: Fri, 25 Mar 2022 18:20:17 +0800
-Subject: [PATCH] fix install path for nix
-
----
- qimage-plugins/libraw/CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/qimage-plugins/libraw/CMakeLists.txt b/qimage-plugins/libraw/CMakeLists.txt
-index 4bfd85ad..00d11bd3 100644
---- a/qimage-plugins/libraw/CMakeLists.txt
-+++ b/qimage-plugins/libraw/CMakeLists.txt
-@@ -44,7 +44,6 @@ target_include_directories(xraw PUBLIC ${RAW_INCLUDE_DIRS}  ${Qt5Gui_INCLUDE_DIR
- 
- target_link_libraries(${CMD_NAME} Qt5::Core Qt5::Gui raw)
- 
--install(TARGETS ${CMD_NAME} DESTINATION ${Qt5Core_DIR}/../../qt5/plugins/imageformats)
--
-+install(TARGETS ${CMD_NAME} DESTINATION qt5/plugins/imageformats)
- 
- QT5_USE_MODULES(${PROJECT_NAME} Core Gui)
--- 
-2.35.1
-

pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix

@@ -2,52 +2,42 @@
 , lib
 , fetchFromGitHub
 , fetchpatch
-, qtbase
-, qtsvg
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, gio-qt
-, udisks2-qt5
-, image-editor
 , cmake
 , pkg-config
 , qttools
 , wrapQtAppsHook
+, qt5platform-plugins
+, qtbase
+, dtkwidget
+, dtkdeclarative
+, deepin-ocr-plugin-manager
+, gio-qt
+, udisks2-qt5
+, image-editor
 , libraw
 , libexif
+, freeimage
 }:
 
 stdenv.mkDerivation rec {
   pname = "deepin-image-viewer";
-  version = "5.9.13";
+  version = "6.0.2";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-T/hbygnbao5rbw0gHH0ULHOz/2j70ktyzYGWXPDCJoQ=";
+    hash = "sha256-YT3wK+ELXjgtsXbkiCjQF0zczQi89tF1kyIQtl9/mMA=";
   };
 
   patches = [
-    ./0001-fix-install-path-for-nix.patch
-    (fetchpatch {
-      name = "chore-use-GNUInstallDirs-in-CmakeLists.patch";
-      url = "https://github.com/linuxdeepin/deepin-image-viewer/commit/4a046e6207fea306e592fddc33c1285cf719a63d.patch";
-      sha256 = "sha256-aIgYmq6WDfCE+ZcD0GshxM+QmBWZGjh9MzZcTMrhBJ0=";
-    })
     (fetchpatch {
       name = "fix-build-with-libraw-0_21.patch";
       url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch";
-      sha256 = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w=";
+      hash = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w=";
     })
   ];
 
-  postPatch = ''
-    substituteInPlace src/com.deepin.ImageViewer.service \
-      --replace "/usr/bin/deepin-image-viewer" "$out/bin/deepin-image-viewer"
-  '';
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -56,16 +46,12 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    dtkwidget
-    qt5integration
     qt5platform-plugins
-    gio-qt
-    udisks2-qt5
-    image-editor
+    dtkwidget
+    dtkdeclarative
+    deepin-ocr-plugin-manager
     libraw
-    libexif
+    freeimage
   ];
 
   strictDeps = true;