So Landry tells me he might have a use case for this optional lib.
I had removed it from the wxWidgets3 update to make things easier to
review but since things are mostly settled now, why not. Since
webkitgtk4 only a builds on a few archs right now, use the hopefully
proper bsd.port.arch.mk/BUILD_PACKAGES magic.
No idea if the subpackage is usable right now as I have no port to test
it. devel/p5-Alien-wxWidgets can detect it* just like the -media
subpackage/lib, but I'm not sure the existing RUN_DEPENDS is warranted
anyway. Also the only user of p5-Alien-wxWidgets is p5-Wx, still marked
as BROKEN.
Reviews/oks welcome.
* (cd /tmp && perl -MAlien::wxWidgets -E 'say Alien::wxWidgets->libraries();')
| tr ' ' '\n'
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile 21 Jan 2019 18:55:07 -0000 1.64
+++ Makefile 22 Feb 2019 14:25:54 -0000
@@ -1,13 +1,20 @@
# $OpenBSD: Makefile,v 1.64 2019/01/21 18:55:07 jca Exp $
+# www/webkitgtk4
+ONLY_FOR_ARCHS-webview = i386 amd64
+
COMMENT-main = C++ cross-platform GUI toolkit
COMMENT-media = wxMediaCtrl class for wxWidgets
+COMMENT-webview = wxWebView class for wxWidgets
V = 3.0.4
DISTNAME = wxWidgets-${V}
PKGNAME-main = wxWidgets-gtk3-${V}
PKGNAME-media = wxWidgets-media-${V}
-REVISION = 1
+PKGNAME-webview = wxWidgets-webview-${V}
+
+REVISION-main = 1
+REVISION-media = 1
CATEGORIES = x11
MASTER_SITES = https://github.com/wxWidgets/wxWidgets/releases/download/v$V/
@@ -28,6 +35,7 @@ SHARED_LIBS += wx_gtk3u_qa-3.0
SHARED_LIBS += wx_gtk3u_ribbon-3.0 0.0 # 0.0
SHARED_LIBS += wx_gtk3u_richtext-3.0 0.0 # 0.0
SHARED_LIBS += wx_gtk3u_stc-3.0 0.0 # 0.0
+SHARED_LIBS += wx_gtk3u_webview-3.0 0.0 # 0.0
SHARED_LIBS += wx_gtk3u_xrc-3.0 0.0 # 0.0
HOMEPAGE = https://www.wxwidgets.org/
@@ -36,7 +44,12 @@ HOMEPAGE = https://www.wxwidgets.org/
# http://www.wxwidgets.org/about/licence/
PERMIT_PACKAGE_CDROM = Yes
-MULTI_PACKAGES = -main -media
+MULTI_PACKAGES = -main -media -webview
+
+PSEUDO_FLAVORS = no_webview
+FLAVOR ?=
+
+.include <bsd.port.arch.mk>
COMPILER = base-clang ports-gcc base-gcc
@@ -68,6 +81,16 @@ WANTLIB-media += gstreamer-1.0 gstvideo-
WANTLIB-media += intl jpeg m notify pango-1.0 pangocairo-1.0 png16 tiff
WANTLIB-media += wx_baseu-3.0 wx_gtk3u_core-3.0 z
+LIB_DEPENDS-webview = ${LIB_DEPENDS} \
+ ${BASE_PKGPATH},-main>=${V} \
+ www/webkitgtk4
+
+WANTLIB-webview += ${COMPILER_LIBCXX} SM X11 Xxf86vm atk-1.0 cairo
cairo-gobject
+WANTLIB-webview += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
gthread-2.0
+WANTLIB-webview += gtk-3 iconv intl javascriptcoregtk-4.0 jpeg m notify
+WANTLIB-webview += pango-1.0 pangocairo-1.0 png16 soup-2.4 tiff webkit2gtk-4.0
+WANTLIB-webview += wx_baseu-3.0 wx_gtk3u_core-3.0 z
+
MAKE_FLAGS = SO_VERSION="${LIBwx_baseu-3.0_VERSION}"
USE_GMAKE = Yes
@@ -81,8 +104,12 @@ CONFIGURE_ARGS =--disable-backtrace \
--with-gtk=3 \
--with-libmspack \
--with-opengl \
- --with-sdl \
- --disable-webviewwebkit
+ --with-sdl
+
+.if !${BUILD_PACKAGES:M-webview}
+CONFIGURE_ARGS += --disable-webviewwebkit
+.endif
+
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
WXCONFIG_CPPFLAGS="-I${X11BASE}/include" \
Index: pkg/DESCR-webview
===================================================================
RCS file: pkg/DESCR-webview
diff -N pkg/DESCR-webview
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-webview 22 Feb 2019 14:25:54 -0000
@@ -0,0 +1,2 @@
+The wxWebView library is a set of classes for viewing complex web
+documents and for internet browsing.
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 2 Jan 2019 12:41:48 -0000 1.6
+++ pkg/PLIST-main 22 Feb 2019 14:25:54 -0000
@@ -756,6 +756,7 @@ include/wx-3.0/wx/zstream.h
@lib lib/libwx_gtk3u_stc-3.0.so.${LIBwx_gtk3u_stc-3.0_VERSION}
@lib lib/libwx_gtk3u_xrc-3.0.so.${LIBwx_gtk3u_xrc-3.0_VERSION}
lib/wx/
+lib/wx/3.0/
lib/wx/config/
lib/wx/config/gtk3-unicode-3.0
lib/wx/include/
Index: pkg/PLIST-webview
===================================================================
RCS file: pkg/PLIST-webview
diff -N pkg/PLIST-webview
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-webview 22 Feb 2019 14:25:54 -0000
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-webview,v$
+@lib lib/libwx_gtk3u_webview-3.0.so.${LIBwx_gtk3u_webview-3.0_VERSION}
+lib/wx/3.0/web-extensions/
+lib/wx/3.0/web-extensions/webkit2_extu-3.0.so
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
