From owner-svn-ports-all@freebsd.org Wed Jun 24 09:33:12 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 925F0349A19; Wed, 24 Jun 2020 09:33:12 +0000 (UTC) (envelope-from pkubaj@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49sHy03P29z3bJ2; Wed, 24 Jun 2020 09:33:12 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F981F920; Wed, 24 Jun 2020 09:33:12 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05O9XCJ9081273; Wed, 24 Jun 2020 09:33:12 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05O9XCNF081251; Wed, 24 Jun 2020 09:33:12 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202006240933.05O9XCNF081251@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 24 Jun 2020 09:33:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540020 - head/net-p2p/ktorrent X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/net-p2p/ktorrent X-SVN-Commit-Revision: 540020 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2020 09:33:12 -0000 Author: pkubaj Date: Wed Jun 24 09:33:11 2020 New Revision: 540020 URL: https://svnweb.freebsd.org/changeset/ports/540020 Log: net-p2p/ktorrent: fix build on non-x86 non-aarch64 Webengine is not available there, at least now. PR: 247128 Approved by: kde (maintainer timeout) Modified: head/net-p2p/ktorrent/Makefile head/net-p2p/ktorrent/pkg-plist Modified: head/net-p2p/ktorrent/Makefile ============================================================================== --- head/net-p2p/ktorrent/Makefile Wed Jun 24 09:11:45 2020 (r540019) +++ head/net-p2p/ktorrent/Makefile Wed Jun 24 09:33:11 2020 (r540020) @@ -23,7 +23,7 @@ USE_KDE= archive auth bookmarks codecs completion conf notifyconfig parts plotting service \ solid sonnet syndication textwidgets widgetsaddons \ windowsystem xmlgui -USE_QT= concurrent core dbus gui network phonon4 script webengine widgets xml \ +USE_QT= concurrent core dbus gui network phonon4 script widgets xml \ buildtools_build qmake_build OPTIONS_DEFINE= WORKSPACE @@ -33,5 +33,14 @@ OPTIONS_SUB= yes WORKSPACE_USE= KDE=plasma-workspace WORKSPACE_DESC= Shutdown on completion support WORKSPACE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_LibKWorkspace + +.include + +.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 +PLIST_SUB+= WEBENGINE="" +USE_QT+= webengine +.else +PLIST_SUB+= WEBENGINE="@comment " +.endif .include Modified: head/net-p2p/ktorrent/pkg-plist ============================================================================== --- head/net-p2p/ktorrent/pkg-plist Wed Jun 24 09:11:45 2020 (r540019) +++ head/net-p2p/ktorrent/pkg-plist Wed Jun 24 09:33:11 2020 (r540020) @@ -12,10 +12,10 @@ lib/libktcore.so.16.0.0 %%QT_PLUGINDIR%%/ktorrent/ktorrent_mediaplayer.so %%QT_PLUGINDIR%%/ktorrent/ktorrent_scanfolder.so %%QT_PLUGINDIR%%/ktorrent/ktorrent_scripting.so -%%QT_PLUGINDIR%%/ktorrent/ktorrent_search.so +%%WEBENGINE%%%%QT_PLUGINDIR%%/ktorrent/ktorrent_search.so %%WORKSPACE%%%%QT_PLUGINDIR%%/ktorrent/ktorrent_shutdown.so %%QT_PLUGINDIR%%/ktorrent/ktorrent_stats.so -%%QT_PLUGINDIR%%/ktorrent/ktorrent_syndication.so +%%WEBENGINE%%%%QT_PLUGINDIR%%/ktorrent/ktorrent_syndication.so %%QT_PLUGINDIR%%/ktorrent/ktorrent_upnp.so %%QT_PLUGINDIR%%/ktorrent/ktorrent_zeroconf.so share/applications/org.kde.ktorrent.desktop @@ -46,20 +46,20 @@ share/doc/HTML/sv/ktorrent/index.docbook share/doc/HTML/uk/ktorrent/index.cache.bz2 share/doc/HTML/uk/ktorrent/index.docbook share/icons/hicolor/128x128/apps/ktorrent.png -share/icons/hicolor/16x16/actions/kt-add-feeds.png -share/icons/hicolor/16x16/actions/kt-add-filters.png -share/icons/hicolor/16x16/actions/kt-remove-feeds.png -share/icons/hicolor/16x16/actions/kt-remove-filters.png +%%WEBENGINE%%share/icons/hicolor/16x16/actions/kt-add-feeds.png +%%WEBENGINE%%share/icons/hicolor/16x16/actions/kt-add-filters.png +%%WEBENGINE%%share/icons/hicolor/16x16/actions/kt-remove-feeds.png +%%WEBENGINE%%share/icons/hicolor/16x16/actions/kt-remove-filters.png share/icons/hicolor/16x16/actions/kt-stop-all.png share/icons/hicolor/16x16/actions/kt-stop.png share/icons/hicolor/16x16/actions/kt-upnp.png share/icons/hicolor/16x16/apps/ktorrent.png -share/icons/hicolor/22x22/actions/kt-add-feeds.png -share/icons/hicolor/22x22/actions/kt-add-filters.png +%%WEBENGINE%%share/icons/hicolor/22x22/actions/kt-add-feeds.png +%%WEBENGINE%%share/icons/hicolor/22x22/actions/kt-add-filters.png share/icons/hicolor/22x22/actions/kt-magnet.png share/icons/hicolor/22x22/actions/kt-pause.png -share/icons/hicolor/22x22/actions/kt-remove-feeds.png -share/icons/hicolor/22x22/actions/kt-remove-filters.png +%%WEBENGINE%%share/icons/hicolor/22x22/actions/kt-remove-feeds.png +%%WEBENGINE%%share/icons/hicolor/22x22/actions/kt-remove-filters.png share/icons/hicolor/22x22/actions/kt-remove.png share/icons/hicolor/22x22/actions/kt-set-max-download-speed.png share/icons/hicolor/22x22/actions/kt-set-max-upload-speed.png @@ -69,14 +69,14 @@ share/icons/hicolor/22x22/actions/kt-start.png share/icons/hicolor/22x22/actions/kt-stop-all.png share/icons/hicolor/22x22/actions/kt-stop.png share/icons/hicolor/22x22/apps/ktorrent.png -share/icons/hicolor/32x32/actions/kt-add-feeds.png -share/icons/hicolor/32x32/actions/kt-add-filters.png +%%WEBENGINE%%share/icons/hicolor/32x32/actions/kt-add-feeds.png +%%WEBENGINE%%share/icons/hicolor/32x32/actions/kt-add-filters.png share/icons/hicolor/32x32/actions/kt-info-widget.png share/icons/hicolor/32x32/actions/kt-magnet.png share/icons/hicolor/32x32/actions/kt-pause.png share/icons/hicolor/32x32/actions/kt-queue-manager.png -share/icons/hicolor/32x32/actions/kt-remove-feeds.png -share/icons/hicolor/32x32/actions/kt-remove-filters.png +%%WEBENGINE%%share/icons/hicolor/32x32/actions/kt-remove-feeds.png +%%WEBENGINE%%share/icons/hicolor/32x32/actions/kt-remove-filters.png share/icons/hicolor/32x32/actions/kt-remove.png share/icons/hicolor/32x32/actions/kt-set-max-download-speed.png share/icons/hicolor/32x32/actions/kt-set-max-upload-speed.png @@ -116,14 +116,14 @@ share/icons/hicolor/scalable/actions/kt-set-max-downlo share/icons/hicolor/scalable/actions/kt-set-max-upload-speed.svgz share/icons/hicolor/scalable/actions/kt-speed-limits.svgz share/knotifications5/ktorrent.notifyrc -%%DATADIR%%/opensearch/btdb.in/favicon.ico -%%DATADIR%%/opensearch/btdb.in/opensearch.xml -%%DATADIR%%/opensearch/btdig.com/favicon.ico -%%DATADIR%%/opensearch/btdig.com/opensearch.xml -%%DATADIR%%/opensearch/duckduckgo.com/favicon.ico -%%DATADIR%%/opensearch/duckduckgo.com/opensearch.xml -%%DATADIR%%/opensearch/torrentproject.se/favicon.ico -%%DATADIR%%/opensearch/torrentproject.se/opensearch.xml +%%WEBENGINE%%%%DATADIR%%/opensearch/btdb.in/favicon.ico +%%WEBENGINE%%%%DATADIR%%/opensearch/btdb.in/opensearch.xml +%%WEBENGINE%%%%DATADIR%%/opensearch/btdig.com/favicon.ico +%%WEBENGINE%%%%DATADIR%%/opensearch/btdig.com/opensearch.xml +%%WEBENGINE%%%%DATADIR%%/opensearch/duckduckgo.com/favicon.ico +%%WEBENGINE%%%%DATADIR%%/opensearch/duckduckgo.com/opensearch.xml +%%WEBENGINE%%%%DATADIR%%/opensearch/torrentproject.se/favicon.ico +%%WEBENGINE%%%%DATADIR%%/opensearch/torrentproject.se/opensearch.xml %%DATADIR%%/scripts/auto_remove/auto_remove.desktop %%DATADIR%%/scripts/auto_remove/auto_remove.py %%DATADIR%%/scripts/auto_remove/auto_remove.ui @@ -135,28 +135,28 @@ share/knotifications5/ktorrent.notifyrc %%DATADIR%%/scripts/email_notifications/emailconfig.ui %%DATADIR%%/scripts/tracker_groups/tracker_groups.desktop %%DATADIR%%/scripts/tracker_groups/tracker_groups.py -%%DATADIR%%/search/home/body-background.jpg -%%DATADIR%%/search/home/box-bottom-left.png -%%DATADIR%%/search/home/box-bottom-middle.png -%%DATADIR%%/search/home/box-bottom-right.png -%%DATADIR%%/search/home/box-center.png -%%DATADIR%%/search/home/box-middle-left.png -%%DATADIR%%/search/home/box-middle-right.png -%%DATADIR%%/search/home/box-top-left.png -%%DATADIR%%/search/home/box-top-middle.png -%%DATADIR%%/search/home/box-top-right.png -%%DATADIR%%/search/home/home.css -%%DATADIR%%/search/home/home.html -%%DATADIR%%/search/home/ktorrent-icon.png -%%DATADIR%%/search/home/ktorrent_infopage.css +%%WEBENGINE%%%%DATADIR%%/search/home/body-background.jpg +%%WEBENGINE%%%%DATADIR%%/search/home/box-bottom-left.png +%%WEBENGINE%%%%DATADIR%%/search/home/box-bottom-middle.png +%%WEBENGINE%%%%DATADIR%%/search/home/box-bottom-right.png +%%WEBENGINE%%%%DATADIR%%/search/home/box-center.png +%%WEBENGINE%%%%DATADIR%%/search/home/box-middle-left.png +%%WEBENGINE%%%%DATADIR%%/search/home/box-middle-right.png +%%WEBENGINE%%%%DATADIR%%/search/home/box-top-left.png +%%WEBENGINE%%%%DATADIR%%/search/home/box-top-middle.png +%%WEBENGINE%%%%DATADIR%%/search/home/box-top-right.png +%%WEBENGINE%%%%DATADIR%%/search/home/home.css +%%WEBENGINE%%%%DATADIR%%/search/home/home.html +%%WEBENGINE%%%%DATADIR%%/search/home/ktorrent-icon.png +%%WEBENGINE%%%%DATADIR%%/search/home/ktorrent_infopage.css share/kxmlgui5/ktorrent/ktorrent_bwschedulerui.rc share/kxmlgui5/ktorrent/ktorrent_downloadorderui.rc share/kxmlgui5/ktorrent/ktorrent_magnetgeneratorui.rc share/kxmlgui5/ktorrent/ktorrent_mediaplayerui.rc share/kxmlgui5/ktorrent/ktorrent_scriptingui.rc -share/kxmlgui5/ktorrent/ktorrent_searchui.rc +%%WEBENGINE%%share/kxmlgui5/ktorrent/ktorrent_searchui.rc %%WORKSPACE%%share/kxmlgui5/ktorrent/ktorrent_shutdownui.rc -share/kxmlgui5/ktorrent/ktorrent_syndicationui.rc +%%WEBENGINE%%share/kxmlgui5/ktorrent/ktorrent_syndicationui.rc share/kxmlgui5/ktorrent/ktorrentui.rc share/kxmlgui5/ktorrent/kttorrentactivityui.rc share/locale/ar/LC_MESSAGES/ktorrent.mo