Hi,

With devel/spidermonkey78 being the default one [0] and requiring rust,
Qt5 won't be built anymore on !rust archs.

I explicitly asked Rafael to not move Otter to QtWebEngine back when it
was introduced, but it makes not much sense now.

The below diff moves Otter to QtWebEngine and has been tested
successfully on amd64.

Comments/feedback are welcome,

Charlène.


[0] https://marc.info/?l=openbsd-ports-cvs&m=160293957508901&w=2


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/otter-browser/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile    9 Oct 2020 19:11:34 -0000       1.33
+++ Makefile    17 Oct 2020 13:41:04 -0000
@@ -3,7 +3,7 @@
 COMMENT =      browser aiming to recreate classic Opera (12.x) UI using Qt5
 
 DISTNAME =     otter-browser-1.0.01
-REVISION =     1
+REVISION =     2
 
 CATEGORIES =   www
 
@@ -17,10 +17,11 @@ EXTRACT_SUFX =      .tar.bz2
 # GPLv3+
 PERMIT_PACKAGE =       Yes
 
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
-WANTLIB += Qt5Network Qt5PrintSupport Qt5Qml Qt5Svg Qt5WebKit
-WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5XmlPatterns c hunspell-1.7
-WANTLIB += m
+WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Multimedia Qt5Network Qt5Positioning
+WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5Svg Qt5WebChannel
+WANTLIB += Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets Qt5XmlPatterns
+WANTLIB += c hunspell-1.7 m
 
 MODULES =      devel/cmake x11/qt5
 
@@ -30,12 +31,11 @@ LIB_DEPENDS =       textproc/hunspell \
                x11/qt5/qtdeclarative \
                x11/qt5/qtmultimedia \
                x11/qt5/qtsvg \
-               x11/qt5/qtwebkit>=5.212.0 \
+               x11/qt5/qtwebengine \
                x11/qt5/qtxmlpatterns
 
-# Otter is the only browser really working on macppc.
-CONFIGURE_ARGS +=      -DENABLE_QTWEBENGINE=OFF \
-                       -DENABLE_QTWEBKIT=ON
+CONFIGURE_ARGS +=      -DENABLE_QTWEBENGINE=ON \
+                       -DENABLE_QTWEBKIT=OFF
 
 NO_TEST =      Yes
 

Reply via email to