From nobody Tue Sep 12 15:18:57 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 4RlS0d5XVsz4tK4y; Tue, 12 Sep 2023 15:18:57 +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 4RlS0d43Bmz4fc7; Tue, 12 Sep 2023 15:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694531937; 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=4bnUynNKKqfJBhVwLBu8S/7Dc7ocEbjO8ir9kJlW7r0=; b=devqgAuKkMKYVcQITrrHhcIJ9LcRVg0GSB0kwjOJMBBphtKY82KMegwf4izHtG+QPwv0+q RjCJdoA6+8Okwn4TlDS02KR7Yw0D68XjgllFQKvlojg8FLM5aemVCOdOa1ZA4eoygj0itI 22Y99Npq9wGRRICWj8vWJC+uT8wi1wKu6R8fgjsOBiOVo5lOYdYHC4Tud5PLHHzsjobmZH Cktpzp3/Ey/XYBv2Yu96DvgLE+GPgYYWSAeOCVa/i4Ap+5kTspZG1KlHFqQJ/cxaD6oPea y1KIw/5lHJ13wgyqRkS3YtKJY7qhjwQg3H7WqXyvdYAQtISc/EYOBf8nV4RWrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694531937; a=rsa-sha256; cv=none; b=xX5yjU48Becwee7HQ7gWV4DeFQmZ7WO/A5iM0x7iI7b9ou1K8pjUdLJQGcMRgYpjZVzrQc pFMGftxE71h23FP5xQ1e1XAfp1wB/cgDkTins1Xz0A0TO6DH5XT1nwJw9SUQWCBy9Z04WE +uteoqJ5wpJu1SMlvRIRfXNsnAFgG8Srd+23ieVIDniD168Q7fi7SU83+RMR54z8GwBzL7 g5WqJcku8bC9aTPqtaJEToYmMlKqTojONCtLjCPzbK54ACjbHInnjG2kOTFuEUp5bGeu7O JNJyDpmL5ohJuB0u6LQUyFZXj783J37BRCYIoQX8B8qwzaMI2581rBUh0MiuYA== 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=1694531937; 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=4bnUynNKKqfJBhVwLBu8S/7Dc7ocEbjO8ir9kJlW7r0=; b=iY6+3Z+nTAYk2XDGyayBYMNqeJtMfAR5MlTczKfrI7tfDepoZm3N/qzfKJep1yFUf4jZhR BbS/AVBfD/oUuMgWxrUpvdxtaAP5j/aUDD4yDim4YrC5/6AF0ItIxIOGUyMqLRqOTk3cTB WwVC1JIPH8D1KxkPK6JC4ksx+RG2msjwOL2FdFocTorZm9umy/3ZziiFZp8BcAQk2l9Emx ELdw7brlrJfbI4fqBjCipw+FuuTY8wkmMLEKPLguiB+JSMOQgTCDd3R1auwhsmmWnY0xt1 mumP7hbtQ/K+msnQjYMVNnDZi3qo/ERJOn7BqeKnHkZj0cSiOemzlnw+C1oZ4Q== 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 4RlS0d300Xzcp3; Tue, 12 Sep 2023 15:18:57 +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 38CFIvot022622; Tue, 12 Sep 2023 15:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CFIv3Z022619; Tue, 12 Sep 2023 15:18:57 GMT (envelope-from git) Date: Tue, 12 Sep 2023 15:18:57 GMT Message-Id: <202309121518.38CFIv3Z022619@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: 2e7ad1de91e6 - main - www/choqok: 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: 2e7ad1de91e6f200eec6311a12cd15050b1cdcbd Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e7ad1de91e6f200eec6311a12cd15050b1cdcbd commit 2e7ad1de91e6f200eec6311a12cd15050b1cdcbd Author: Tobias C. Berner AuthorDate: 2023-09-12 09:15:44 +0000 Commit: Tobias C. Berner CommitDate: 2023-09-12 15:16:35 +0000 www/choqok: move webkit behind default-off option qt5-webkit will be removed by the end of the year. --- www/choqok/Makefile | 12 +++++++++--- www/choqok/pkg-plist | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/www/choqok/Makefile b/www/choqok/Makefile index 91db4718365a..74ab9847e269 100644 --- a/www/choqok/Makefile +++ b/www/choqok/Makefile @@ -1,6 +1,6 @@ PORTNAME= choqok DISTVERSION= 1.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION:R}/src DIST_SUBDIR= KDE/${PORTNAME} @@ -20,15 +20,21 @@ USES= cmake compiler:c++11-lib gettext kde:5 pkgconfig qca qt:5 \ tar:xz xorg USE_KDE= attica auth bookmarks codecs completion config configwidgets \ coreaddons doctools emoticons globalaccel guiaddons i18n \ - itemviews jobwidgets kcmutils kdewebkit kio notifications \ + itemviews jobwidgets kcmutils kio notifications \ notifyconfig parts purpose service solid sonnet textwidgets \ wallet widgetsaddons windowsystem xmlgui \ ecm:build \ kded:run -USE_QT= concurrent core dbus gui network networkauth webkit widgets \ +USE_QT= concurrent core dbus gui network networkauth widgets \ xml \ buildtools:build qmake:build USE_XORG= x11 USE_LDCONFIG= yes +OPTIONS_DEFINE= WEBKIT +OPTIONS_SUB= yes +WEBKIT_DESC= Use obsolete qt5-webkit to build Browser Plugin +WEBKIT_USE= KDE=kdewebkit QT5=webkit +WEBKIT_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5WebKit + .include diff --git a/www/choqok/pkg-plist b/www/choqok/pkg-plist index 182171acfb67..a0403960fe46 100644 --- a/www/choqok/pkg-plist +++ b/www/choqok/pkg-plist @@ -102,7 +102,7 @@ lib/libtwitterapihelper.so.1.3.0 %%QT_PLUGINDIR%%/kcm_choqok_tinyarro_ws.so %%QT_PLUGINDIR%%/kcm_choqok_twitgoo.so %%QT_PLUGINDIR%%/kcm_choqok_yourls.so -%%QT_PLUGINDIR%%/kf5/parts/konqchoqokplugin.so +%%WEBKIT%%%%QT_PLUGINDIR%%/kf5/parts/konqchoqokplugin.so %%QT_PLUGINDIR%%/kf5/purpose/purposeplugin.so share/applications/org.kde.choqok.desktop %%DATADIR%%/images/splash_screen.png @@ -217,7 +217,7 @@ share/icons/hicolor/64x64/apps/twitgoo_uploader.png share/icons/hicolor/scalable/apps/choqok_offline.svgz share/icons/hicolor/scalable/apps/choqok.svgz share/knotifications5/choqok.notifyrc -share/kservices5/ServiceMenus/choqok_share.desktop +%%WEBKIT%%share/kservices5/ServiceMenus/choqok_share.desktop share/kservices5/choqok_accountsconfig.desktop share/kservices5/choqok_appearanceconfig.desktop share/kservices5/choqok_behaviorconfig.desktop @@ -260,7 +260,7 @@ share/kservices5/choqok_ur1_ca.desktop share/kservices5/choqok_videopreview.desktop share/kservices5/choqok_yourls.desktop share/kservices5/choqok_yourls_config.desktop -share/kservices5/konqchoqok.desktop +%%WEBKIT%%share/kservices5/konqchoqok.desktop share/kservicetypes5/choqokplugin.desktop share/kservicetypes5/choqokshortenerplugin.desktop share/kservicetypes5/choqokuploaderplugin.desktop @@ -269,7 +269,7 @@ share/kxmlgui5/choqok_filter/filterui.rc share/kxmlgui5/choqok_nowlistening/nowlisteningui.rc share/kxmlgui5/choqok_quickfilter/quickfilterui.rc share/kxmlgui5/choqok_searchaction/searchactionui.rc -share/kxmlgui5/konqchoqokplugin/konqchoqok.rc +%%WEBKIT%%share/kxmlgui5/konqchoqokplugin/konqchoqok.rc share/locale/ar/LC_MESSAGES/choqok.mo share/locale/bg/LC_MESSAGES/choqok.mo share/locale/bs/LC_MESSAGES/choqok.mo