diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-12-30 17:34:01 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-12-30 17:34:01 +0000 |
commit | e67afdc30c2ed19735af5dbe614845ab07eb6754 (patch) | |
tree | 68700916b78d8d9e40d1fa1828a9b925c7d3f9a1 /astro | |
parent | 69deeb18ade35b3f5f39369b537a6eaf9fa205db (diff) | |
download | ports-e67afdc30c2ed19735af5dbe614845ab07eb6754.tar.gz ports-e67afdc30c2ed19735af5dbe614845ab07eb6754.zip |
astro/marble: make webengine optional (used for non i386/amd64 architectures)
PR: 234461
Submitted by: Piotr Kubaj <pkubaj@anongoth.pl>
Notes
Notes:
svn path=/head/; revision=488725
Diffstat (limited to 'astro')
-rw-r--r-- | astro/marble/Makefile | 10 | ||||
-rw-r--r-- | astro/marble/files/patch-CMakeLists.txt | 36 | ||||
-rw-r--r-- | astro/marble/pkg-plist | 14 |
3 files changed, 52 insertions, 8 deletions
diff --git a/astro/marble/Makefile b/astro/marble/Makefile index e88e52228288..07beb5b502ba 100644 --- a/astro/marble/Makefile +++ b/astro/marble/Makefile @@ -20,7 +20,7 @@ USE_KDE= attica auth codecs completion config configwidgets coreaddons \ plasma-framework runner service sonnet textwidgets wallet \ widgetsaddons xmlgui USE_QT= concurrent core dbus declarative designer gui location network opengl \ - phonon4 printsupport script sql svg webchannel webengine widgets xml \ + phonon4 printsupport script sql svg webchannel widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes @@ -29,12 +29,18 @@ MAKE_ENV= XDG_CONFIG_HOME=/dev/null CMAKE_ARGS= -DMOBILE:BOOL=FALSE \ -DQT_IMPORTS_DIR:PATH=${QT_IMPORTDIR} -OPTIONS_DEFINE= GPS DOCS +OPTIONS_DEFINE= GPS DOCS WEBENGINE OPTIONS_DEFAULT=GPS +OPTIONS_DEFAULT_amd64= WEBENGINE +OPTIONS_DEFAULT_i386= WEBENGINE OPTIONS_SUB= yes GPS_DESC= Support for GPS position provider GPS_LIB_DEPENDS= libgps.so:astro/gpsd GPS_CMAKE_OFF= -DWITH_libgps:BOOL=FALSE +WEBENGINE_DESC= Add dependency on qt5-webengine +WEBENGINE_USE= QT=webengine +WEBENGINE_CMAKE_BOOL= WEBENGINE + .include <bsd.port.mk> diff --git a/astro/marble/files/patch-CMakeLists.txt b/astro/marble/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..090505e287a8 --- /dev/null +++ b/astro/marble/files/patch-CMakeLists.txt @@ -0,0 +1,36 @@ +--- CMakeLists.txt.orig 2018-12-30 17:28:44 UTC ++++ CMakeLists.txt +@@ -76,6 +76,7 @@ include( MarbleMacros ) + # Generate the tiles with the tilecreator at compile time + # if this option is set, srtm.jpg will not be installed but the generated tiles instead + option(MOBILE "Create a Marble version optimized for handheld devices") ++option(WEBENGINE "Build browser plugin" ON) + + #################################################### + # Build a D-Bus interface for the Marble widget +@@ -128,15 +129,17 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android) + ) + set ( MARBLE_NO_WEBKITWIDGETS TRUE ) + else() +- find_package(Qt5 ${REQUIRED_QT_VERSION} +- COMPONENTS +- WebEngine +- WebEngineWidgets +- ) ++ if(WEBENGINE) ++ find_package(Qt5 ${REQUIRED_QT_VERSION} ++ COMPONENTS ++ WebEngine ++ WebEngineWidgets ++ ) + +- if ( NOT Qt5WebEngineWidgets_FOUND ) +- set ( MARBLE_NO_WEBKITWIDGETS TRUE ) +- endif() ++ if( NOT Qt5WebEngineWidgets_FOUND ) ++ set ( MARBLE_NO_WEBKITWIDGETS TRUE ) ++ endif() ++ endif() + endif() + + if (BUILD_WITH_DBUS) diff --git a/astro/marble/pkg-plist b/astro/marble/pkg-plist index d456be5200ae..7e150065f058 100644 --- a/astro/marble/pkg-plist +++ b/astro/marble/pkg-plist @@ -105,10 +105,12 @@ include/marble/MarbleMap.h include/marble/MarbleMath.h include/marble/MarbleModel.h include/marble/MarbleNavigator.h -include/marble/MarbleWebView.h +%%WEBENGINE%%include/marble/MarbleWebView.h include/marble/MarbleWidget.h include/marble/MarbleWidgetInputHandler.h include/marble/MarbleWidgetPopupMenu.h +%%NO_WEBENGINE%%include/marble/NullMarbleWebView.h +%%NO_WEBENGINE%%include/marble/NullTinyWebBrowser.h include/marble/OsmcSymbol.h include/marble/ParseRunnerPlugin.h include/marble/ParsingRunner.h @@ -153,7 +155,7 @@ include/marble/TileCreator.h include/marble/TileCreatorDialog.h include/marble/TileId.h include/marble/TileLevelRangeWidget.h -include/marble/TinyWebBrowser.h +%%WEBENGINE%%include/marble/TinyWebBrowser.h include/marble/TourControlEditWidget.h include/marble/TourItemDelegate.h include/marble/TourPlayback.h @@ -216,12 +218,12 @@ lib/marble/plugins/libNominatimReverseGeocodingPlugin.so lib/marble/plugins/libNominatimSearchPlugin.so lib/marble/plugins/libNotesPlugin.so lib/marble/plugins/libOSRMPlugin.so -lib/marble/plugins/libOpenDesktopPlugin.so +%%WEBENGINE%%lib/marble/plugins/libOpenDesktopPlugin.so lib/marble/plugins/libOpenLocationCodeSearchPlugin.so lib/marble/plugins/libOpenRouteServicePlugin.so lib/marble/plugins/libOsmPlugin.so lib/marble/plugins/libOverviewMap.so -lib/marble/plugins/libPhoto.so +%%WEBENGINE%%lib/marble/plugins/libPhoto.so lib/marble/plugins/libPn2Plugin.so lib/marble/plugins/libPntPlugin.so lib/marble/plugins/libPositionMarker.so @@ -234,8 +236,8 @@ lib/marble/plugins/libSatellitesPlugin.so lib/marble/plugins/libSpeedometer.so lib/marble/plugins/libStarsPlugin.so lib/marble/plugins/libSunPlugin.so -lib/marble/plugins/libWeather.so -lib/marble/plugins/libWikipedia.so +%%WEBENGINE%%lib/marble/plugins/libWeather.so +%%WEBENGINE%%lib/marble/plugins/libWikipedia.so lib/marble/plugins/libYoursPlugin.so lib/plugins/designer/libLatLonEditPlugin.so lib/plugins/designer/libMarbleNavigatorPlugin.so |