Hi,
so webkit 2.0.0 comes with a new zomg-separate-process-per-tab API (more
info on http://trac.webkit.org/wiki/WebKit2, in fact so far i think it's only
all-the-tabs-rendering-in-a-single-process-separated-from-the-browser),
but we had it disabled so far because it relied on shm_open() - so that
means with have webkit 2.0.0, but without webkit2, got it ?
Now that we have shm_open(), we can start looking into that but :
- it relies on c++11 stuff so needs recent gcc/clang (hacks!)
- it relies on sync_fetch_and_add_8 so it needs hacks for 32 bits
(march=i586 works for i386, didnt try yet for ppc)
- it only works with the gtk3 FLAVOR
- it doesnt really work in the end, after talking to the midori
developer he doesnt consider the api stable. Hopefully better with
webkit 2.2.0 in 6 months ?
That said, here's a patch that builds & packages on i386 & amd64,
including a 'MiniBrowser' webkit2 test browser which doesnt really work.
And also a patch for midori trying to enable webkit2 in it, which doesnt
really work. I doubt epiphany will really work with webkit2 either.
Landry
? 1.10.0-failure
? crash-amd64
? webkit-1.10.0-libjavascriptcoregtk-1.0.so.2.0
? webkit-1.10.0-libwebkitgtk-1.0.so.4.0
? webkit-1.4.3-libwebkitgtk-1.0.so.0.1
? webkit-1.6.3-libjavascriptcoregtk-1.0.so.0.0
? webkit-1.6.3-libjavascriptcoregtk-1.0.so.1.0
? webkit-1.6.3-libjavascriptcoregtk-3.0.so.0.0
? webkit-1.6.3-libwebkitgtk-1.0.so.2.0
? webkit-1.6.3-libwebkitgtk-3.0.so.2.0
? webkit-1.8.0-libjavascriptcoregtk-1.0.so.0.0
? webkit-1.8.0-libjavascriptcoregtk-3.0.so.0.0
? webkit-1.8.0-libwebkitgtk-1.0.so.2.0
? webkit-1.8.0-libwebkitgtk-3.0.so.2.0
? webkit-1.8.1-libjavascriptcoregtk-1.0.so.2.0
? webkit-1.8.1-libwebkitgtk-1.0.so.3.0
? webkit-1.8.3-libjavascriptcoregtk-1.0.so.2.0
? webkit-1.8.3-libwebkitgtk-1.0.so.4.0
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.86
diff -u -r1.86 Makefile
--- Makefile 31 May 2013 20:07:33 -0000 1.86
+++ Makefile 3 Jun 2013 15:00:34 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.86 2013/05/31 20:07:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.85 2013/05/14 12:04:59 ajacoutot Exp $
ONLY_FOR_ARCHS= ${GCC4_ARCHS}
@@ -11,7 +11,6 @@
CATEGORIES = www
DPB_PROPERTIES =parallel
EXTRACT_SUFX= .tar.xz
-REVISION = 0
HOMEPAGE = http://webkitgtk.org/
MASTER_SITES = ${HOMEPAGE}/releases/
@@ -38,6 +37,7 @@
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng
-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11" \
+ PORTHOME=${WRKDIST} \
ac_cv_path_FLEX=${LOCALBASE}/bin/gflex \
ac_cv_path_RUBY=${RUBY}
@@ -112,7 +112,15 @@
.if ${FLAVOR:Mgtk3}
# needs shm_open()/shm_unlink()
-CONFIGURE_ARGS+= --disable-webkit2
+#CONFIGURE_ARGS+= --disable-webkit2
+MODULES += gcc4
+MODGCC4_ARCHS = amd64 i386 powerpc hppa alpha mips64 sparc64
mips64el
+MODGCC4_LANGS = c c++
+#XXX gross, but needed to have __sync_add_and_fetch_8 on 32-bits
+#what about ppc ? hppa ?
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+=-march=i686
+.endif
FULLPKGNAME = webkit-gtk3-${V}
LIB_DEPENDS += x11/gtk+3,-main
@@ -120,6 +128,7 @@
WANTLIB += atk-bridge-2.0 atspi
WEBKIT_API_VERSION = 3.0
GTK_API_VERSION = 3.0
+SHARED_LIBS += webkit2gtk-${WEBKIT_API_VERSION} 0.0 # 25.2
.else
# only works with gtk+3
CONFIGURE_ARGS+= --disable-webkit2
@@ -138,6 +147,7 @@
.if ${FLAVOR:Mgtk3}
post-install:
mv ${PREFIX}/bin/GtkLauncher ${PREFIX}/bin/GtkLauncher-3
+ cp ${WRKSRC}/Programs/.libs/MiniBrowser ${PREFIX}/bin/MiniBrowser
.endif
.include <bsd.port.mk>
Index: patches/patch-GNUmakefile_in
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-GNUmakefile_in,v
retrieving revision 1.20
diff -u -r1.20 patch-GNUmakefile_in
--- patches/patch-GNUmakefile_in 13 Apr 2013 09:11:02 -0000 1.20
+++ patches/patch-GNUmakefile_in 3 Jun 2013 15:00:34 -0000
@@ -8,8 +8,8 @@
- chunk 10 : append extra -O0 cflags for sparc64 which otherwise result in
overoptimization
by emitting a fdtox %r8, %r7 call, whose second operand isn't even and thus
invalid.
(on Source/JavaScriptCore/runtime/NumberPrototype.cpp)
---- GNUmakefile.in.orig Tue Mar 26 20:46:27 2013
-+++ GNUmakefile.in Sat Apr 13 10:01:58 2013
+--- GNUmakefile.in.orig Mon May 13 05:44:22 2013
++++ GNUmakefile.in Fri May 31 16:59:02 2013
@@ -1010,6 +1010,7 @@ libWTF_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__D
am__objects_2 = Source/WTF/wtf/libWTF_la-ArrayBuffer.lo \
Source/WTF/wtf/libWTF_la-ArrayBufferView.lo \
@@ -71,7 +71,39 @@
Source/WTF/wtf/BitArray.h Source/WTF/wtf/BitVector.cpp \
Source/WTF/wtf/BitVector.h Source/WTF/wtf/Bitmap.h \
Source/WTF/wtf/BlockStack.h Source/WTF/wtf/BloomFilter.h \
-@@ -23525,6 +23527,9 @@ Source/WTF/wtf/libWTF_la-ArrayBufferView.lo: \
+@@ -21904,7 +21906,6 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK
+
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS
= \
+ -fno-strict-aliasing \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+- -std=c++11 \
+ $(global_cppflags) \
+ -include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
+ -I$(srcdir)/Source/WebKit/gtk \
+@@ -22067,7 +22068,6 @@ Programs_WebKitWebProcess_CPPFLAGS = \
+ -I$(top_builddir)/DerivedSources/WebKit2 \
+ -I$(top_builddir)/DerivedSources/WebKit2/include \
+ -I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
+- -std=c++11 \
+ $(global_cppflags) \
+ $(javascriptcore_cppflags)
+
+@@ -22150,7 +22150,6 @@ libwebkit2gtkinjectedbundle_la_CPPFLAGS = \
+ -I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/c \
+ -I$(top_builddir)/DerivedSources/InjectedBundle \
+ -I$(top_builddir)/DerivedSources/WebKit2/include \
+- -std=c++11 \
+ $(global_cppflags) \
+ $(javascriptcore_cppflags) \
+ $(GLIB_CFLAGS)
+@@ -22184,7 +22183,6 @@ Programs_WebKitPluginProcess_CPPFLAGS = \
+ -DGTK_API_VERSION_2=1 \
+ -DENABLE_PLUGIN_PROCESS=1 \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
+- -std=c++11 \
+ $(global_cppflags) \
+ $(webcore_cppflags) \
+ $(webcoregtk_cppflags) \
+@@ -23525,6 +23523,9 @@ Source/WTF/wtf/libWTF_la-ArrayBufferView.lo: \
Source/WTF/wtf/libWTF_la-Assertions.lo: \
Source/WTF/wtf/$(am__dirstamp) \
Source/WTF/wtf/$(DEPDIR)/$(am__dirstamp)
@@ -81,7 +113,7 @@
Source/WTF/wtf/libWTF_la-BitVector.lo: Source/WTF/wtf/$(am__dirstamp) \
Source/WTF/wtf/$(DEPDIR)/$(am__dirstamp)
Source/WTF/wtf/libWTF_la-CryptographicallyRandomNumber.lo: \
-@@ -40117,6 +40122,8 @@ mostlyclean-compile:
+@@ -40117,6 +40118,8 @@ mostlyclean-compile:
-rm -f Source/WTF/wtf/libWTF_la-ArrayBufferView.lo
-rm -f Source/WTF/wtf/libWTF_la-Assertions.$(OBJEXT)
-rm -f Source/WTF/wtf/libWTF_la-Assertions.lo
@@ -90,7 +122,7 @@
-rm -f Source/WTF/wtf/libWTF_la-BitVector.$(OBJEXT)
-rm -f Source/WTF/wtf/libWTF_la-BitVector.lo
-rm -f Source/WTF/wtf/libWTF_la-CryptographicallyRandomNumber.$(OBJEXT)
-@@ -47240,6 +47247,7 @@ distclean-compile:
+@@ -47240,6 +47243,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@
@am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-ArrayBuffer.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-ArrayBufferView.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-Assertions.Plo@am__quote@
@@ -98,7 +130,7 @@
@AMDEP_TRUE@@am__include@
@am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-BitVector.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-CryptographicallyRandomNumber.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-CurrentTime.Plo@am__quote@
-@@ -51929,6 +51937,13 @@ Source/WTF/wtf/libWTF_la-Assertions.lo: Source/WTF/wtf
+@@ -51929,6 +51933,13 @@ Source/WTF/wtf/libWTF_la-Assertions.lo: Source/WTF/wtf
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt)
--tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libWTF_la_CPPFLAGS) $(CPPFLAGS)
$(libWTF_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WTF/wtf/libWTF_la-Assertions.lo
`test -f 'Source/WTF/wtf/Assertions.cpp' || echo
'$(srcdir)/'`Source/WTF/wtf/Assertions.cpp
@@ -112,7 +144,7 @@
Source/WTF/wtf/libWTF_la-BitVector.lo: Source/WTF/wtf/BitVector.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libWTF_la_CPPFLAGS) $(CPPFLAGS)
$(libWTF_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WTF/wtf/libWTF_la-BitVector.lo -MD
-MP -MF Source/WTF/wtf/$(DEPDIR)/libWTF_la-BitVector.Tpo -c -o
Source/WTF/wtf/libWTF_la-BitVector.lo `test -f 'Source/WTF/wtf/BitVector.cpp'
|| echo '$(srcdir)/'`Source/WTF/wtf/BitVector.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv)
Source/WTF/wtf/$(DEPDIR)/libWTF_la-BitVector.Tpo
Source/WTF/wtf/$(DEPDIR)/libWTF_la-BitVector.Plo
-@@ -75198,7 +75213,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
+@@ -75198,7 +75209,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt)
--tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES)
$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS)
$(CPPFLAGS)
$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS)
$(CXXFLAGS) -c -o
Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberObject.lo
`test -f 'Source/JavaScriptCore/runtime/NumberObject.cpp' || echo
'$(srcdir)/'`Source/JavaScriptCore/runtime/NumberObject.cpp
Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo:
Source/JavaScriptCore/runtime/NumberPrototype.cpp
@@ -121,7 +153,7 @@
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv)
Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Tpo
Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@
$(AM_V_CXX)source='Source/JavaScriptCore/runtime/NumberPrototype.cpp'
object='Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo'
libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@@ -82970,14 +82985,12 @@ installdirs:
+@@ -82970,14 +82981,12 @@ installdirs:
for dir in "$(DESTDIR)$(injectedbundledir)" "$(DESTDIR)$(libdir)"
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(audiodir)"
"$(DESTDIR)$(audiodir)" "$(DESTDIR)$(resourcesdir)"
"$(DESTDIR)$(webinspectordir)" "$(DESTDIR)$(webinspectorimagesdir)"
"$(DESTDIR)$(webinspectoruglifyjsdir)" "$(DESTDIR)$(webresourcesdir)"
"$(DESTDIR)$(girdir)" "$(DESTDIR)$(gir2dir)" "$(DESTDIR)$(pkgconfigdir)"
"$(DESTDIR)$(remoteinspectordir)" "$(DESTDIR)$(typelibsdir)"
"$(DESTDIR)$(typelibs2dir)"
"$(DESTDIR)$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)"
"$(DESTDIR)$(libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)"
"$(DESTDIR)$(libwebkit2gtkincludedir)"
"$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)"
"$(DESTDIR)$(libwebkit2gtkincludedir)" "$(DESTDIR)$(libwebkitdomincludedir)"
"$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)";
do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
@@ -138,7 +170,7 @@
installcheck: installcheck-am
install-strip:
-@@ -84250,7 +84263,7 @@ install-data-local:
+@@ -84250,7 +84259,7 @@ install-data-local:
@ENABLE_WEBKIT1_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \
@ENABLE_WEBKIT1_TRUE@
installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk-$(DOC_MODULE_VERSION)"; \
@ENABLE_WEBKIT1_TRUE@ else \
@@ -147,7 +179,7 @@
@ENABLE_WEBKIT1_TRUE@ fi; \
@ENABLE_WEBKIT1_TRUE@ $(mkinstalldirs) $${installdir} ; \
@ENABLE_WEBKIT1_TRUE@ for i in $$installfiles; do \
-@@ -84282,7 +84295,7 @@ install-data-local:
+@@ -84282,7 +84291,7 @@ install-data-local:
@ENABLE_WEBKIT2_TRUE@
$${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
@ENABLE_WEBKIT2_TRUE@ fi; \
@ENABLE_WEBKIT2_TRUE@ fi
Index: patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp
===================================================================
RCS file:
patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp
diff -N
patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebKit2_PluginProcess_unix_PluginProcessMainUnix_cpp
3 Jun 2013 15:00:34 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp.orig Sat Jun
1 09:07:32 2013
++++ Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp Sat Jun
1 09:08:02 2013
+@@ -41,7 +41,10 @@
+ #elif PLATFORM(EFL) && HAVE_ECORE_X
+ #include <Ecore_X.h>
+ #endif
+-
++/* for basename() */
++#if OS(OPENBSD)
++#include <libgen.h>
++#endif
+ using namespace WebCore;
+
+ namespace WebKit {
Index:
patches/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp
===================================================================
RCS file:
patches/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp
diff -N
patches/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebKit2_UIProcess_Launcher_gtk_ProcessLauncherGtk_cpp
3 Jun 2013 15:00:34 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp.orig Sat Jun
1 08:26:37 2013
++++ Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp Sat Jun
1 08:27:14 2013
+@@ -45,7 +45,10 @@
+ #include <sys/prctl.h>
+ #include <sys/socket.h>
+ #endif
+-
++/* for WEXITSTATUS / WIFEXIT */
++#if OS(OPENBSD)
++#include <sys/wait.h>
++#endif
+ #ifdef SOCK_SEQPACKET
+ #define SOCKET_TYPE SOCK_SEQPACKET
+ #else
Index:
patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp
===================================================================
RCS file:
patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp
diff -N
patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginProcessProxyUnix_cpp
3 Jun 2013 15:00:34 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp.orig
Sat Jun 1 08:36:36 2013
++++ Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp Sat Jun
1 08:45:10 2013
+@@ -38,6 +38,9 @@
+ #if PLATFORM(GTK) || PLATFORM(EFL)
+ #include <glib.h>
+ #endif
++#if OS(OPENBSD)
++#include <sys/wait.h>
++#endif
+
+ using namespace WebCore;
+
+@@ -72,16 +75,16 @@ bool PluginProcessProxy::scanPlugin(const String& plug
+ int status;
+ char* stdOut = 0;
+
+- // If the disposition of SIGCLD signal is set to SIG_IGN (default)
++ // If the disposition of SIGCHLD signal is set to SIG_IGN (default)
+ // then the signal will be ignored and g_spawn_sync() will not be
+ // able to return the status.
+ // As a consequence, we make sure that the disposition is set to
+ // SIG_DFL before calling g_spawn_sync().
+ struct sigaction action;
+- sigaction(SIGCLD, 0, &action);
++ sigaction(SIGCHLD, 0, &action);
+ if (action.sa_handler == SIG_IGN) {
+ action.sa_handler = SIG_DFL;
+- sigaction(SIGCLD, &action, 0);
++ sigaction(SIGCHLD, &action, 0);
+ }
+
+ if (!g_spawn_sync(0, argv, 0, G_SPAWN_STDERR_TO_DEV_NULL, 0, 0, &stdOut,
0, &status, 0))
Index:
patches/patch-Source_WebKit2_WebProcess_soup_WebKitSoupRequestInputStream_h
===================================================================
RCS file:
patches/patch-Source_WebKit2_WebProcess_soup_WebKitSoupRequestInputStream_h
diff -N
patches/patch-Source_WebKit2_WebProcess_soup_WebKitSoupRequestInputStream_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebKit2_WebProcess_soup_WebKitSoupRequestInputStream_h
3 Jun 2013 15:00:34 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+Fix build failure on amd64 ?
+--- Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.h.orig Sun Jun
2 21:34:20 2013
++++ Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.h Sun Jun
2 21:34:33 2013
+@@ -46,7 +46,7 @@ struct _WebKitSoupRequestInputStreamClass {
+ };
+
+ GType webkit_soup_request_input_stream_get_type();
+-GInputStream* webkitSoupRequestInputStreamNew(guint64 contentLength);
++GInputStream* webkitSoupRequestInputStreamNew(uint64_t contentLength);
+ void webkitSoupRequestInputStreamAddData(WebKitSoupRequestInputStream*, const
void* data, size_t dataLength);
+ bool webkitSoupRequestInputStreamFinished(WebKitSoupRequestInputStream*);
+
Index: patches/patch-Tools_MiniBrowser_gtk_main_c
===================================================================
RCS file: patches/patch-Tools_MiniBrowser_gtk_main_c
diff -N patches/patch-Tools_MiniBrowser_gtk_main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Tools_MiniBrowser_gtk_main_c 3 Jun 2013 15:00:34 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+Dont assume we're running from the src/objdir
+--- Tools/MiniBrowser/gtk/main.c.orig Mon Jun 3 00:05:54 2013
++++ Tools/MiniBrowser/gtk/main.c Mon Jun 3 00:06:02 2013
+@@ -223,11 +223,6 @@ int main(int argc, char *argv[])
+ }
+ g_option_context_free (context);
+
+-#ifdef WEBKIT_EXEC_PATH
+- g_setenv("WEBKIT_INSPECTOR_PATH", WEBKIT_EXEC_PATH "resources/inspector",
FALSE);
+-#endif /* WEBKIT_EXEC_PATH */
+- g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH,
FALSE);
+-
+ // Enable the favicon database, by specifying the default directory.
+
webkit_web_context_set_favicon_database_directory(webkit_web_context_get_default(),
NULL);
+
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-configure,v
retrieving revision 1.14
diff -u -r1.14 patch-configure
--- patches/patch-configure 31 May 2013 20:07:33 -0000 1.14
+++ patches/patch-configure 3 Jun 2013 15:00:34 -0000
@@ -196,6 +196,15 @@
fi
+@@ -20640,7 +20628,7 @@ $as_echo "$ac_cv_search_shm_open" >&6; }
+ ac_res=$ac_cv_search_shm_open
+ if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+- SHM_LIBS="-lrt"
++ SHM_LIBS=""
+ fi
+
+
@@ -21055,7 +21043,7 @@ fi
# Use C99 as the language standard for C code.
CFLAGS="$CFLAGS -std=c99"
Index: pkg/PFRAG.gtk3
===================================================================
RCS file: /cvs/ports/www/webkit/pkg/PFRAG.gtk3,v
retrieving revision 1.3
diff -u -r1.3 PFRAG.gtk3
--- pkg/PFRAG.gtk3 3 Apr 2012 15:39:35 -0000 1.3
+++ pkg/PFRAG.gtk3 3 Jun 2013 15:00:34 -0000
@@ -1,6 +1,63 @@
@comment $OpenBSD: PFRAG.gtk3,v 1.3 2012/04/03 15:39:35 landry Exp $
@bin bin/GtkLauncher-3
@bin bin/jsc-3
+lib/girepository-1.0/WebKit2-${WEBKIT_API_VERSION}.typelib
+lib/libwebkit2gtk-${WEBKIT_API_VERSION}.la
@lib
lib/libjavascriptcoregtk-${WEBKIT_API_VERSION}.so.${LIBjavascriptcoregtk-3.0_VERSION}
@lib lib/libwebkitgtk-${WEBKIT_API_VERSION}.so.${LIBwebkitgtk-3.0_VERSION}
+@lib lib/libwebkit2gtk-${WEBKIT_API_VERSION}.so.${LIBwebkit2gtk-3.0_VERSION}
lib/pkgconfig/webkitgtk-${WEBKIT_API_VERSION}.pc
+lib/pkgconfig/webkit2gtk-${WEBKIT_API_VERSION}.pc
+lib/webkit2gtk-${WEBKIT_API_VERSION}/
+lib/webkit2gtk-${WEBKIT_API_VERSION}/injected-bundle/
+lib/webkit2gtk-${WEBKIT_API_VERSION}/injected-bundle/libwebkit2gtkinjectedbundle.la
+lib/webkit2gtk-${WEBKIT_API_VERSION}/injected-bundle/libwebkit2gtkinjectedbundle.so
+@bin libexec/WebKitPluginProcess
+@bin libexec/WebKitWebProcess
+share/gir-1.0/WebKit2-${WEBKIT_API_VERSION}.gir
+share/gtk-doc/html/webkit2gtk/
+share/gtk-doc/html/webkit2gtk/WebKitBackForwardList.html
+share/gtk-doc/html/webkit2gtk/WebKitBackForwardListItem.html
+share/gtk-doc/html/webkit2gtk/WebKitContextMenu.html
+share/gtk-doc/html/webkit2gtk/WebKitContextMenuItem.html
+share/gtk-doc/html/webkit2gtk/WebKitCookieManager.html
+share/gtk-doc/html/webkit2gtk/WebKitDownload.html
+share/gtk-doc/html/webkit2gtk/WebKitFaviconDatabase.html
+share/gtk-doc/html/webkit2gtk/WebKitFileChooserRequest.html
+share/gtk-doc/html/webkit2gtk/WebKitFindController.html
+share/gtk-doc/html/webkit2gtk/WebKitFormSubmissionRequest.html
+share/gtk-doc/html/webkit2gtk/WebKitGeolocationPermissionRequest.html
+share/gtk-doc/html/webkit2gtk/WebKitHitTestResult.html
+share/gtk-doc/html/webkit2gtk/WebKitNavigationPolicyDecision.html
+share/gtk-doc/html/webkit2gtk/WebKitPermissionRequest.html
+share/gtk-doc/html/webkit2gtk/WebKitPlugin.html
+share/gtk-doc/html/webkit2gtk/WebKitPolicyDecision.html
+share/gtk-doc/html/webkit2gtk/WebKitPrintOperation.html
+share/gtk-doc/html/webkit2gtk/WebKitResponsePolicyDecision.html
+share/gtk-doc/html/webkit2gtk/WebKitSecurityManager.html
+share/gtk-doc/html/webkit2gtk/WebKitSettings.html
+share/gtk-doc/html/webkit2gtk/WebKitURIRequest.html
+share/gtk-doc/html/webkit2gtk/WebKitURIResponse.html
+share/gtk-doc/html/webkit2gtk/WebKitURISchemeRequest.html
+share/gtk-doc/html/webkit2gtk/WebKitWebContext.html
+share/gtk-doc/html/webkit2gtk/WebKitWebExtension.html
+share/gtk-doc/html/webkit2gtk/WebKitWebInspector.html
+share/gtk-doc/html/webkit2gtk/WebKitWebPage.html
+share/gtk-doc/html/webkit2gtk/WebKitWebResource.html
+share/gtk-doc/html/webkit2gtk/WebKitWebView.html
+share/gtk-doc/html/webkit2gtk/WebKitWebViewGroup.html
+share/gtk-doc/html/webkit2gtk/WebKitWindowProperties.html
+share/gtk-doc/html/webkit2gtk/annotation-glossary.html
+share/gtk-doc/html/webkit2gtk/ch01.html
+share/gtk-doc/html/webkit2gtk/ch02.html
+share/gtk-doc/html/webkit2gtk/home.png
+share/gtk-doc/html/webkit2gtk/index-all.html
+share/gtk-doc/html/webkit2gtk/index.html
+share/gtk-doc/html/webkit2gtk/index.sgml
+share/gtk-doc/html/webkit2gtk/left.png
+share/gtk-doc/html/webkit2gtk/right.png
+share/gtk-doc/html/webkit2gtk/style.css
+share/gtk-doc/html/webkit2gtk/up.png
+share/gtk-doc/html/webkit2gtk/webkit2gtk-WebKitError.html
+share/gtk-doc/html/webkit2gtk/webkit2gtk-WebKitVersion.html
+share/gtk-doc/html/webkit2gtk/webkit2gtk.devhelp2
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/midori/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile 29 May 2013 23:10:16 -0000 1.61
+++ Makefile 3 Jun 2013 15:30:44 -0000
@@ -23,7 +23,7 @@
CONFIGURE_ARGS = --disable-zeitgeist
.if ${FLAVOR:Mgtk3}
-CONFIGURE_ARGS += --enable-gtk3
+CONFIGURE_ARGS += --enable-gtk3 --enable-webkit2
LIB_DEPENDS = www/webkit,gtk3 \
x11/gnome/gcr \
devel/libunique3
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/midori/pkg/PLIST,v
retrieving revision 1.32
diff -u -r1.32 PLIST
--- pkg/PLIST 29 May 2013 23:10:16 -0000 1.32
+++ pkg/PLIST 3 Jun 2013 15:30:44 -0000
@@ -4,25 +4,16 @@
include/midori-0.5/extensions/
include/midori-0.5/extensions/apps.h
include/midori-0.5/extensions/delayed-load.h
-include/midori-0.5/extensions/external-download-manager.h
include/midori-0.5/extensions/history-list.h
-include/midori-0.5/extensions/nsplugin-manager.h
include/midori-0.5/extensions/transfers.h
lib/midori/
-lib/midori/libadblock.so
-lib/midori/libaddons.so
lib/midori/libapps.so
lib/midori/libcolorful-tabs.so
-lib/midori/libcookie-manager.so
-lib/midori/libcookie-permissions.so
-lib/midori/libcopy-tabs.so
+lib/midori/libco${MODPY_PY_PREFIX}tabs.so
lib/midori/libdelayed-load.so
-lib/midori/libexternal-download-manager.so
lib/midori/libfeed-panel.so
-lib/midori/libformhistory.so
lib/midori/libhistory-list.so
lib/midori/libmouse-gestures.so
-lib/midori/libnsplugin-manager.so
lib/midori/libshortcuts.so
lib/midori/libstatus-clock.so
lib/midori/libstatusbar-features.so
@@ -127,12 +118,8 @@
share/vala/vapi/apps.vapi
share/vala/vapi/delayed-load.deps
share/vala/vapi/delayed-load.vapi
-share/vala/vapi/external-download-manager.deps
-share/vala/vapi/external-download-manager.vapi
share/vala/vapi/history-list.deps
share/vala/vapi/history-list.vapi
-share/vala/vapi/nsplugin-manager.deps
-share/vala/vapi/nsplugin-manager.vapi
share/vala/vapi/transfers.deps
share/vala/vapi/transfers.vapi
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
