[pkgsrc/trunk]: pkgsrc/print/qpdfview qpdfview: Fix build with latest Qt. Use...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbd1aad1d231
branches:  trunk
changeset: 434933:cbd1aad1d231
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jun 28 14:55:17 2020 +0000

description:
qpdfview: Fix build with latest Qt. Use libcups.

diffstat:

 print/qpdfview/Makefile                      |   6 +++---
 print/qpdfview/distinfo                      |   3 ++-
 print/qpdfview/patches/patch-sources_model.h |  14 ++++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 7bddb5840ba8 -r cbd1aad1d231 print/qpdfview/Makefile
--- a/print/qpdfview/Makefile   Sun Jun 28 14:45:08 2020 +0000
+++ b/print/qpdfview/Makefile   Sun Jun 28 14:55:17 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2020/06/02 08:24:38 adam Exp $
+# $NetBSD: Makefile,v 1.91 2020/06/28 14:55:17 nia Exp $
 
 DISTNAME=      qpdfview-0.4.18
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    print
 MASTER_SITES=  https://launchpad.net/qpdfview/trunk/${PKGVERSION_NOREV}/+download/
 
@@ -25,7 +25,7 @@
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../print/cups-base/buildlink3.mk"
+.include "../../print/libcups/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/poppler-qt5/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff -r 7bddb5840ba8 -r cbd1aad1d231 print/qpdfview/distinfo
--- a/print/qpdfview/distinfo   Sun Jun 28 14:45:08 2020 +0000
+++ b/print/qpdfview/distinfo   Sun Jun 28 14:55:17 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2019/11/08 13:38:48 nia Exp $
+$NetBSD: distinfo,v 1.7 2020/06/28 14:55:17 nia Exp $
 
 SHA1 (qpdfview-0.4.18.tar.gz) = 670c762436927a37980159206472d5a7a194da70
 RMD160 (qpdfview-0.4.18.tar.gz) = 28d6676a7fc76b38f23b867b0d34a92d5002cec4
@@ -6,4 +6,5 @@
 Size (qpdfview-0.4.18.tar.gz) = 786577 bytes
 SHA1 (patch-application.pro) = 11dd983ed4814f1c4913663b0bca13170fd8edfe
 SHA1 (patch-qpdfview.pri) = d569e92af7ee8baa80eec93df46d927f9bde3374
+SHA1 (patch-sources_model.h) = 9638186f83b3ebb311ef15a89a3be44530abd9db
 SHA1 (patch-sources_pdfmodel.cpp) = a718b01601d69bd4dfc4d3c4da0a19cd3f3f21ad
diff -r 7bddb5840ba8 -r cbd1aad1d231 print/qpdfview/patches/patch-sources_model.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/qpdfview/patches/patch-sources_model.h      Sun Jun 28 14:55:17 2020 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-sources_model.h,v 1.1 2020/06/28 14:55:17 nia Exp $
+
+Fix Qt 5.15 fallout.
+
+--- sources/model.h.orig       2019-07-24 19:18:33.000000000 +0000
++++ sources/model.h
+@@ -24,6 +24,7 @@ along with qpdfview.  If not, see <http:
+ #define DOCUMENTMODEL_H
+ 
+ #include <QList>
++#include <QPainterPath>
+ #include <QtPlugin>
+ #include <QWidget>
+ #include <QVector>