Hi ports@
The following diff enables qtwebengine qtwebglplugin qtwebview and docs
Switch from qtwebkit to qtwebengine for the following ports:
- qt-creator
- digikam
- marble
- kalgebra
- gpsbabel (Build test only)
I tested all other qtwebkit ports and see no need for action on the
rest. Disabled qtwebengine otter-browser. "Otter is the only browser
really working on macppc." - cwen
What do you think? OK? I would like to see that as soon as possible.
Rafael
diff --git a/devel/qt-creator/Makefile b/devel/qt-creator/Makefile
index 65045d7dbdd..9ab08d5e6fc 100644
--- a/devel/qt-creator/Makefile
+++ b/devel/qt-creator/Makefile
@@ -7,6 +7,7 @@ COMMENT = cross-platform IDE for use with Qt
V = 4.12.0
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
+REVISION = 0
SHARED_LIBS += Aggregation 0.0 # 0.0
SHARED_LIBS += CPlusPlus 2.0 # 0.0
@@ -41,9 +42,10 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL KF5SyntaxHighlighting Qt5Concurrent
WANTLIB += Qt5Core Qt5Designer Qt5DesignerComponents Qt5Gui Qt5Help
-WANTLIB += Qt5Network Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets
-WANTLIB += Qt5Script Qt5SerialPort Qt5Sql Qt5Svg Qt5Widgets Qt5Xml
-WANTLIB += c clang m yaml-cpp
+WANTLIB += Qt5Network Qt5Positioning Qt5PrintSupport Qt5Qml Qt5Quick
+WANTLIB += Qt5QuickWidgets Qt5Script Qt5SerialPort Qt5Sql Qt5Svg
+WANTLIB += Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
+WANTLIB += Qt5Widgets Qt5Xml c clang m yaml-cpp
MASTER_SITES = https://download.qt.io/official_releases/qtcreator/${V:R}/${V}/
@@ -71,7 +73,7 @@ RUN_DEPENDS = ${MODGCC4_CPPDEP} \
lang/clazy>=1.5 \
x11/gtk+3,-guic \
x11/qt5/qtquickcontrols \
- x11/qt5/qtwebkit
+ x11/qt5/qtwebengine
LIB_DEPENDS = devel/llvm \
devel/kf5/syntax-highlighting \
diff --git a/devel/qt-creator/pkg/PLIST b/devel/qt-creator/pkg/PLIST
index 3bb3fe4083c..6a7af205d15 100644
--- a/devel/qt-creator/pkg/PLIST
+++ b/devel/qt-creator/pkg/PLIST
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.14 2020/04/24 13:14:09 rsadowski Exp $
@bin bin/qtcreator
bin/qtcreator.sh
+@lib lib/libAdvancedDockingSystem.so.${LIBAdvancedDockingSystem_VERSION}
@lib lib/libAggregation.so.${LIBAggregation_VERSION}
@lib lib/libCPlusPlus.so.${LIBCPlusPlus_VERSION}
@lib lib/libClangsupport.so.${LIBClangsupport_VERSION}
diff --git a/geo/gpsbabel/Makefile b/geo/gpsbabel/Makefile
index 15aeed8fff3..35f4458b0dc 100644
--- a/geo/gpsbabel/Makefile
+++ b/geo/gpsbabel/Makefile
@@ -12,8 +12,8 @@ DISTNAME= gpsbabel-${VERSION}
PKGNAME-main= gpsbabel-${VERSION}
PKGNAME-tk= gpsbabel-tk-${VERSION}
PKGNAME-qt= gpsbabel-qt-${VERSION}
-REVISION-main= 0
-REVISION-qt= 0
+REVISION-main= 1
+REVISION-qt= 1
CATEGORIES= geo
HOMEPAGE= https://www.gpsbabel.org/
@@ -42,13 +42,15 @@ LIB_DEPENDS-main= ${MODGCC4_CPPLIBDEP} \
cWANTLIB = c m pthread
WANTLIB-main += shp>=1 usb z ${cWANTLIB} ${COMPILER_LIBCXX}
-WANTLIB-tk =
-WANTLIB-qt += GL Qt5Core Qt5Gui Qt5Network Qt5WebKit Qt5WebKitWidgets
-WANTLIB-qt += Qt5Widgets Qt5Xml ${COMPILER_LIBCXX} ${cWANTLIB}
+WANTLIB-tk =
+WANTLIB-qt += ${COMPILER_LIBCXX} ${cWANTLIB} GL Qt5Core Qt5Gui Qt5Network
+WANTLIB-qt += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5Quick Qt5WebChannel
+WANTLIB-qt += Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets Qt5Xml
+
LIB_DEPENDS-tk=
LIB_DEPENDS-qt= ${MODGCC4_CPPLIBDEP} \
- x11/qt5/qtwebkit
+ x11/qt5/qtwebengine
PKG_ARCH-tk= *
RUN_DEPENDS-tk= geo/gpsbabel \
${MODTK_RUN_DEPENDS}
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 3fd4b8bc09a..a560d4cb577 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -5,6 +5,7 @@ COMMENT = KDE digital photo and video management utility
V = 6.4.0
DISTNAME = digikam-${V}
CATEGORIES = graphics
+REVISION = 0
HOMEPAGE = https://www.digikam.org/
@@ -24,14 +25,15 @@ WANTLIB += KF5JobWidgets KF5KIOCore KF5KIOWidgets
KF5Notifications
WANTLIB += KF5NotifyConfig KF5Sane KF5Service KF5Solid KF5ThreadWeaver
WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Magick++-6.Q16
WANTLIB += MagickCore-6.Q16 Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
-WANTLIB += Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Sql Qt5WebKit
-WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5X11Extras Qt5Xml Qt5XmlPatterns
-WANTLIB += SM X11 Xext avcodec avfilter avformat avutil c exiv2
-WANTLIB += expat exslt glib-2.0 gphoto2 gphoto2_port intl jasper
-WANTLIB += jpeg lcms2 lensfun lqr-1 m marblewidget-qt5 opencv_calib3d
-WANTLIB += opencv_core opencv_features2d opencv_flann opencv_imgcodecs
-WANTLIB += opencv_imgproc opencv_objdetect png swscale tiff usb-1.0
-WANTLIB += x265 xml2 xslt z
+WANTLIB += Qt5Network Qt5OpenGL Qt5Positioning Qt5PrintSupport
+WANTLIB += Qt5Qml Qt5Quick Qt5Sql Qt5WebChannel Qt5WebEngineCore
+WANTLIB += Qt5WebEngineWidgets Qt5Widgets Qt5X11Extras Qt5Xml
+WANTLIB += Qt5XmlPatterns SM X11 Xext avcodec avfilter avformat
+WANTLIB += avutil c exiv2 expat exslt glib-2.0 gphoto2 gphoto2_port
+WANTLIB += intl jasper jpeg lcms2 lensfun lqr-1 m marblewidget-qt5
+WANTLIB += opencv_calib3d opencv_core opencv_features2d opencv_flann
+WANTLIB += opencv_imgcodecs opencv_imgproc opencv_objdetect png
+WANTLIB += swscale tiff usb-1.0 x265 xml2 xslt z
MASTER_SITES = ${MASTER_SITE_KDE:=stable/digikam/${V}/}
@@ -45,15 +47,17 @@ BUILD_DEPENDS = devel/bison \
devel/gettext,-tools \
devel/git \
devel/kf5/kdoctools \
- multimedia/qtav \
math/eigen3 \
- misc/shared-desktop-ontologies
+ misc/shared-desktop-ontologies \
+ multimedia/qtav \
+ x11/qt5/qtwebview
RUN_DEPENDS = databases/sqlite \
devel/desktop-file-utils \
devel/kf5/kdoctools \
multimedia/qtav \
- x11/gtk+3,-guic
+ x11/gtk+3,-guic \
+ x11/qt5/qtwebview
# TODO
# - libakonadicontact
@@ -89,11 +93,13 @@ LIB_DEPENDS += devel/kf5/kauth \
multimedia/x265 \
x11/kde-applications/libksane \
x11/kde-applications/marble \
- x11/qt5/qtwebkit \
+ x11/qt5/qtwebchannel \
+ x11/qt5/qtwebengine \
x11/qt5/qtx11extras \
x11/qt5/qtxmlpatterns
-CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
+ -DENABLE_QWEBENGINE=ON
.if ${FLAVOR:Mmysql}
BUILD_DEPENDS += databases/mariadb
diff --git
a/graphics/digikam/patches/patch-core_tests_webservices_o2_CMakeLists_txt
b/graphics/digikam/patches/patch-core_tests_webservices_o2_CMakeLists_txt
new file mode 100644
index 00000000000..0f988eb7070
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_tests_webservices_o2_CMakeLists_txt
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Disable broken test
+
+Index: core/tests/webservices/o2/CMakeLists.txt
+--- core/tests/webservices/o2/CMakeLists.txt.orig
++++ core/tests/webservices/o2/CMakeLists.txt
+@@ -13,6 +13,6 @@ if (Qt5Qml_FOUND AND Qt5WebView_FOUND)
+ add_subdirectory(sialis)
+ endif()
+
+-if(ENABLE_QWEBENGINE)
+- add_subdirectory(fbinter)
+-endif()
++#if(ENABLE_QWEBENGINE)
++# add_subdirectory(fbinter)
++#endif()
diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
index bb65a2c9149..14c6ac1e057 100644
--- a/www/otter-browser/Makefile
+++ b/www/otter-browser/Makefile
@@ -3,6 +3,7 @@
COMMENT = browser aiming to recreate classic Opera (12.x) UI using Qt5
DISTNAME = otter-browser-1.0.01
+REVISION = 0
CATEGORIES = www
@@ -32,6 +33,10 @@ LIB_DEPENDS = textproc/hunspell \
x11/qt5/qtwebkit>=5.212.0 \
x11/qt5/qtxmlpatterns
+# Otter is the only browser really working on macppc.
+CONFIGURE_ARGS += -DENABLE_QTWEBENGINE=OFF \
+ -DENABLE_QTWEBKIT=ON
+
NO_TEST = Yes
.include <bsd.port.mk>
diff --git a/x11/kde-applications/kalgebra/Makefile
b/x11/kde-applications/kalgebra/Makefile
index d86317776c0..b1ed0e3779f 100644
--- a/x11/kde-applications/kalgebra/Makefile
+++ b/x11/kde-applications/kalgebra/Makefile
@@ -7,8 +7,12 @@ DISTNAME = kalgebra-${VERSION}
CATEGORIES = education
WANTLIB += ${COMPILER_LIBCXX} Analitza AnalitzaGui AnalitzaPlot
-WANTLIB += KF5CoreAddons KF5I18n Qt5Core Qt5Gui Qt5Network Qt5Qml
-WANTLIB += Qt5Quick Qt5Xml c curses ereadline form m
+WANTLIB += AnalitzaWidgets KF5Auth KF5AuthCore KF5Codecs KF5ConfigCore
+WANTLIB += KF5ConfigGui KF5ConfigWidgets KF5CoreAddons KF5I18n
+WANTLIB += KF5KIOCore KF5Service KF5WidgetsAddons KF5XmlGui Qt5Concurrent
+WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Positioning Qt5PrintSupport
+WANTLIB += Qt5Qml Qt5Quick Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
+WANTLIB += Qt5Widgets Qt5Xml c curses ereadline form m
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -33,7 +37,8 @@ RUN_DEPENDS = misc/shared-mime-info \
LIB_DEPENDS = devel/readline \
devel/kf5/ki18n \
devel/kf5/kcoreaddons \
- x11/kde-applications/analitza
+ x11/kde-applications/analitza \
+ x11/qt5/qtwebengine
CONFIGURE_ARGS += -DREADLINE_INCLUDE_DIR=${LOCALBASE}/include/ereadline \
-DREADLINE_LIBRARY=ereadline \
diff --git a/x11/kde-applications/kalgebra/pkg/PLIST
b/x11/kde-applications/kalgebra/pkg/PLIST
index 867be562b1b..af58ead1561 100644
--- a/x11/kde-applications/kalgebra/pkg/PLIST
+++ b/x11/kde-applications/kalgebra/pkg/PLIST
@@ -2,7 +2,9 @@
@conflict kde-l10n-*
@pkgpath x11/kde4/kalgebra
@bin bin/calgebra
+@bin bin/kalgebra
@bin bin/kalgebramobile
+share/applications/org.kde.kalgebra.desktop
share/applications/org.kde.kalgebramobile.desktop
share/doc/HTML/ca/kalgebra/
share/doc/HTML/ca/kalgebra/commands.docbook
@@ -93,6 +95,10 @@ share/kalgebramobile/plugins/widgets/KAlgebraMobile.qml
share/kalgebramobile/plugins/widgets/KAlgebraPage.qml
share/kalgebramobile/plugins/widgets/RealInput.qml
share/kalgebramobile/plugins/widgets/qmldir
+share/katepart5/
+share/katepart5/syntax/
+share/katepart5/syntax/kalgebra.xml
+share/kservices5/graphsplasmoid.desktop
share/locale/ar/LC_MESSAGES/kalgebra.mo
share/locale/bg/LC_MESSAGES/kalgebra.mo
share/locale/bg/LC_MESSAGES/plasma_applet_kalgebraplasmoid.mo
@@ -208,6 +214,15 @@ share/locale/zh_TW/LC_MESSAGES/kalgebra.mo
share/locale/zh_TW/LC_MESSAGES/kalgebramobile.mo
share/locale/zh_TW/LC_MESSAGES/plasma_applet_kalgebraplasmoid.mo
share/metainfo/
+share/metainfo/org.kde.kalgebra.appdata.xml
share/metainfo/org.kde.kalgebramobile.appdata.xml
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
+share/plasma/
+share/plasma/plasmoids/
+share/plasma/plasmoids/org.kde.graphsplasmoid/
+share/plasma/plasmoids/org.kde.graphsplasmoid/contents/
+share/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/
+share/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/config.ui
+share/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/main.qml
+share/plasma/plasmoids/org.kde.graphsplasmoid/metadata.desktop
diff --git a/x11/kde-applications/marble/Makefile
b/x11/kde-applications/marble/Makefile
index 033e24d38b9..ee1008b1aef 100644
--- a/x11/kde-applications/marble/Makefile
+++ b/x11/kde-applications/marble/Makefile
@@ -4,12 +4,13 @@ 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 \
diff --git a/x11/kde-applications/marble/pkg/PLIST
b/x11/kde-applications/marble/pkg/PLIST
index ac7aafc16db..87621589af7 100644
--- a/x11/kde-applications/marble/pkg/PLIST
+++ b/x11/kde-applications/marble/pkg/PLIST
@@ -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/
diff --git a/x11/qt5/Makefile b/x11/qt5/Makefile
index c5cc529ad81..14ad86aa199 100644
--- a/x11/qt5/Makefile
+++ b/x11/qt5/Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.62 2020/03/13 16:53:49 rsadowski Exp $
SUBDIR =
- #SUBDIR += docs (WIP)
+ SUBDIR += docs
SUBDIR += qt3d
SUBDIR += qtbase
SUBDIR += qtcharts
@@ -30,18 +30,16 @@
SUBDIR += qttranslations
SUBDIR += qtvirtualkeyboard
SUBDIR += qtwebchannel
+ SUBDIR += qtwebengine
+ SUBDIR += qtwebglplugin
SUBDIR += qtwebkit
SUBDIR += qtwebsockets
+ SUBDIR += qtwebview
SUBDIR += qtx11extras
SUBDIR += qtxmlpatterns
# no support for Wayland in Xenocara
# SUBDIR += qtwayland
-# not ported yet
-# SUBDIR += qtwebengine
-# SUBDIR += qtwebglplugin
-# requires qtwebengine
-# SUBDIR += qtwebview
# Windows only
# SUBDIR += qtactiveqt
diff --git a/x11/qt5/qt5.port.mk b/x11/qt5/qt5.port.mk
index 01c54cea1d6..2bf48dc6ae6 100644
--- a/x11/qt5/qt5.port.mk
+++ b/x11/qt5/qt5.port.mk
@@ -96,6 +96,8 @@ _MODQT5_CMAKE_PKGS = \
Qt5UiTools \
Qt5WebChannel \
Qt5WebKit \
+ Qt5WebEngine \
+ Qt5WebEngineWidgets \
Qt5WebKitWidgets \
Qt5WebSockets \
Qt5Widgets \
