Date: Mon, 18 Feb 2019 17:59:17 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> 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 Message-ID: <201902181759.x1IHxHgb040495@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <pkubaj@anongoth.pl> 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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902181759.x1IHxHgb040495>