svn commit: r488725 - in head/astro/marble: . files
Tobias C. Berner
tcberner at FreeBSD.org
Sun Dec 30 17:34:03 UTC 2018
Author: tcberner
Date: Sun Dec 30 17:34:01 2018
New Revision: 488725
URL: https://svnweb.freebsd.org/changeset/ports/488725
Log:
astro/marble: make webengine optional (used for non i386/amd64 architectures)
PR: 234461
Submitted by: Piotr Kubaj <pkubaj at anongoth.pl>
Added:
head/astro/marble/files/patch-CMakeLists.txt (contents, props changed)
Modified:
head/astro/marble/Makefile
head/astro/marble/pkg-plist
Modified: head/astro/marble/Makefile
==============================================================================
--- head/astro/marble/Makefile Sun Dec 30 17:18:39 2018 (r488724)
+++ head/astro/marble/Makefile Sun Dec 30 17:34:01 2018 (r488725)
@@ -20,7 +20,7 @@ USE_KDE= attica auth codecs completion config configwi
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>
Added: head/astro/marble/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/marble/files/patch-CMakeLists.txt Sun Dec 30 17:34:01 2018 (r488725)
@@ -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)
Modified: head/astro/marble/pkg-plist
==============================================================================
--- head/astro/marble/pkg-plist Sun Dec 30 17:18:39 2018 (r488724)
+++ head/astro/marble/pkg-plist Sun Dec 30 17:34:01 2018 (r488725)
@@ -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.
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
More information about the svn-ports-head
mailing list