CVS commit: pkgsrc/security/qca2

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Aug 17 09:01:06 UTC 2025

Modified Files:
        pkgsrc/security/qca2: Makefile distinfo
        pkgsrc/security/qca2/patches: patch-CMakeLists.txt

Log Message:
qca2: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/security/qca2/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/qca2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/qca2/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/security/qca2/Makefile
diff -u pkgsrc/security/qca2/Makefile:1.51 pkgsrc/security/qca2/Makefile:1.52
--- pkgsrc/security/qca2/Makefile:1.51  Thu Apr 24 14:15:40 2025
+++ pkgsrc/security/qca2/Makefile       Sun Aug 17 09:01:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2025/04/24 14:15:40 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2025/08/17 09:01:06 wiz Exp $
 
 PKGNAME=       qca2-${DISTNAME:C/.*-//}
 PKGREVISION=   8
@@ -14,6 +14,7 @@ INSTALLATION_DIRS=    lib/pkgconfig
 CMAKE_CONFIGURE_ARGS+= -DBUILD_PLUGINS=none
 CMAKE_CONFIGURE_ARGS+= -DQT4_BUILD=ON
 CMAKE_CONFIGURE_ARGS+= -DQCA_MAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 PKGCONFIG_OVERRIDE=            lib/pkgconfig/qca2.pc
 PKGCONFIG_OVERRIDE_STAGE=      post-configure

Index: pkgsrc/security/qca2/distinfo
diff -u pkgsrc/security/qca2/distinfo:1.12 pkgsrc/security/qca2/distinfo:1.13
--- pkgsrc/security/qca2/distinfo:1.12  Tue Oct 26 11:17:51 2021
+++ pkgsrc/security/qca2/distinfo       Sun Aug 17 09:01:06 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:17:51 nia Exp $
+$NetBSD: distinfo,v 1.13 2025/08/17 09:01:06 wiz Exp $
 
 BLAKE2s (qca-2.2.1.tar.xz) = 57889a6b3f467251c27084e8d40b376209127141d3622dcc0953109a68a18c8b
 SHA512 (qca-2.2.1.tar.xz) = 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
 Size (qca-2.2.1.tar.xz) = 691676 bytes
-SHA1 (patch-CMakeLists.txt) = 4867c54f8bff523233a11201bdb021e6e81a10ed
+SHA1 (patch-CMakeLists.txt) = f9eaec016b4d933238314f019bb09969d24ddd6b

Index: pkgsrc/security/qca2/patches/patch-CMakeLists.txt
diff -u pkgsrc/security/qca2/patches/patch-CMakeLists.txt:1.1 pkgsrc/security/qca2/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/security/qca2/patches/patch-CMakeLists.txt:1.1       Wed Jan 31 09:14:55 2018
+++ pkgsrc/security/qca2/patches/patch-CMakeLists.txt   Sun Aug 17 09:01:06 2025
@@ -1,10 +1,23 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2018/01/31 09:14:55 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2025/08/17 09:01:06 wiz Exp $
+
+Fix build with cmake 4.
 
 Add mozilla-rootcerts certstore to list
 
---- CMakeLists.txt.orig        2018-01-31 20:15:27.000000000 +0000
+--- CMakeLists.txt.orig        2019-04-24 12:58:14.000000000 +0000
 +++ CMakeLists.txt
-@@ -304,6 +304,7 @@ else ( WIN32 )
+@@ -14,10 +14,6 @@ set(QCA_LIB_MAJOR_VERSION "2")
+ set(QCA_LIB_MINOR_VERSION "2")
+ set(QCA_LIB_PATCH_VERSION "1")
+ 
+-if(POLICY CMP0042)
+-  cmake_policy(SET CMP0042 OLD)
+-endif()
+-
+ option(BUILD_TESTS "Create test" ON)
+ option(BUILD_TOOLS "Compile mozcerts and qcatool" ON)
+ set(BUILD_PLUGINS "auto" CACHE STRING "Plugins for building (also possible values: none, all and auto)")
+@@ -309,6 +305,7 @@ else ( WIN32 )
        "/etc/pki/tls/cert.pem"
        "/etc/ssl/ca-bundle.pem"
        "/usr/share/curl/curl-ca-bundle.crt"