From nobody Sat Nov 16 08:40:38 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xr6m65x8yz5d2nN; Sat, 16 Nov 2024 08:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xr6m63WjCz4p8D; Sat, 16 Nov 2024 08:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731746438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8r39NRn04dpAt0WnKZThuRccBoAOQ3befOf5jClUFe8=; b=jFSDQc+bAJ1QMQ/2Pz8RbbgWGSLE8esP4+aJpUHzWjwJZXlq8O6Uv9i7mvQjcuD/E7cVVV xNThfLTnc+dkTTRboMBYI82528f6X3gjSLv139t0YLfZIE2BXTkOkUF5n8zia+kOhtN6uC EwzaJBejqEkq1ndfZMJsaRrVwe0UL+Pwy4HPY514buYMLctXOXQo1cFWeSrjYT7RCi+7yl Hit9fv5xe6i5CTHOpAh2Ug8LH/tl08IoU+C4aQ42Z7V7LJ/I7Q/scZ1ZwmhOSrnDadOQOB rcsjjaqVCXVLJdrMFJuFTYLZN/2arqWVK4XoAfVlG+ESsNmX/XL2vdFxJBqhAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731746438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8r39NRn04dpAt0WnKZThuRccBoAOQ3befOf5jClUFe8=; b=wdSH5Uy2XR3xTdO68iMWVBtZzY5+4S1b8RR2KgFxttcXvvqhgpf/yNXDXjqRaFngeusmNI o+QHOa0cIhauVd2gXmYaL10etliPJVLltPQI9li00P79NCl7nEjCQM3ppjunxfQ8/cAYEp ap33py7xZYo5+dfum3oAUI8K2Ru3HF9QmptcwO5w+Q8jUGa0Jq2nQrErMCF7TM9FF6EXwr NjIPR1Hm1KyLwLW+bXaxE6Rxqt2c5eweg264gy+VYGHzVc6LjKneHSkEodU97pdnU0Cp7r cR7j8pB8jWfJ8a6wkkmMJWxtDi8USjWU+J4t1cosNYi4H6QwQp8OFy2l44RaEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731746438; a=rsa-sha256; cv=none; b=daAkQw0mzYB0Uf6Dj8NKO0igot0m48BgLKwK2APQ1lI0y2Tvww1L85bK8t/a97WNwwbiOl hWKKlDK0oSwIBhiqSaEvSw5q4X6UmhdGwGaolEVsyYi3Z+9p08ENonEpDbAf2htCvYEOvc yWvnbsg2alOkvKT4/gx0kmd1xv1iBB1UDaDgAuW0/6GI/xoLWMBYG5nMoQ1VMzyW7BhUAJ Zz2ydmvd3Ltg1UJXvwYjKN/UJ4jBZ+2CBZyg0SJDCzE4kCv3rojWO9s1I4AL9p1Y+E4/eq m5PaC6xAUZeK8wt5Mfnr+IUQHL6kJDsDLB8Ih2BSYLLt0d69D18guZOiU+jP8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xr6m637CGz10xS; Sat, 16 Nov 2024 08:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AG8ecfb062788; Sat, 16 Nov 2024 08:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AG8ecgX062785; Sat, 16 Nov 2024 08:40:38 GMT (envelope-from git) Date: Sat, 16 Nov 2024 08:40:38 GMT Message-Id: <202411160840.4AG8ecgX062785@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 2f80f3ff0403 - main - graphics/kphotoalbum: Remove WEBENGINE option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f80f3ff040338b9ff8339eacd037ee7af9d04a9 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f80f3ff040338b9ff8339eacd037ee7af9d04a9 commit 2f80f3ff040338b9ff8339eacd037ee7af9d04a9 Author: Jason E. Hale AuthorDate: 2024-11-16 05:45:06 +0000 Commit: Jason E. Hale CommitDate: 2024-11-16 08:40:31 +0000 graphics/kphotoalbum: Remove WEBENGINE option With the addition of the MARBLE option in 687ac26b32a7, we can be a bit more clever. Various Qt components are only linked to if the MARBLE option is enabled and the WEBENGINE option in astro/marble is enabled. This avoids potentially conflicting settings of the WEBENGINE option in astro/marble and the former WEBENGINE option in this port. Disable Marble detection the cannonical way to avoid CMake warnings. --- graphics/kphotoalbum/Makefile | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index 485029ebbe6c..b81cbe972629 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -1,6 +1,6 @@ PORTNAME= kphotoalbum DISTVERSION= 5.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= KDE @@ -20,22 +20,26 @@ USE_KDE= archive auth codecs completion config configwidgets coreaddons \ i18n iconthemes jobwidgets kio libkdcraw phonon purpose service solid \ sonnet textwidgets widgetsaddons windowsystem xmlgui \ ecm:build -USE_QT= concurrent core dbus declarative gui location network \ - printsupport sql webchannel widgets xml \ +USE_QT= concurrent core dbus gui network sql widgets xml \ buildtools:build qmake:build USE_XORG= x11 -SHEBANG_FILES= scripts/open-raw.pl scripts/kpa-backup.sh -OPTIONS_DEFINE= MARBLE WEBENGINE -OPTIONS_DEFAULT=MARBLE -OPTIONS_DEFAULT_amd64= WEBENGINE -OPTIONS_DEFAULT_i386= WEBENGINE +SHEBANG_FILES= scripts/kpa-backup.sh \ + scripts/open-raw.pl -MARBLE_DESC= Virtual globe and world atlas -MARBLE_USE= kde=marble -MARBLE_CMAKE_OFF= -DMarble_FOUND:BOOL=OFF +OPTIONS_DEFINE= MARBLE +OPTIONS_DEFAULT= MARBLE -WEBENGINE_DESC= Add dependency on qt5-webengine -WEBENGINE_USE= QT=webengine +MARBLE_DESC= Virtual globe and world atlas +MARBLE_USE= KDE=marble +MARBLE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Marble + +.include + +# These dependencies are only needed if the WEBENGINE option is enabled +# in astro/marble. +.if ${PORT_OPTIONS:MMARBLE} && exists(${LOCALBASE}/lib/marble/plugins/Photo.so) +USE_QT+= declarative location printsupport webchannel webengine +.endif .include