Merge pull request #213513 from zendo/update/qpdfview

qpdfview: 0.4.18 -> 0.5.0

pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch

@@ -1,17 +0,0 @@
-Fix compatibility with Qt 5.15.
-
-Patch copied from upstream source repository:
-
-https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104
-
---- a/sources/model.h	2017-04-19 21:01:25 +0000
-+++ b/sources/model.h	2020-06-09 06:24:11 +0000
-@@ -24,6 +24,7 @@
- #define DOCUMENTMODEL_H
- 
- #include <QList>
-+#include <QPainterPath>
- #include <QtPlugin>
- #include <QWidget>
- #include <QVector>
-

pkgs/applications/office/qpdfview/default.nix

@@ -12,19 +12,21 @@
 , file
 , ghostscript
 }:
+
 mkDerivation rec {
   pname = "qpdfview";
-  version = "0.4.18";
+  version = "0.5.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
-    sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c";
+    url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-0.5.tar.gz";
+    hash = "sha256-RO/EQKRhy911eps5bxRh7novQ2ToHfVb0CIfkQIZvpk=";
   };
 
-  # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104
-  patches = [ ./qpdfview-qt515-compat.patch ];
+  nativeBuildInputs = [
+    qmake
+    pkg-config
+  ];
 
-  nativeBuildInputs = [ qmake pkg-config ];
   buildInputs = [
     qtbase
     qtsvg
@@ -35,6 +37,7 @@ mkDerivation rec {
     file
     ghostscript
   ];
+
   preConfigure = ''
     qmakeFlags+=(*.pro)
   '';

pkgs/top-level/all-packages.nix

@@ -33416,7 +33416,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
+  qpdfview = libsForQt5.callPackage ../applications/office/qpdfview {};
 
   qtile = callPackage ../applications/window-managers/qtile { };