CVS commit: pkgsrc/print/okular

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul  9 20:31:46 UTC 2023

Modified Files:
        pkgsrc/print/okular: Makefile distinfo
Added Files:
        pkgsrc/print/okular/patches: patch-CMakeLists.txt

Log Message:
okular: fix build with latest poppler-qt5

which needs c++17 now


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/print/okular/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/okular/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/okular/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/okular/Makefile
diff -u pkgsrc/print/okular/Makefile:1.139 pkgsrc/print/okular/Makefile:1.140
--- pkgsrc/print/okular/Makefile:1.139  Tue Jun  6 12:42:11 2023
+++ pkgsrc/print/okular/Makefile        Sun Jul  9 20:31:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2023/06/06 12:42:11 riastradh Exp $
+# $NetBSD: Makefile,v 1.140 2023/07/09 20:31:46 wiz Exp $
 
 DISTNAME=      okular-${KAPPSVER}
 PKGREVISION=   9
@@ -14,6 +14,8 @@ TOOL_DEPENDS+=        kdoctools>=5.19.0:../../d
 
 USE_TOOLS+=    msgmerge pkg-config
 
+GCC_REQD+=     8 # std::optional
+
 # generation of kded.moc fails when ${PREFIX}/include in the moc include path
 SUBST_CLASSES+=                fix-moc
 SUBST_STAGE.fix-moc=   post-configure

Index: pkgsrc/print/okular/distinfo
diff -u pkgsrc/print/okular/distinfo:1.21 pkgsrc/print/okular/distinfo:1.22
--- pkgsrc/print/okular/distinfo:1.21   Thu Sep 29 01:10:58 2022
+++ pkgsrc/print/okular/distinfo        Sun Jul  9 20:31:46 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.21 2022/09/29 01:10:58 markd Exp $
+$NetBSD: distinfo,v 1.22 2023/07/09 20:31:46 wiz Exp $
 
 BLAKE2s (okular-22.08.1.tar.xz) = 44487711f16fc0a0753f121a658dd53a48486a90021986f5e25768e57ce6f467
 SHA512 (okular-22.08.1.tar.xz) = 1fa3c8763d7432a21448c3715e69658609bf9cc50d767f74db89a37f0ef890dff97d276526aa6f41a0fcb91c36df39a1274d243785da74ce811448d896588d43
 Size (okular-22.08.1.tar.xz) = 8225648 bytes
+SHA1 (patch-CMakeLists.txt) = 02a25bb2a13adfc2530ff51558343d9bebd20f25

Added files:

Index: pkgsrc/print/okular/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/print/okular/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sun Jul  9 20:31:46 2023
+++ pkgsrc/print/okular/patches/patch-CMakeLists.txt    Sun Jul  9 20:31:46 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2023/07/09 20:31:46 wiz Exp $
+
+poppler-qt5 needs c++17 for std::optional.
+
+--- CMakeLists.txt.orig        2022-09-04 20:26:23.000000000 +0000
++++ CMakeLists.txt
+@@ -93,7 +93,7 @@ elseif(WIN32)
+     set(ENV{QT_PLUGIN_PATH} "$ENV{QT_PLUGIN_PATH};${KDE_INSTALL_FULL_QTPLUGINDIR}")
+ endif()
+ 
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+