Switch from qtwebkit to qtwebengine support in marble

This commit is contained in:
rsadowski 2020-05-22 07:34:47 +00:00
parent a0368316ec
commit 46192b5967
2 changed files with 14 additions and 7 deletions

View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.9 2020/03/23 18:01:28 rsadowski Exp $
# $OpenBSD: Makefile,v 1.10 2020/05/22 07:34:47 rsadowski Exp $
COMMENT = virtual globe and world atlas
DISTNAME = marble-${VERSION}
PKGNAME = marble-kf5-${VERSION}
CATEGORIES = geo
REVISION = 0
HOMEPAGE = https://marble.kde.org/
SHARED_LIBS += astro 1.0 # 0.17
SHARED_LIBS += marblewidget-qt5 1.0 # 0.28
SHARED_LIBS += marbledeclarative 0.0 # 0.28
WANTLIB += ${COMPILER_LIBCXX} KF5Attica KF5Auth KF5AuthCore KF5Codecs
WANTLIB += KF5Completion KF5ConfigCore KF5ConfigGui KF5ConfigWidgets
@ -18,7 +19,8 @@ WANTLIB += KF5KIOWidgets KF5NewStuff KF5NewStuffCore KF5Package
WANTLIB += KF5Parts KF5Plasma KF5Runner KF5Service KF5SonnetUi
WANTLIB += KF5TextWidgets KF5WidgetsAddons KF5XmlGui Qt5Concurrent
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Positioning Qt5PrintSupport
WANTLIB += Qt5Qml Qt5Quick Qt5SerialPort Qt5Sql Qt5Svg Qt5Widgets
WANTLIB += Qt5Qml Qt5Quick Qt5SerialPort Qt5Sql Qt5Svg Qt5WebChannel
WANTLIB += Qt5WebEngine Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets
WANTLIB += Qt5Xml c gps m shp z
MODKDE5_DESKTOP_FILE = yes
@ -61,6 +63,7 @@ LIB_DEPENDS = devel/kf5/attica \
x11/qt5/qtdeclarative \
x11/qt5/qtlocation \
x11/qt5/qtserialport \
x11/qt5/qtwebengine \
x11/qt5/qtsvg
CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_libwlocate=ON \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2020/03/23 18:01:28 rsadowski Exp $
@comment $OpenBSD: PLIST,v 1.5 2020/05/22 07:34:47 rsadowski Exp $
@conflict kde-l10n-*
@conflict kde-i18n-*
@conflict marble-<=4.14.3
@ -111,11 +111,10 @@ include/marble/MarbleMap.h
include/marble/MarbleMath.h
include/marble/MarbleModel.h
include/marble/MarbleNavigator.h
include/marble/MarbleWebView.h
include/marble/MarbleWidget.h
include/marble/MarbleWidgetInputHandler.h
include/marble/MarbleWidgetPopupMenu.h
include/marble/NullMarbleWebView.h
include/marble/NullTinyWebBrowser.h
include/marble/OsmcSymbol.h
include/marble/ParseRunnerPlugin.h
include/marble/ParsingRunner.h
@ -160,6 +159,7 @@ include/marble/TileCreator.h
include/marble/TileCreatorDialog.h
include/marble/TileId.h
include/marble/TileLevelRangeWidget.h
include/marble/TinyWebBrowser.h
include/marble/TourControlEditWidget.h
include/marble/TourItemDelegate.h
include/marble/TourPlayback.h
@ -181,7 +181,7 @@ lib/cmake/Marble/MarbleConfigVersion.cmake
lib/cmake/Marble/MarbleTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/Marble/MarbleTargets.cmake
@lib lib/libastro.so.${LIBastro_VERSION}
@so lib/libmarbledeclarative.so
@lib lib/libmarbledeclarative.so.${LIBmarbledeclarative_VERSION}
@lib lib/libmarblewidget-qt5.so.${LIBmarblewidget-qt5_VERSION}
lib/marble/
lib/marble/plugins/
@ -223,10 +223,12 @@ lib/marble/plugins/
@so lib/marble/plugins/libNominatimSearchPlugin.so
@so lib/marble/plugins/libNotesPlugin.so
@so lib/marble/plugins/libOSRMPlugin.so
@so lib/marble/plugins/libOpenDesktopPlugin.so
@so lib/marble/plugins/libOpenLocationCodeSearchPlugin.so
@so lib/marble/plugins/libOpenRouteServicePlugin.so
@so lib/marble/plugins/libOsmPlugin.so
@so lib/marble/plugins/libOverviewMap.so
@so lib/marble/plugins/libPhoto.so
@so lib/marble/plugins/libPn2Plugin.so
@so lib/marble/plugins/libPntPlugin.so
@so lib/marble/plugins/libPositionMarker.so
@ -240,6 +242,8 @@ lib/marble/plugins/
@so lib/marble/plugins/libSpeedometer.so
@so lib/marble/plugins/libStarsPlugin.so
@so lib/marble/plugins/libSunPlugin.so
@so lib/marble/plugins/libWeather.so
@so lib/marble/plugins/libWikipedia.so
@so lib/marble/plugins/libYoursPlugin.so
lib/plugins/
lib/plugins/designer/