mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-libs/kdsoap-ws-discovery-client: Fix CMake <3.16 warning
Closes: https://bugs.gentoo.org/964515 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -0,0 +1,84 @@
|
||||
From eb5dad3493c959a97f889a145afa749db4ad2780 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Fri, 17 Oct 2025 22:22:07 +0200
|
||||
Subject: [PATCH] Raise CMake minimum to 3.10..3.31 range
|
||||
|
||||
Successfully tested with CMake 4.1.2.
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
autotests/CMakeLists.txt | 2 --
|
||||
docs/CMakeLists.txt | 2 --
|
||||
examples/onvif-discover/CMakeLists.txt | 2 --
|
||||
src/CMakeLists.txt | 2 --
|
||||
5 files changed, 1 insertion(+), 9 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 56361f6..20a885c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
# SPDX-FileCopyrightText: 2019 Casper Meijn <casper@meijn.net>
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
-cmake_minimum_required(VERSION 3.7)
|
||||
+cmake_minimum_required(VERSION 3.16..3.31)
|
||||
|
||||
project(kdsoap-ws-discovery-client VERSION 0.4.0)
|
||||
|
||||
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
|
||||
index 3635fec..7ecabb0 100644
|
||||
--- a/autotests/CMakeLists.txt
|
||||
+++ b/autotests/CMakeLists.txt
|
||||
@@ -2,8 +2,6 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
#
|
||||
|
||||
-cmake_minimum_required(VERSION 3.7)
|
||||
-
|
||||
include(ECMAddTests)
|
||||
|
||||
ecm_add_tests(
|
||||
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
|
||||
index 60e26a4..f2d75c8 100644
|
||||
--- a/docs/CMakeLists.txt
|
||||
+++ b/docs/CMakeLists.txt
|
||||
@@ -2,8 +2,6 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
#
|
||||
|
||||
-cmake_minimum_required(VERSION 3.7)
|
||||
-
|
||||
find_package(Doxygen
|
||||
OPTIONAL_COMPONENTS dot mscgen dia)
|
||||
|
||||
diff --git a/examples/onvif-discover/CMakeLists.txt b/examples/onvif-discover/CMakeLists.txt
|
||||
index 3f011ad..b12d84e 100644
|
||||
--- a/examples/onvif-discover/CMakeLists.txt
|
||||
+++ b/examples/onvif-discover/CMakeLists.txt
|
||||
@@ -2,8 +2,6 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
#
|
||||
|
||||
-cmake_minimum_required(VERSION 3.7)
|
||||
-
|
||||
project(onvif-discover)
|
||||
|
||||
add_executable(${PROJECT_NAME}
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 177b304..33b4473 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -2,8 +2,6 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
#
|
||||
|
||||
-cmake_minimum_required(VERSION 3.7)
|
||||
-
|
||||
set(GLOBAL_KSWSDL2CPP_OPTION)
|
||||
get_filename_component(KDWSDL_IMPORT_PATH ../wsdl/ ABSOLUTE)
|
||||
set(GLOBAL_KSWSDL2CPP_OPTION -import-path ${KDWSDL_IMPORT_PATH} -use-local-files-only)
|
||||
--
|
||||
2.51.0
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_QTHELP="false"
|
||||
ECM_TEST="forceoptional"
|
||||
KFMIN=5.248.0
|
||||
inherit ecm kde.org
|
||||
|
||||
DESCRIPTION="WS-Discovery client library based on KDSoap"
|
||||
HOMEPAGE="https://invent.kde.org/libraries/kdsoap-ws-discovery-client"
|
||||
|
||||
if [[ ${KDE_BUILD_TYPE} = release ]]; then
|
||||
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
|
||||
KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="CC0-1.0 GPL-3+"
|
||||
SLOT="0"
|
||||
IUSE="doc"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-qt/qtbase:6[network]
|
||||
>=net-libs/kdsoap-2.2.0[qt6(+)]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-qt/qtbase:6[xml] )
|
||||
"
|
||||
BDEPEND="doc? ( app-text/doxygen[dot] )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch
|
||||
"${FILESDIR}"/${P}-cmake-minreqver-3.16.patch # bug 964515
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
ecm_src_prepare
|
||||
use test || ecm_punt_qt_module Xml
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake_use_find_package doc Doxygen)
|
||||
-DBUILD_QCH=OFF # does not use ecm_add_qch from ECMAddQch
|
||||
)
|
||||
ecm_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
|
||||
ecm_src_install
|
||||
}
|
||||
Reference in New Issue
Block a user