svn commit: r518947 - head/x11-toolkits/plasma5-kdeplasma-addons
Piotr Kubaj
pkubaj at FreeBSD.org
Tue Dec 3 15:21:08 UTC 2019
Author: pkubaj
Date: Tue Dec 3 15:21:07 2019
New Revision: 518947
URL: https://svnweb.freebsd.org/changeset/ports/518947
Log:
x11-toolkits/plasma5-kdeplasma-addons: fix build on non-x86
Since e.g. PPC doesn't have webengine on elfv1, this port doesn't build.
Make webengine only for x86 and ppc64 elfv2.
PR: 241598
Approved by: tcberner (maintainer timeout), mentors (implicit approval)
Modified:
head/x11-toolkits/plasma5-kdeplasma-addons/Makefile
head/x11-toolkits/plasma5-kdeplasma-addons/pkg-plist
Modified: head/x11-toolkits/plasma5-kdeplasma-addons/Makefile
==============================================================================
--- head/x11-toolkits/plasma5-kdeplasma-addons/Makefile Tue Dec 3 15:18:36 2019 (r518946)
+++ head/x11-toolkits/plasma5-kdeplasma-addons/Makefile Tue Dec 3 15:21:07 2019 (r518947)
@@ -16,14 +16,23 @@ USE_KDE= activities archive attica auth bookmarks code
plasma-framework plasma-workspace runner service solid \
sonnet textwidgets unitconversion widgetsaddons windowsystem xmlgui
USE_QT= concurrent core dbus declarative graphicaleffects gui location network \
- printsupport script webchannel webengine widgets x11extras xml \
+ printsupport script webchannel widgets x11extras xml \
buildtools_build qmake_build
-OPTIONS_DEFINE= PURPOSE
+OPTIONS_DEFINE= PURPOSE QTWEBENGINE
OPTIONS_DEFAULT= PURPOSE
+OPTIONS_DEFAULT_amd64= QTWEBENGINE
+OPTIONS_DEFAULT_i386= QTWEBENGINE
+OPTIONS_DEFAULT_powerpc64= ${OPTIONS_DEFAULT_powerpc64_${OSREL:R}}
+OPTIONS_DEFAULT_powerpc64_13= WEBENGINE
+OPTIONS_SUB= YES
PURPOSE_DESC= Enable 'QuickShare' applet
PURPOSE_USE= KDE=purpose
PURPOSE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5Purpose
+
+QTWEBENGINE_DESC= Add dependency on qt5-webengine
+QTWEBENGINE_USE= qt=webengine
+QTWEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine
.include <bsd.port.mk>
Modified: head/x11-toolkits/plasma5-kdeplasma-addons/pkg-plist
==============================================================================
--- head/x11-toolkits/plasma5-kdeplasma-addons/pkg-plist Tue Dec 3 15:18:36 2019 (r518946)
+++ head/x11-toolkits/plasma5-kdeplasma-addons/pkg-plist Tue Dec 3 15:21:07 2019 (r518947)
@@ -39,9 +39,9 @@ lib/libplasmapotdprovidercore.so.1.0.0
%%QT_PLUGINDIR%%/potd/plasma_potd_unsplashprovider.so
%%QT_PLUGINDIR%%/potd/plasma_potd_wcpotdprovider.so
%%QT_QMLDIR%%/org/kde/plasma/private/colorpicker/libcolorpickerplugin.so
-%%QT_QMLDIR%%/org/kde/plasma/private/colorpicker/qmldir
-%%QT_QMLDIR%%/org/kde/plasma/private/dict/libdictplugin.so
-%%QT_QMLDIR%%/org/kde/plasma/private/dict/qmldir
+%%QTWEBENGINE%%%%QT_QMLDIR%%/org/kde/plasma/private/colorpicker/qmldir
+%%QTWEBENGINE%%%%QT_QMLDIR%%/org/kde/plasma/private/dict/libdictplugin.so
+%%QTWEBENGINE%%%%QT_QMLDIR%%/org/kde/plasma/private/dict/qmldir
%%QT_QMLDIR%%/org/kde/plasma/private/diskquota/libdiskquotaplugin.so
%%QT_QMLDIR%%/org/kde/plasma/private/diskquota/qmldir
%%QT_QMLDIR%%/org/kde/plasma/private/fifteenpuzzle/libfifteenpuzzleplugin.so
@@ -60,7 +60,7 @@ lib/libplasmapotdprovidercore.so.1.0.0
%%QT_QMLDIR%%/org/kde/plasma/private/weather/qmldir
%%QT_QMLDIR%%/org/kde/plasmacalendar/astronomicaleventsconfig/libplasmacalendarastronomicaleventsconfig.so
%%QT_QMLDIR%%/org/kde/plasmacalendar/astronomicaleventsconfig/qmldir
-share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
+%%QTWEBENGINE%%share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
share/kdevappwizard/templates/plasmapotdprovider.tar.bz2
share/knsrcfiles/comic.knsrc
@@ -93,8 +93,8 @@ share/kservices5/plasma-applet-org.kde.plasma.systemlo
share/kservices5/plasma-applet-org.kde.plasma.timer.desktop
share/kservices5/plasma-applet-org.kde.plasma.userswitcher.desktop
share/kservices5/plasma-applet-org.kde.plasma.weather.desktop
-share/kservices5/plasma-applet-org.kde.plasma.webbrowser.desktop
-share/kservices5/plasma-applet-org.kde.plasma_applet_dict.desktop
+%%QTWEBENGINE%%share/kservices5/plasma-applet-org.kde.plasma.webbrowser.desktop
+%%QTWEBENGINE%%share/kservices5/plasma-applet-org.kde.plasma_applet_dict.desktop
share/kservices5/plasma-dataengine-comic.desktop
share/kservices5/plasma-dataengine-konsoleprofiles.desktop
share/kservices5/plasma-dataengine-potd.desktop
@@ -1613,8 +1613,8 @@ share/metainfo/org.kde.plasma.systemloadviewer.appdata
share/metainfo/org.kde.plasma.timer.appdata.xml
share/metainfo/org.kde.plasma.userswitcher.appdata.xml
share/metainfo/org.kde.plasma.weather.appdata.xml
-share/metainfo/org.kde.plasma.webbrowser.appdata.xml
-share/metainfo/org.kde.plasma_applet_dict.appdata.xml
+%%QTWEBENGINE%%share/metainfo/org.kde.plasma.webbrowser.appdata.xml
+%%QTWEBENGINE%%share/metainfo/org.kde.plasma_applet_dict.appdata.xml
share/metainfo/org.kde.potd.appdata.xml
share/plasma/desktoptheme/default/weather/wind-arrows.svgz
share/plasma/desktoptheme/default/widgets/timer.svgz
@@ -1771,15 +1771,15 @@ share/plasma/plasmoids/org.kde.plasma.weather/contents
share/plasma/plasmoids/org.kde.plasma.weather/contents/ui/main.qml
share/plasma/plasmoids/org.kde.plasma.weather/metadata.desktop
share/plasma/plasmoids/org.kde.plasma.weather/metadata.json
-share/plasma/plasmoids/org.kde.plasma.webbrowser/contents/config/main.xml
-share/plasma/plasmoids/org.kde.plasma.webbrowser/contents/ui/main.qml
-share/plasma/plasmoids/org.kde.plasma.webbrowser/metadata.desktop
-share/plasma/plasmoids/org.kde.plasma.webbrowser/metadata.json
-share/plasma/plasmoids/org.kde.plasma_applet_dict/contents/config/config.qml
-share/plasma/plasmoids/org.kde.plasma_applet_dict/contents/ui/ConfigDictionaries.qml
-share/plasma/plasmoids/org.kde.plasma_applet_dict/contents/ui/main.qml
-share/plasma/plasmoids/org.kde.plasma_applet_dict/metadata.desktop
-share/plasma/plasmoids/org.kde.plasma_applet_dict/metadata.json
+%%QTWEBENGINE%%share/plasma/plasmoids/org.kde.plasma.webbrowser/contents/config/main.xml
+%%QTWEBENGINE%%share/plasma/plasmoids/org.kde.plasma.webbrowser/contents/ui/main.qml
+%%QTWEBENGINE%%share/plasma/plasmoids/org.kde.plasma.webbrowser/metadata.desktop
+%%QTWEBENGINE%%share/plasma/plasmoids/org.kde.plasma.webbrowser/metadata.json
+%%QTWEBENGINE%%share/plasma/plasmoids/org.kde.plasma_applet_dict/contents/config/config.qml
+%%QTWEBENGINE%%share/plasma/plasmoids/org.kde.plasma_applet_dict/contents/ui/ConfigDictionaries.qml
+%%QTWEBENGINE%%share/plasma/plasmoids/org.kde.plasma_applet_dict/contents/ui/main.qml
+%%QTWEBENGINE%%share/plasma/plasmoids/org.kde.plasma_applet_dict/metadata.desktop
+%%QTWEBENGINE%%share/plasma/plasmoids/org.kde.plasma_applet_dict/metadata.json
share/plasma/services/org.kde.plasma.dataengine.konsoleprofiles.operations
share/plasma/wallpapers/org.kde.haenau/contents/ui/BackgroundElement.qml
share/plasma/wallpapers/org.kde.haenau/contents/ui/BottomBackgroundElement.qml
More information about the svn-ports-all
mailing list