From owner-svn-ports-all@freebsd.org Mon Feb 18 17:59:18 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6697A14E615A; Mon, 18 Feb 2019 17:59:18 +0000 (UTC) (envelope-from adridg@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) server-signature RSA-PSS (4096 bits) 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 0BB73754E2; Mon, 18 Feb 2019 17:59:18 +0000 (UTC) (envelope-from adridg@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 F3B9A9568; Mon, 18 Feb 2019 17:59:17 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1IHxHFo040498; Mon, 18 Feb 2019 17:59:17 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1IHxHgb040495; Mon, 18 Feb 2019 17:59:17 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201902181759.x1IHxHgb040495@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 18 Feb 2019 17:59:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493281 - in head: audio/amarok games/gcompris-qt multimedia/kamoso X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head: audio/amarok games/gcompris-qt multimedia/kamoso X-SVN-Commit-Revision: 493281 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0BB73754E2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 18 Feb 2019 17:59:18 -0000 Author: adridg Date: Mon Feb 18 17:59:16 2019 New Revision: 493281 URL: https://svnweb.freebsd.org/changeset/ports/493281 Log: More non-clang, non-x86 fixes. - add compiler:c++11-lang - make WebEngine optional (Second batch of fixes from the same PR) PR: 235093 Submitted by: Piotr Kubaj Modified: head/audio/amarok/Makefile head/audio/amarok/pkg-plist head/games/gcompris-qt/Makefile head/multimedia/kamoso/Makefile Modified: head/audio/amarok/Makefile ============================================================================== --- head/audio/amarok/Makefile Mon Feb 18 17:57:16 2019 (r493280) +++ head/audio/amarok/Makefile Mon Feb 18 17:59:16 2019 (r493281) @@ -25,7 +25,7 @@ USES= cmake compiler:c++11-lang desktop-file-utils \ kde:5 mysql:client,embedded pkgconfig qt:5 shebangfix ssl USE_QT= core concurrent declarative dbus gui location network phonon4 \ - quickcontrols2 script scripttools sql svg webchannel webengine \ + quickcontrols2 script scripttools sql svg webchannel \ webkit widgets xml \ buildtools_build qmake_build @@ -49,8 +49,10 @@ CMAKE_OFF= WITH_FFmpeg BROKEN_sparc64= does not build (GCC-related error) -OPTIONS_DEFINE= IPOD MP3TUNES MTP +OPTIONS_DEFINE= IPOD MP3TUNES MTP QTWEBENGINE OPTIONS_DEFAULT= IPOD MP3TUNES MTP +OPTIONS_DEFAULT_amd64= QTWEBENGINE +OPTIONS_DEFAULT_i386= QTWEBENGINE OPTIONS_SUB= yes IPOD_DESC= Apple iPod support @@ -72,6 +74,10 @@ MP3TUNES_CMAKE_BOOL_OFF= WITH_Libgcrypt MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp MTP_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Mtp + +QTWEBENGINE_DESC= Add dependency on qt5-webengine +QTWEBENGINE_USE= qt=webengine +QTWEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=true post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ Modified: head/audio/amarok/pkg-plist ============================================================================== --- head/audio/amarok/pkg-plist Mon Feb 18 17:57:16 2019 (r493280) +++ head/audio/amarok/pkg-plist Mon Feb 18 17:59:16 2019 (r493281) @@ -56,12 +56,12 @@ lib/libampache_account_login.so %%QT_QMLDIR%%/org/kde/amarok/qml/AppletHeader.qml %%QT_QMLDIR%%/org/kde/amarok/qml/libqml_plugin.so %%QT_QMLDIR%%/org/kde/amarok/qml/qmldir -%%QT_QMLDIR%%/org/kde/amarok/wikipedia/libamarok_context_applet_wikipedia.so -%%QT_QMLDIR%%/org/kde/amarok/wikipedia/qmldir +%%QTWEBENGINE%%%%QT_QMLDIR%%/org/kde/amarok/wikipedia/libamarok_context_applet_wikipedia.so +%%QTWEBENGINE%%%%QT_QMLDIR%%/org/kde/amarok/wikipedia/qmldir %%DATADIR%%/data/DefaultPlaylistLayouts.xml %%DATADIR%%/data/InfoParserLoading.html -%%DATADIR%%/data/WikipediaCustomStyle.css -%%DATADIR%%/data/bullet.gif +%%QTWEBENGINE%%%%DATADIR%%/data/WikipediaCustomStyle.css +%%QTWEBENGINE%%%%DATADIR%%/data/bullet.gif %%DATADIR%%/data/first_run_jingle.ogg %%DATADIR%%/data/hover_info_template.html %%DATADIR%%/data/podcast_directory.opml @@ -433,8 +433,8 @@ share/kpackage/amarok/org.kde.amarok.lyrics/contents.r share/kpackage/amarok/org.kde.amarok.lyrics/metadata.json share/kpackage/amarok/org.kde.amarok.photos/contents.rcc share/kpackage/amarok/org.kde.amarok.photos/metadata.json -share/kpackage/amarok/org.kde.amarok.wikipedia/contents.rcc -share/kpackage/amarok/org.kde.amarok.wikipedia/metadata.json +%%QTWEBENGINE%%share/kpackage/amarok/org.kde.amarok.wikipedia/contents.rcc +%%QTWEBENGINE%%share/kpackage/amarok/org.kde.amarok.wikipedia/metadata.json share/kpackage/genericqml/org.kde.amarok.context/contents.rcc share/kpackage/genericqml/org.kde.amarok.context/metadata.json share/kservices5/ServiceMenus/amarok_append.desktop Modified: head/games/gcompris-qt/Makefile ============================================================================== --- head/games/gcompris-qt/Makefile Mon Feb 18 17:57:16 2019 (r493280) +++ head/games/gcompris-qt/Makefile Mon Feb 18 17:59:16 2019 (r493281) @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libBox2D.so:x11-toolkits/qml-box2d -USES= cmake kde:5 qt:5 tar:xz +USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz USE_KDE= doctools USE_QT= core declarative graphicaleffects gui multimedia network quickcontrols \ sensors svg widgets xml xmlpatterns \ Modified: head/multimedia/kamoso/Makefile ============================================================================== --- head/multimedia/kamoso/Makefile Mon Feb 18 17:57:16 2019 (r493280) +++ head/multimedia/kamoso/Makefile Mon Feb 18 17:59:16 2019 (r493281) @@ -9,7 +9,7 @@ COMMENT= Application to take pictures and videos out o LICENSE= GPLv2 -USES= cmake gettext kde:5 pkgconfig qt:5 tar:xz +USES= cmake compiler:c++11-lang gettext kde:5 pkgconfig qt:5 tar:xz USE_GNOME= glib20 USE_GSTREAMER1= yes USE_KDE= auth bookmarks codecs completion config configwidgets \