From nobody Sun Jan 7 01:14:39 2024 X-Original-To: dev-commits-ports-branches@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 4T6zkR4qfKz562bs; Sun, 7 Jan 2024 01:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T6zkR1xGNz4dfH; Sun, 7 Jan 2024 01:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704590079; 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=5xD5eQW2uEBKCgp6r+6WXbbcr45J8fYJ/9Dq9pC0Zcc=; b=ur0eJA86/lstG9cbORAqi1gVDZiEcbel4f9zjEz4cOLAgFF114BwLAAgs1A7JuBOH4vpR6 1ogMppWuGslISAo4IMf663Awpm0LnEYES/NkRJgPF3Qg/614XwkC9jHiKGZVmOjAKHaWZ6 I++bapPOVtdxdSWcGrJp+djR0JlCw4+GjEq2BXgbT4X7Ebz/dK2SL3R5Bga1uPUdOy++A3 92iKJ8wNA/kyka0dB/LFH+aIn4I4rHFpye3xblkeXjX32ZVXVY+rka+SKn8wU40ZoAA79h T4GUAVdOOYvvyw8d10GEGh3+LzNh4fzCLU7uVvgiGdGIdYR92rgkJgv4Y6I2ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704590079; 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=5xD5eQW2uEBKCgp6r+6WXbbcr45J8fYJ/9Dq9pC0Zcc=; b=PqJJUq6vM8z4QeHr0MNPRLx5jt8yFq0w8hvTpSm2k4zUhL/NQl+o3VMAOoB5wbZjZ+Yq6v H32UH0qCuwFU/OAIYkREyCCA1MC8rxkXscVF02TRkLzGRr9ZZbXmfoEUOv5FRSdd+0MQCs PqjF2kGKrpKq0kesKywmTOHZ5prwkfTGNSTpiL6N9x15NGKrpX2ToGjUBU+rfoNQgRTAIe ADPOmhbN8qh7X0SG5BnRDVJMI8t222VTB9BfliR2IX/2zFoN5Hs0WsgV3CyQ9l5Jh37wrV KoYX3pgraLwmWXsO0r33dsJ8vS5vB5ymW4Wc69+ekaaqDczfG7DitVvI5QwCcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704590079; a=rsa-sha256; cv=none; b=But5NDr9UAfXgPivcpyNeuvy46Sj1Hw0F2mMIHfx2z0ahkcDHux0ZgypsMAN1f1ROCK4BB C/ytHCRXD/LRqyQLhcWi6+3h7EW3ErqU/ESAiNvPJ1MxWckplMexBC9XolNP2G6wdh0Isz dRNU014pnKpWNB0J/YLFZpbbmWFirwDqaPZefb25uDo/tQEe5AeM/Sw89yn2NcdlNGhgxD 1E0tOTB33CPO/J8qHJxoWazwSkE4GAwE0ZBb7m1Hq4V2tqhgWBTI9/0Oz8PFD970uar3iI IukDB4IWdkgi2BLLAgTf/VGqO97GtPTxZpzZC5WRwsh2Iq2Oc6k7DRlnLL6hrg== 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 4T6zkR12D6z1495; Sun, 7 Jan 2024 01:14:39 +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 4071EdPX052069; Sun, 7 Jan 2024 01:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4071EdIS052066; Sun, 7 Jan 2024 01:14:39 GMT (envelope-from git) Date: Sun, 7 Jan 2024 01:14:39 GMT Message-Id: <202401070114.4071EdIS052066@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: c48cc2e2e018 - 2024Q1 - net-im/psi: Convert WEBKIT option to WEBENGINE List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: c48cc2e2e018aace42492267db15dbc6f742cbbb Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=c48cc2e2e018aace42492267db15dbc6f742cbbb commit c48cc2e2e018aace42492267db15dbc6f742cbbb Author: Jason E. Hale AuthorDate: 2024-01-06 22:12:05 +0000 Commit: Jason E. Hale CommitDate: 2024-01-07 01:12:01 +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 (cherry picked from commit 5cdc418e76fe2f59ff50ad7a89347c9b10be3eec) --- 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