From nobody Sun Jan 7 01:07:06 2024 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 4T6zYl31pGz560wM; Sun, 7 Jan 2024 01:07:07 +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 4T6zYl0L3wz4ctn; Sun, 7 Jan 2024 01:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704589627; 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=2f642vFDYoqn+BnNgTRNXirKtFeMvCZlGnaKjNcyxwI=; b=i+kybAZouwClbUrgdmMnMtEDmucnpwKmL9JehlrrCE9LEL4Yp1PMuFe/Gf8sOwBQVJoMIa xzclw0FlQhgIkQqxx17K5f4h4Xf5+agPTY4T9WeOHpm3jTOrzOvTz8numrxlbgoQsJjW32 NLI/VKGRkAECLAT2j6tmxGpASmU/zgMewN/JjoNVuLt2ZawMlM7XntHNGEcSsNXs5b3oMB 1xDy41K9Q/9Uzz+gsEAMWIfuNdkAZe/h3hL0ilo5JTQaivayiplCN01OnASKo2Vpyj5S9m eIk7SlH6dYQibHppNBmGVUA7PqYNs64nlSOFAptPCVX62c23ihtFBzZNQ1HRSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704589627; 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=2f642vFDYoqn+BnNgTRNXirKtFeMvCZlGnaKjNcyxwI=; b=jzITZjS11H/PmIMMAL/KxDnCepHxUnXIovWcD2wsOz7fxYiM6ZJh2zbiUy8YLkOe9wjNDR mOBMo3mVS3VcZ5iB2tGVsiqALX8JmFtqhBG5GTj5tmXxy47olXKAFTXBiLxFsVRKitWgcl 4lUxQ3j+uxW7bqo8jfSiwGqlR+WwXoSGLBm3sXoyf6M9ZJN1D4ys01QrA6cyJo0Ml7jony 7iXe0bKFFEYMTcD4MhIuzknxGxnYjFf21VhxQCOWpbNzcQlVAgMfWD3Z2oY1DD/NC9wrRg e17igEIiQ/jEVySzVSyEAMvZRWeDQK4Pis+t1NBklBotkalNFhGMFIQhAfZsGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704589627; a=rsa-sha256; cv=none; b=CeiXQ6qdmcWsSYKnZnkmesM2rYllFihiTuleN7c2QGewHY9BSxLyAYlxLtEHmrwcv2n6uH nYRB7nPZogykHXVDmGMTJg8ShD6Z4kCIgcjEtUY4sVpuviiC7FLJIexZ2a0EUBqOmxIr9D tLueoNGFmeGdEipsfkQLh/XxJ2MZZbXHiLZDdSq5UEcoveKMFypRDemPSQdcBr5PS0D9n8 Ez43TqkIINUtRdqo6R7z6CkuU0uNapHVLwaw9h26OYvJD3Bgc8zwsafb9G0pn8Y1t3xXuc KfmYK1QZOruJDnrqaEdNz483P6rkss2Ay4WweqvKF0DGC1E1o6NC93JLR25htA== 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 4T6zYk6WxQz13hd; Sun, 7 Jan 2024 01:07:06 +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 407176CH035758; Sun, 7 Jan 2024 01:07:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407176r2035755; Sun, 7 Jan 2024 01:07:06 GMT (envelope-from git) Date: Sun, 7 Jan 2024 01:07:06 GMT Message-Id: <202401070107.407176r2035755@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: 5cdc418e76fe - main - net-im/psi: Convert WEBKIT option to WEBENGINE 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cdc418e76fe2f59ff50ad7a89347c9b10be3eec Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=5cdc418e76fe2f59ff50ad7a89347c9b10be3eec commit 5cdc418e76fe2f59ff50ad7a89347c9b10be3eec Author: Jason E. Hale AuthorDate: 2024-01-06 22:12:05 +0000 Commit: Jason E. Hale CommitDate: 2024-01-07 01:06:53 +0000 net-im/psi: Convert WEBKIT option to WEBENGINE www/qt5-webkit was removed in [1], leaving the WEBKIT option broken. This application supports using www/qt5-webengine as an alternative chatlog engine, so rename the WEBKIT option to WEBENGINE to avoid confusion and add the required dependencies. Enabling QtWebEngine still requires having the ENABLE_WEBKIT CMake argument set, so this was not an oversight [2], as strange as it may look. In fact, psi defaults to use QtWebEngine if it was found when the ENABLE_WEBKIT argument is set. [3] [1] https://cgit.freebsd.org/ports/commit/?id=cb3615b528c288d90aff6aa0e7a9778f80c9e85d [2] https://github.com/psi-im/psi/blob/1.5/CMakeLists.txt#L44 [3] https://github.com/psi-im/psi/blob/1.5/src/CMakeLists.txt#L17 Approved by: portmgr (blanket) MFH: 2024Q1 --- net-im/psi/Makefile | 9 +++++---- net-im/psi/pkg-plist | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile index 5f7ab2e14032..4a556644ccbb 100644 --- a/net-im/psi/Makefile +++ b/net-im/psi/Makefile @@ -1,6 +1,6 @@ PORTNAME= psi PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION} @@ -21,15 +21,16 @@ USE_XORG= ice sm x11 xcb xext xscrnsaver CMAKE_ARGS= -DIDN_LIBRARY:FILEPATH="${LOCALBASE}/lib/libidn.so" \ -DIDN_INCLUDE_DIR:PATH="${LOCALBASE}/include" -OPTIONS_DEFINE= WEBKIT +OPTIONS_DEFINE= WEBENGINE OPTIONS_RADIO= SPELLCHECK OPTIONS_RADIO_SPELLCHECK= HUNSPELL ENCHANT SPELLCHECK_DESC= Spell checker backend OPTIONS_DEFAULT= HUNSPELL OPTIONS_SUB= yes -WEBKIT_USE= QT=webkit -WEBKIT_CMAKE_BOOL= ENABLE_WEBKIT +WEBENGINE_DESC= Use QtWebEngine for chatlogs +WEBENGINE_USE= QT=declarative,location,printsupport,webchannel,webengine +WEBENGINE_CMAKE_BOOL= ENABLE_WEBKIT HUNSPELL_LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell HUNSPELL_CMAKE_BOOL= USE_HUNSPELL diff --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist index ce6b55669456..977b2999ebd5 100644 --- a/net-im/psi/pkg-plist +++ b/net-im/psi/pkg-plist @@ -404,13 +404,13 @@ share/pixmaps/psi.png %%DATADIR%%/sound/offline.wav %%DATADIR%%/sound/online.wav %%DATADIR%%/sound/send.wav -%%WEBKIT%%%%DATADIR%%/themes/chatview/adium/Template.html -%%WEBKIT%%%%DATADIR%%/themes/chatview/adium/adapter.js -%%WEBKIT%%%%DATADIR%%/themes/chatview/moment-with-locales.js -%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/adapter.js -%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/classic/index.html -%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/classic/load.js -%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/new_classic/index.html -%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/new_classic/load.js -%%WEBKIT%%%%DATADIR%%/themes/chatview/psi/new_classic/screenshot.png -%%WEBKIT%%%%DATADIR%%/themes/chatview/util.js +%%WEBENGINE%%%%DATADIR%%/themes/chatview/adium/Template.html +%%WEBENGINE%%%%DATADIR%%/themes/chatview/adium/adapter.js +%%WEBENGINE%%%%DATADIR%%/themes/chatview/moment-with-locales.js +%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/adapter.js +%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/classic/index.html +%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/classic/load.js +%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/new_classic/index.html +%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/new_classic/load.js +%%WEBENGINE%%%%DATADIR%%/themes/chatview/psi/new_classic/screenshot.png +%%WEBENGINE%%%%DATADIR%%/themes/chatview/util.js