Fix compilation build, use C++17

3 files changed, 8 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f3d4b0815ae..4e9af2d78053 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qpdfview
 	pkgdesc = A tabbed PDF viewer using the poppler library
 	pkgver = 0.5.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://launchpad.net/qpdfview
 	arch = x86_64
 	license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index 9d6f1a5cc2b7..bbc1dbf187b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
 # Contributor: Adam Reichold <adam.reichold@t-online.de>
 pkgname=qpdfview
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tabbed PDF viewer using the poppler library"
 url="https://launchpad.net/${pkgname}"
 arch=(x86_64)
 license=(GPL2)
-depends=('libcups' 'libsynctex' 'poppler-qt5' 'qt5-svg')
-makedepends=('qt5-tools' 'libspectre' 'djvulibre')
+depends=(libcups libsynctex poppler-qt5 qt5-svg)
+makedepends=(qt5-tools libspectre djvulibre)
 optdepends=('libspectre: for PostScript support'
   'djvulibre: for DjVu support')
 source=(${url}/trunk/${pkgver}/+download/${pkgname}-${pkgver::-2}.tar.gz{,.asc})
@@ -18,6 +18,10 @@ sha512sums=('1b6b479bb42f4568c21b5f6cb0c552c4323739ba9fe46cea80cc199f48b0b49a278
   'SKIP')
 validpgpkeys=('1F521FF0F87E9E1CDE46B8A9F4928C4DD24D4DF8') # Adam Reichold <adam.reichold@t-online.de>
 
+prepare() {
+  sed -i 's/CONFIG += c++11/CONFIG += c++17/' ${pkgname}-${pkgver::-2}/qpdfview.pri
+}
+
 build() {
   cd ${pkgname}-${pkgver::-2}
   lrelease-qt5 qpdfview.pro
diff --git a/fix-gcc10-build.patch b/fix-gcc10-build.patch
deleted file mode 100644
index 94b6dce3ac29..000000000000
--- a/fix-gcc10-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/sources/model.h b/sources/model.h
-index 6363c32..dc10a8c 100644
---- a/sources/model.h
-+++ b/sources/model.h
-@@ -27,6 +27,7 @@ along with qpdfview.  If not, see <http://www.gnu.org/licenses/>.
- #include <QtPlugin>
- #include <QWidget>
- #include <QVector>
-+#include <QPainterPath>
- 
- class QAbstractItemModel;
- class QColor;