diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2019-02-18 17:59:16 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2019-02-18 17:59:16 +0000 |
| commit | 5687aebbf6aa1218ca765a2ae05991e1069a50c7 (patch) | |
| tree | 96fe5dc6e3a8514b0584b5c7bd9d1c4f0d528d96 /audio/amarok | |
| parent | 9b45eee24dd14cad19a4f06704dc58d2d3acb2f9 (diff) | |
| download | ports-5687aebbf6aa1218ca765a2ae05991e1069a50c7.tar.gz ports-5687aebbf6aa1218ca765a2ae05991e1069a50c7.zip | |
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>
Notes
Notes:
svn path=/head/; revision=493281
Diffstat (limited to 'audio/amarok')
| -rw-r--r-- | audio/amarok/Makefile | 10 | ||||
| -rw-r--r-- | audio/amarok/pkg-plist | 12 |
2 files changed, 14 insertions, 8 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index af60ac75cb58..f33dfab1e969 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -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 @@ -73,6 +75,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}|' \ ${WRKSRC}/cmake/modules/FindMySQL.cmake diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist index 135ab666e614..2c26f75c8ccf 100644 --- a/audio/amarok/pkg-plist +++ b/audio/amarok/pkg-plist @@ -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.rcc 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 |