From nobody Sat Nov 16 08:40:39 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 4Xr6m76djyz5d3Hy; Sat, 16 Nov 2024 08:40:39 +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 4Xr6m74pGmz4p6C; Sat, 16 Nov 2024 08:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731746439; 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=Yq/HyCak0JYj0GBVQQ1tQV1ROpznEoW1H2O+7B2+/sU=; b=YHaH3NgrtU82lrNwdkHUUyyNXFhrU59hC//7Pph18CXX/AlKsskLuvgHwSWNLuYa/4SGTV Vmbxy0p96EhNLLVrU8b2IhYKP1dPRPjAYmu+1OFz2ghJ+BR/iFmk6KAqoE5IRyIEDXbMv7 Pm2VFH5nFhEjhFjr+CNNQH140JDhg1MQ9sLV/f3fVJd81IJppmFxnvxxVi+uPHGpKSn73U 9qfoCkBBwvyZgk2FRJgCak3EJhLlIU4PqNidlcBm1yz9tN58SFylPgTaOIQyzjoXB00qac hcF6BdsZcO0IB3wKQPaHD6HBxhjVP3X7kzBXDyHtrVf2JpIi9++Hv/ajKyN94A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731746439; 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=Yq/HyCak0JYj0GBVQQ1tQV1ROpznEoW1H2O+7B2+/sU=; b=RkWbFs1sw0VimcBQAkA58Tl/yrTFUyW2mOgQ4RIoKAnwBuJ0T/NS7NzJqHaWDRIYksbg06 O49zONuQK7hPyvOOS6xw/p4Mao3G3W4wcg02nIiptTDTttp2zRnGHV47HjMuBmAW8XdJyl itzCx4DbDwyCiO5G9KGDTdwNqgQuZ/vx4c+eiMi9VuOf5HK50sPPUEadPYZhEFab4QSlJV 9zs4djLkehczH1RnK7OeQFVNlDxmEC6MEzE/OOobWtuwIEqvzgtoAjyJgogCyrsbvECZBh vhUZHHfpq1dIWpV8evpOntZ2ocJy1domDKNWbIlap3v0yeohPP455VuC3eVCbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731746439; a=rsa-sha256; cv=none; b=JD3HvrwCs/h4LQHE/59zINnTCURXUSrkWUHWDqTj9pxtFUDdAXIJUhL4goX76oR3wJpogU 95eOsgrYWBNZ8jnUiSFShFhv6wT3SEDFPxWeGE9BARYekvalQpsLzGj03Kdr3b/NP66Nez ACmim0L0/dJN8o/S8mDubMHL1obfeUrwOGkr+tPe+vThreBw9rOT8vMhIibjNChW/MacZE gWdogOAelRTDnKxI8XSjg2brt34cekPtzxsWZ1NJDxuasTvXPsZfs+LVFBGvU2BG5mZw+U 3AXaJTto5BTOBl1OTbqRxbAVNj2hgJwK4EVK5pGM0htsHrStuml7echTdKM9RQ== 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 4Xr6m749f9z10nC; Sat, 16 Nov 2024 08:40:39 +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 4AG8edcf062833; Sat, 16 Nov 2024 08:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AG8ed1G062830; Sat, 16 Nov 2024 08:40:39 GMT (envelope-from git) Date: Sat, 16 Nov 2024 08:40:39 GMT Message-Id: <202411160840.4AG8ed1G062830@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: 03c4a79aad30 - main - textproc/kreport: Shift dependencies after 116eb4a7d098 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: 03c4a79aad305accfc412b5c7d46a71fcf558f46 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=03c4a79aad305accfc412b5c7d46a71fcf558f46 commit 03c4a79aad305accfc412b5c7d46a71fcf558f46 Author: Jason E. Hale AuthorDate: 2024-11-16 08:13:55 +0000 Commit: Jason E. Hale CommitDate: 2024-11-16 08:40:31 +0000 textproc/kreport: Shift dependencies after 116eb4a7d098 With the addition of the MARBLE option in 116eb4a7d098, several Qt dependencies can be conditionalized based on whether astro/marble was built with the WEBENGINE option enabled. This should enable building on platforms that cannot build qt5-webengine. Disable Marble detection the cannonical way to avoid CMake warnings. Add LICENSE info (LGPL2+), remove outdated CONFLICTS line, and clean up whitespace issues. --- textproc/kreport/Makefile | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/textproc/kreport/Makefile b/textproc/kreport/Makefile index 50931847b605..98e0e1eda6d8 100644 --- a/textproc/kreport/Makefile +++ b/textproc/kreport/Makefile @@ -1,32 +1,41 @@ -PORTNAME= kreport -DISTVERSION= 3.2.0 -PORTREVISION= 9 -CATEGORIES= textproc kde -MASTER_SITES= KDE/stable/${PORTNAME}/src -DIST_SUBDIR= KDE/${PORTNAME} - -MAINTAINER= kde@FreeBSD.org -COMMENT= Framework for creation of reports in multiple formats +PORTNAME= kreport +DISTVERSION= 3.2.0 +PORTREVISION= 10 +CATEGORIES= textproc kde +MASTER_SITES= KDE/stable/${PORTNAME}/src +DIST_SUBDIR= KDE/${PORTNAME} + +MAINTAINER= kde@FreeBSD.org +COMMENT= Framework for creation of reports in multiple formats WWW= https://www.kexi-project.org/ -LIB_DEPENDS= libKPropertyCore3.so:x11-toolkits/kproperty +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.LIB + +LIB_DEPENDS= libKPropertyCore3.so:x11-toolkits/kproperty USES= cmake compiler:c++11-lang gettext kde:5 python qt:5 tar:xz USE_KDE= config coreaddons widgetsaddons \ ecm:build -USE_QT= core declarative gui location network printsupport webchannel \ - webengine widgets xml \ +USE_LDCONFIG= yes +USE_QT= core declarative gui network printsupport widgets xml \ buildtools:build qmake:build -OPTIONS_DEFINE= MARBLE -OPTIONS_DEFAULT=MARBLE -OPTIONS_SUB= yes +OPTIONS_DEFINE= MARBLE +OPTIONS_DEFAULT= MARBLE +OPTIONS_SUB= yes + +MARBLE_DESC= Virtual globe and world atlas +MARBLE_USE= kde=marble +MARBLE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Marble -MARBLE_DESC= Virtual globe and world atlas -MARBLE_USE= kde=marble -MARBLE_CMAKE_OFF= -DMarble_FOUND:BOOL=OFF +.include -CONFLICTS_INSTALL= calligra-2* +# 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+= location webchannel webengine +.endif post-extract: ${CP} ${FILESDIR}/KReportGroupTracker.cpp ${WRKSRC}/src/renderer/scripting/KReportGroupTracker.cpp