Sun Jun 28 14:55:17 2020 UTC ()
qpdfview: Fix build with latest Qt. Use libcups.


(nia)
diff -r1.90 -r1.91 pkgsrc/print/qpdfview/Makefile
diff -r1.6 -r1.7 pkgsrc/print/qpdfview/distinfo
diff -r0 -r1.1 pkgsrc/print/qpdfview/patches/patch-sources_model.h
cvs diff -r1.90 -r1.91 pkgsrc/print/qpdfview/Makefile (expand / switch to unified diff)

--- pkgsrc/print/qpdfview/Makefile 2020/06/02 08:24:38 1.90
+++ pkgsrc/print/qpdfview/Makefile 2020/06/28 14:55:17 1.91
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.90 2020/06/02 08:24:38 adam Exp $ 1# $NetBSD: Makefile,v 1.91 2020/06/28 14:55:17 nia Exp $
2 2
3DISTNAME= qpdfview-0.4.18 3DISTNAME= qpdfview-0.4.18
4PKGREVISION= 8 4PKGREVISION= 9
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= https://launchpad.net/qpdfview/trunk/${PKGVERSION_NOREV}/+download/ 6MASTER_SITES= https://launchpad.net/qpdfview/trunk/${PKGVERSION_NOREV}/+download/
7 7
8MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= https://launchpad.net/qpdfview 9HOMEPAGE= https://launchpad.net/qpdfview
10COMMENT= Tabbed PDF viewer 10COMMENT= Tabbed PDF viewer
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= poppler-data-[0-9]*:../../print/poppler-data 13DEPENDS+= poppler-data-[0-9]*:../../print/poppler-data
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18 18
19INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} 19INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
20 20
21do-configure: 21do-configure:
22 cd ${WRKSRC} && env ${CONFIGURE_ENV} PKGMANDIR=${PKGMANDIR} \ 22 cd ${WRKSRC} && env ${CONFIGURE_ENV} PKGMANDIR=${PKGMANDIR} \
23 ${QTDIR}/bin/qmake qpdfview.pro 23 ${QTDIR}/bin/qmake qpdfview.pro
24 24
25.include "../../graphics/djvulibre-lib/buildlink3.mk" 25.include "../../graphics/djvulibre-lib/buildlink3.mk"
26.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 26.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
27.include "../../graphics/librsvg/buildlink3.mk" 27.include "../../graphics/librsvg/buildlink3.mk"
28.include "../../print/cups-base/buildlink3.mk" 28.include "../../print/libcups/buildlink3.mk"
29.include "../../print/libspectre/buildlink3.mk" 29.include "../../print/libspectre/buildlink3.mk"
30.include "../../print/poppler-qt5/buildlink3.mk" 30.include "../../print/poppler-qt5/buildlink3.mk"
31.include "../../x11/qt5-qtbase/buildlink3.mk" 31.include "../../x11/qt5-qtbase/buildlink3.mk"
32.include "../../x11/qt5-qtsvg/buildlink3.mk" 32.include "../../x11/qt5-qtsvg/buildlink3.mk"
33.include "../../sysutils/desktop-file-utils/desktopdb.mk" 33.include "../../sysutils/desktop-file-utils/desktopdb.mk"
34.include "../../sysutils/file/buildlink3.mk" 34.include "../../sysutils/file/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/print/qpdfview/distinfo (expand / switch to unified diff)

--- pkgsrc/print/qpdfview/distinfo 2019/11/08 13:38:48 1.6
+++ pkgsrc/print/qpdfview/distinfo 2020/06/28 14:55:17 1.7
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.6 2019/11/08 13:38:48 nia Exp $ 1$NetBSD: distinfo,v 1.7 2020/06/28 14:55:17 nia Exp $
2 2
3SHA1 (qpdfview-0.4.18.tar.gz) = 670c762436927a37980159206472d5a7a194da70 3SHA1 (qpdfview-0.4.18.tar.gz) = 670c762436927a37980159206472d5a7a194da70
4RMD160 (qpdfview-0.4.18.tar.gz) = 28d6676a7fc76b38f23b867b0d34a92d5002cec4 4RMD160 (qpdfview-0.4.18.tar.gz) = 28d6676a7fc76b38f23b867b0d34a92d5002cec4
5SHA512 (qpdfview-0.4.18.tar.gz) = 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66 5SHA512 (qpdfview-0.4.18.tar.gz) = 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66
6Size (qpdfview-0.4.18.tar.gz) = 786577 bytes 6Size (qpdfview-0.4.18.tar.gz) = 786577 bytes
7SHA1 (patch-application.pro) = 11dd983ed4814f1c4913663b0bca13170fd8edfe 7SHA1 (patch-application.pro) = 11dd983ed4814f1c4913663b0bca13170fd8edfe
8SHA1 (patch-qpdfview.pri) = d569e92af7ee8baa80eec93df46d927f9bde3374 8SHA1 (patch-qpdfview.pri) = d569e92af7ee8baa80eec93df46d927f9bde3374
 9SHA1 (patch-sources_model.h) = 9638186f83b3ebb311ef15a89a3be44530abd9db
9SHA1 (patch-sources_pdfmodel.cpp) = a718b01601d69bd4dfc4d3c4da0a19cd3f3f21ad 10SHA1 (patch-sources_pdfmodel.cpp) = a718b01601d69bd4dfc4d3c4da0a19cd3f3f21ad
File Added: pkgsrc/print/qpdfview/patches/patch-sources_model.h
$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>