From bf8c24d3de9515b942ed526ce5d7fd29f92b376f Mon Sep 17 00:00:00 2001 From: Bogdan Burlacu Date: Thu, 25 Feb 2021 18:40:33 +0100 Subject: [PATCH 1/2] qt515 compatibility for qpdfview 0.4.18 --- pkgs/applications/misc/qpdfview/default.nix | 3 ++- .../misc/qpdfview/qpdfview-qt515-compat.patch | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 6ae81fca27c..a769ab366d3 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -14,11 +14,12 @@ let buildInputs = [ qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; + patches = [ ./qpdfview-qt515-compat.patch ]; in mkDerivation { pname = s.baseName; inherit (s) version; - inherit nativeBuildInputs buildInputs; + inherit nativeBuildInputs buildInputs patches; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch b/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch new file mode 100644 index 00000000000..1fbf5ec3f10 --- /dev/null +++ b/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch @@ -0,0 +1,17 @@ +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 ++#include + #include + #include + #include + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33f572ed600..4f8e35ebb9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25594,7 +25594,7 @@ in vimv = callPackage ../tools/misc/vimv/default.nix { }; - qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; From 6790f75d55673623bb797011407a146f2067d3d7 Mon Sep 17 00:00:00 2001 From: Bogdan Burlacu Date: Thu, 25 Feb 2021 22:54:53 +0100 Subject: [PATCH 2/2] update meta.license and add comment for patch --- pkgs/applications/misc/qpdfview/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index a769ab366d3..954c1709761 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -14,6 +14,7 @@ let buildInputs = [ qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; + # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 patches = [ ./qpdfview-qt515-compat.patch ]; in mkDerivation { @@ -41,7 +42,7 @@ mkDerivation { meta = { inherit (s) version; description = "A tabbed document viewer"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; homepage = "https://launchpad.net/qpdfview";