From nobody Tue Sep 12 15:18:56 2023 X-Original-To: dev-commits-ports-all@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 4RlS0c3Vy1z4tK4x; Tue, 12 Sep 2023 15:18:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlS0c2q8pz4fQf; Tue, 12 Sep 2023 15:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694531936; 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=G3MVJnEcX/1mGIUnURB2bkrv4On5W/sFhxTrkvPTuXQ=; b=Hhb6I5cjx6rch6BiF+aEEBKsTtXEdFAiFJQ6juYRhBm3bT/8UXqlouKPafX5V8NLyDTn1r qbgAInep4ko84mkG1LXI6/EQqfdXIlnn2/RAp/1FG1vdqrDhjhDTYiFEa8nmHWftjasYzy +XE2udyzVHQDavZC+cehhUG1ovyObI8s12pqdG8FAhmoPAtjgrcXOQ/KIwN3seflRj2l3O uWyIsPNFOhZ3Q8W8Ne/NHAXwQJaSml+xydtzEiGz9oBFB5cpH+xDdz9dJEvM24Y+ODMVpi 9iI0np6Id9nkJm6TgVS6urI3WFLZ4smWxW0Val3tSBe24pRDZuXMRXqI+DnH4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694531936; a=rsa-sha256; cv=none; b=FCF948XXGniFt8iB+9v5c7+XyIsrd0nerxoLciUBcdpVEmHa7e9qAneQOJKD5XQohEYXb2 X2Tjf74hPnv3aRDXMYJi2xD3zMNXn8qvOsm3lcKS1GuAAA7qhLNFM8lAcHgM9+fle++Eef feewnyO96umJ9uywC5z/Ad6Omhk72vC0wZklGAyQUlzoiXfHTKwmJEoLl2p9obaifUmvRP LqcxpfhNnyzPNDuGxLjfLBMF+iE2J84CJf22bQb+A9CgmoZiC2hqULnnP3Z0lFRGanNSZJ R70RHpwKhtrGJAEU05ntxMoFTGu/JBiaqyncd1xBia3G4QR9R/rFmgo3yaJcRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694531936; 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=G3MVJnEcX/1mGIUnURB2bkrv4On5W/sFhxTrkvPTuXQ=; b=pUjOoVhpjHw8/X2CdLvwSB6CjCDoo7fMA2KkZW2Xzm9Aga0/+q32lCtEu9gBI2ljTjaRD8 gp26m3C400tmSsELA6KEucxlL0TNwYUH4fgauktCrNlU90r7V0Gh/Ip9XDciFjFYOjRW0R mKvCSJ9+PeNOwXW7rIiZgDMrYAUERQ3pq88SoPMLIM0hMKfoLBke1cMz5NeotXuxC9jsmk +zYq6k4osWbppoqv4IW+wSoqlQVllKFr7gb6tcxOdIrPoFIe/V2ty2YLYA+3O0LH+tRcM0 KE/ZEtw43J/6AI0JU7sYEZ+dAF/PIEIAYPGYnkt1MS5k3X4EPVx7Rz8I7C3d8Q== 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 4RlS0c1t60zcp2; Tue, 12 Sep 2023 15:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CFIuGq022573; Tue, 12 Sep 2023 15:18:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CFIu9F022570; Tue, 12 Sep 2023 15:18:56 GMT (envelope-from git) Date: Tue, 12 Sep 2023 15:18:56 GMT Message-Id: <202309121518.38CFIu9F022570@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 3270b2a7dbb3 - main - textproc/kreport: move webkit behind default-off option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3270b2a7dbb323afbb387c18b4d71cf98ce01ec1 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3270b2a7dbb323afbb387c18b4d71cf98ce01ec1 commit 3270b2a7dbb323afbb387c18b4d71cf98ce01ec1 Author: Tobias C. Berner AuthorDate: 2023-09-12 08:59:38 +0000 Commit: Tobias C. Berner CommitDate: 2023-09-12 15:16:35 +0000 textproc/kreport: move webkit behind default-off option qt5-webkit will be removed by the end of the year. --- textproc/kreport/Makefile | 10 ++++++++-- textproc/kreport/pkg-plist | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/textproc/kreport/Makefile b/textproc/kreport/Makefile index 8e1e73e312a4..de17a1c895e2 100644 --- a/textproc/kreport/Makefile +++ b/textproc/kreport/Makefile @@ -1,6 +1,6 @@ PORTNAME= kreport DISTVERSION= 3.2.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc kde MASTER_SITES= KDE/stable/${PORTNAME}/src DIST_SUBDIR= KDE/${PORTNAME} @@ -15,9 +15,15 @@ USES= cmake compiler:c++11-lang gettext kde:5 python qt:5 tar:xz USE_KDE= config coreaddons marble widgetsaddons \ ecm:build USE_QT= core declarative gui location network printsupport webchannel \ - webengine webkit widgets xml \ + webengine widgets xml \ buildtools:build qmake:build +OPTIONS_DEFINE= WEBKIT +OPTIONS_SUB= yes +WEBKIT_DESC= Use obsolete qt5-webkit to build Browser Plugin +WEBKIT_USE= QT5=webkit +WEBKIT_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets + CONFLICTS_INSTALL= calligra-2* post-extract: diff --git a/textproc/kreport/pkg-plist b/textproc/kreport/pkg-plist index 2165b632c82e..9f2e19a7ced6 100644 --- a/textproc/kreport/pkg-plist +++ b/textproc/kreport/pkg-plist @@ -78,12 +78,12 @@ lib/libKReport3.so.4.2.0 %%QT_MKSPECDIR%%/modules/qt_KReport3.pri %%QT_PLUGINDIR%%/kreport3/org.kde.kreport.barcode.so %%QT_PLUGINDIR%%/kreport3/org.kde.kreport.maps.so -%%QT_PLUGINDIR%%/kreport3/org.kde.kreport.web.so +%%WEBKIT%%%%QT_PLUGINDIR%%/kreport3/org.kde.kreport.web.so libdata/pkgconfig/KReport3.pc %%DATADIR%%3/icons/kreport_breeze.rcc %%DATADIR%%3/icons/org.kde.kreport.barcode_breeze.rcc %%DATADIR%%3/icons/org.kde.kreport.maps_breeze.rcc -%%DATADIR%%3/icons/org.kde.kreport.web_breeze.rcc +%%WEBKIT%%%%DATADIR%%3/icons/org.kde.kreport.web_breeze.rcc share/kservicetypes5/kreport_elementplugin.desktop share/locale/af/LC_MESSAGES/kreport_qt.qm share/locale/ar/LC_MESSAGES/kreport_qt.qm