git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #114406 from foolnotion/master

qt515 compatibility for qpdfview 0.4.18

commit3a2195b7501762b6f218aeb0b9090b4a22d82306 authorMichael Raskin <7c6f434c@mail.ru> dateFri 26 Feb 2021, 17:40 (6 years ago) parentc6bcceb6790f75
3 files changed+22−3
pkgs/applications/misc/qpdfview/default.nix+4−2 pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch+17 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/misc/qpdfview/default.nix+4−2
@@ -14,11 +14,13 @@ let
1414 buildInputs = [
1515 qtbase qtsvg poppler djvulibre libspectre cups file ghostscript
1616 ];
17+ # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104
18+ patches = [ ./qpdfview-qt515-compat.patch ];
1719in
1820mkDerivation {
1921 pname = s.baseName;
2022 inherit (s) version;
21− inherit nativeBuildInputs buildInputs;
23+ inherit nativeBuildInputs buildInputs patches;
2224 src = fetchurl {
2325 inherit (s) url sha256;
2426 };
@@ -40,7 +42,7 @@ mkDerivation {
4042 meta = {
4143 inherit (s) version;
4244 description = "A tabbed document viewer";
43− license = lib.licenses.gpl2;
45+ license = lib.licenses.gpl2Plus;
4446 maintainers = [lib.maintainers.raskin];
4547 platforms = lib.platforms.linux;
4648 homepage = "https://launchpad.net/qpdfview";
pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patchnew file+17
@@ -0,0 +1,17 @@
1+Fix compatibility with Qt 5.15.
2+
3+Patch copied from upstream source repository:
4+
5+https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104
6+
7+--- a/sources/model.h 2017-04-19 21:01:25 +0000
8++++ b/sources/model.h 2020-06-09 06:24:11 +0000
9+@@ -24,6 +24,7 @@
10+ #define DOCUMENTMODEL_H
11+
12+ #include <QList>
13++#include <QPainterPath>
14+ #include <QtPlugin>
15+ #include <QWidget>
16+ #include <QVector>
17+
pkgs/top-level/all-packages.nix+1−1
@@ -25618,7 +25618,7 @@ in
2561825618
2561925619 vimv = callPackage ../tools/misc/vimv/default.nix { };
2562025620
25621− qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {};
25621+ qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
2562225622
2562325623 qtile = callPackage ../applications/window-managers/qtile {
2562425624 inherit (xorg) libxcb;