cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to webkitgtk4-2.8.0.

Browse Source
This commit is contained in:
ajacoutot 2015-03-27 18:38:45 +00:00
parent 182667ba14
commit e3e7f1c162
19 changed files with 122 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/webkitgtk4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2015/03/27 16:03:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.15 2015/03/27 18:38:45 ajacoutot Exp $
BROKEN-alpha = error: Compiler GCC >= 4.7 or Clang >= 3.3 is required for C compilation
BROKEN-hppa = error: Compiler GCC >= 4.7 or Clang >= 3.3 is required for C compilation
@ -9,17 +9,16 @@ SHARED_ONLY = Yes
COMMENT = GTK+ port of the WebKit rendering engine
V = 2.6.5
V = 2.8.0
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk4-${V}
EXTRACT_SUFX = .tar.xz
API = 4.0
SUBST_VARS = API
DPB_PROPERTIES = parallel
REVISION = 0
SHARED_LIBS += javascriptcoregtk-${API} 0.0 # 18.0
SHARED_LIBS += webkit2gtk-${API} 0.0 # 37.2
SHARED_LIBS += javascriptcoregtk-${API} 1.0 # 18.0
SHARED_LIBS += webkit2gtk-${API} 1.0 # 37.2
CATEGORIES = www
@ -34,10 +33,10 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += EGL GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender Xt atk-1.0 c cairo cairo-gobject
WANTLIB += enchant fontconfig freetype gdk-3 gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gstapp-1.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnutls gobject-2.0 gstapp-1.0
WANTLIB += gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstpbutils-1.0
WANTLIB += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 gtk-3 gtk-x11-2.0
WANTLIB += harfbuzz harfbuzz-icu icui18n icuuc jpeg m pango-1.0
WANTLIB += harfbuzz harfbuzz-icu icui18n icuuc jpeg m notify pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 png pthread secret-1 soup-2.4
WANTLIB += sqlite3 webp xml2 xslt z
@ -71,6 +70,7 @@ BUILD_DEPENDS = devel/bison \
RUN_DEPENDS = geo/geoclue2
LIB_DEPENDS = devel/harfbuzz,-icu \
devel/libnotify \
devel/libsoup \
graphics/libwebp \
multimedia/gstreamer1/plugins-base \
@ -109,6 +109,6 @@ post-extract:
ln -sf ${RUBY} ${WRKDIR}/bin/ruby
pre-configure:
${SUBST_CMD} ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
${SUBST_CMD} ${WRKSRC}/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
.include <bsd.port.mk>

4
www/webkitgtk4/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (webkitgtk-2.6.5.tar.xz) = sWWAF86nzFRbngHyKvWFmG4h5CQoJeIVvF+ODA3GdZM=
SIZE (webkitgtk-2.6.5.tar.xz) = 10000124
SHA256 (webkitgtk-2.8.0.tar.xz) = BfrSOfXwNbCjYou3vBU22Rb3cvyf+V3iLjzsGvKsaBU=
SIZE (webkitgtk-2.8.0.tar.xz) = 10431576

10
www/webkitgtk4/patches/patch-CMakeLists_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2014/10/07 07:31:41 ajacoutot Exp $
--- CMakeLists.txt.orig Wed Sep 17 14:31:08 2014
+++ CMakeLists.txt Thu Oct 2 14:52:15 2014
@@ -93,7 +93,7 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
$OpenBSD: patch-CMakeLists_txt,v 1.3 2015/03/27 18:38:45 ajacoutot Exp $
--- CMakeLists.txt.orig Mon Mar 23 09:08:04 2015
+++ CMakeLists.txt Fri Mar 27 10:17:17 2015
@@ -90,7 +90,7 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
set(WTF_CPU_X86_64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
set(WTF_CPU_X86 1)
@ -10,7 +10,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 2014/10/07 07:31:41 ajacoutot Exp $
set(WTF_CPU_PPC 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
set(WTF_CPU_PPC64 1)
@@ -103,6 +103,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390
@@ -100,6 +100,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390
set(WTF_CPU_S390 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
set(WTF_CPU_S390X 1)

8
www/webkitgtk4/patches/patch-Source_JavaScriptCore_CMakeLists_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_JavaScriptCore_CMakeLists_txt,v 1.1 2014/10/07 07:31:41 ajacoutot Exp $
--- Source/JavaScriptCore/CMakeLists.txt.orig Thu Oct 2 15:09:28 2014
+++ Source/JavaScriptCore/CMakeLists.txt Thu Oct 2 15:09:45 2014
@@ -1061,6 +1061,7 @@ elseif (WTF_CPU_PPC64)
$OpenBSD: patch-Source_JavaScriptCore_CMakeLists_txt,v 1.2 2015/03/27 18:38:45 ajacoutot Exp $
--- Source/JavaScriptCore/CMakeLists.txt.orig Mon Mar 23 09:08:04 2015
+++ Source/JavaScriptCore/CMakeLists.txt Fri Mar 27 10:17:17 2015
@@ -1151,6 +1151,7 @@ elseif (WTF_CPU_PPC64)
elseif (WTF_CPU_PPC64LE)
elseif (WTF_CPU_S390)
elseif (WTF_CPU_S390X)

8
www/webkitgtk4/patches/patch-Source_JavaScriptCore_dfg_DFGNode_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_JavaScriptCore_dfg_DFGNode_h,v 1.1.1.1 2014/09/30 08:25:27 ajacoutot Exp $
--- Source/JavaScriptCore/dfg/DFGNode.h.orig Wed Sep 24 14:55:05 2014
+++ Source/JavaScriptCore/dfg/DFGNode.h Sun Sep 28 10:08:58 2014
@@ -182,7 +182,7 @@ struct OpInfo {
$OpenBSD: patch-Source_JavaScriptCore_dfg_DFGNode_h,v 1.2 2015/03/27 18:38:45 ajacoutot Exp $
--- Source/JavaScriptCore/dfg/DFGNode.h.orig Mon Mar 23 09:08:04 2015
+++ Source/JavaScriptCore/dfg/DFGNode.h Fri Mar 27 10:17:17 2015
@@ -190,7 +190,7 @@ struct OpInfo {
OpInfo() : m_value(0) { }
explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { }
explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { }

8
www/webkitgtk4/patches/patch-Source_JavaScriptCore_heap_CopiedBlock_h
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Source_JavaScriptCore_heap_CopiedBlock_h,v 1.1.1.1 2014/09/30 08:25:28 ajacoutot Exp $
$OpenBSD: patch-Source_JavaScriptCore_heap_CopiedBlock_h,v 1.2 2015/03/27 18:38:45 ajacoutot Exp $
Fix alignment issue (from Fedora).
--- Source/JavaScriptCore/heap/CopiedBlock.h.orig Tue Aug 26 09:37:13 2014
+++ Source/JavaScriptCore/heap/CopiedBlock.h Mon Sep 29 10:41:42 2014
@@ -81,7 +81,7 @@ class CopiedBlock : public HeapBlock<CopiedBlock> { (p
--- Source/JavaScriptCore/heap/CopiedBlock.h.orig Mon Mar 23 09:08:04 2015
+++ Source/JavaScriptCore/heap/CopiedBlock.h Fri Mar 27 10:17:17 2015
@@ -79,7 +79,7 @@ class CopiedBlock : public HeapBlock<CopiedBlock> { (p
size_t size();
size_t capacity();

8
www/webkitgtk4/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_h,v 1.1.1.1 2014/09/30 08:25:27 ajacoutot Exp $
$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_h,v 1.2 2015/03/27 18:38:45 ajacoutot Exp $
https://bugs.webkit.org/show_bug.cgi?id=61137
--- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig Tue Aug 26 09:37:13 2014
+++ Source/JavaScriptCore/jit/ExecutableAllocator.h Sun Sep 28 10:08:58 2014
@@ -89,7 +89,8 @@ class DemandExecutableAllocator;
--- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig Wed Mar 4 15:25:16 2015
+++ Source/JavaScriptCore/jit/ExecutableAllocator.h Fri Mar 27 10:17:17 2015
@@ -83,7 +83,8 @@ class DemandExecutableAllocator;
#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)
#if CPU(ARM) || CPU(ARM64)
static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;

8
www/webkitgtk4/patches/patch-Source_WTF_wtf_MathExtras_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Source_WTF_wtf_MathExtras_h,v 1.1.1.1 2014/09/30 08:25:27 ajacoutot Exp $
$OpenBSD: patch-Source_WTF_wtf_MathExtras_h,v 1.2 2015/03/27 18:38:45 ajacoutot Exp $
signbit & isfinite are defined in gcc's cmath for 4.6 & 4.8..
so partly revert https://bugs.webkit.org/show_bug.cgi?id=19975, make it conditional to older gcc
https://bugs.webkit.org/show_bug.cgi?id=129927
--- Source/WTF/wtf/MathExtras.h.orig Tue Jan 21 15:06:51 2014
+++ Source/WTF/wtf/MathExtras.h Fri Feb 14 20:41:39 2014
@@ -94,7 +94,8 @@ inline bool isinf(double x) { return !finite(x) && !is
--- Source/WTF/wtf/MathExtras.h.orig Mon Mar 23 09:08:04 2015
+++ Source/WTF/wtf/MathExtras.h Fri Mar 27 10:17:17 2015
@@ -102,7 +102,8 @@ inline bool isinf(double x) { return !finite(x) && !is
#endif

26
www/webkitgtk4/patches/patch-Source_WTF_wtf_Platform_h
View File

@ -1,11 +1,10 @@
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.3 2014/11/13 08:33:06 ajacoutot Exp $
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.4 2015/03/27 18:38:45 ajacoutot Exp $
https://bugs.webkit.org/show_bug.cgi?id=129839
https://bugs.webkit.org/show_bug.cgi?id=129963
--- Source/WTF/wtf/Platform.h.orig Tue Nov 11 14:07:54 2014
+++ Source/WTF/wtf/Platform.h Wed Nov 12 18:43:31 2014
@@ -150,6 +150,12 @@
--- Source/WTF/wtf/Platform.h.orig Mon Mar 23 09:08:04 2015
+++ Source/WTF/wtf/Platform.h Fri Mar 27 10:17:17 2015
@@ -153,6 +153,12 @@
#define WTF_CPU_BIG_ENDIAN 1
#endif
@ -18,7 +17,7 @@ https://bugs.webkit.org/show_bug.cgi?id=129963
/* CPU(X86) - i386 / x86 32-bit */
#if defined(__i386__) \
|| defined(i386) \
@@ -333,7 +339,7 @@
@@ -340,7 +346,7 @@
#endif /* ARM */
@ -27,9 +26,9 @@ https://bugs.webkit.org/show_bug.cgi?id=129963
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
@@ -645,7 +651,8 @@
|| CPU(ARM64) \
@@ -653,7 +659,8 @@
|| CPU(S390X) \
|| CPU(MIPS64) \
|| CPU(PPC64) \
- || CPU(PPC64LE)
+ || CPU(PPC64LE) \
@ -37,7 +36,7 @@ https://bugs.webkit.org/show_bug.cgi?id=129963
#define WTF_USE_JSVALUE64 1
#else
#define WTF_USE_JSVALUE32_64 1
@@ -713,7 +720,7 @@
@@ -720,7 +727,7 @@
#if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
/* Enable the DFG JIT on X86 and X86_64. */
@ -46,12 +45,3 @@ https://bugs.webkit.org/show_bug.cgi?id=129963
#define ENABLE_DFG_JIT 1
#endif
/* Enable the DFG JIT on ARMv7. Only tested on iOS and Qt/GTK+ Linux. */
@@ -816,7 +823,7 @@
#define ENABLE_REGEXP_TRACING 0
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
-#if !defined(ENABLE_YARR_JIT)
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT)
#define ENABLE_YARR_JIT 1
/* Setting this flag compares JIT results with interpreter results. */

42
www/webkitgtk4/patches/patch-Source_WTF_wtf_Stopwatch_h Normal file
View File

@ -0,0 +1,42 @@
$OpenBSD: patch-Source_WTF_wtf_Stopwatch_h,v 1.1 2015/03/27 18:38:45 ajacoutot Exp $
XXX push upstream; including <cmath> #undef isnan and provides std::isnan().
Stopwatch.h:47:58: error: 'isnan' was not declared in this scope
--- Source/WTF/wtf/Stopwatch.h.orig Fri Mar 27 19:21:04 2015
+++ Source/WTF/wtf/Stopwatch.h Fri Mar 27 19:21:25 2015
@@ -44,7 +44,7 @@ class Stopwatch : public RefCounted<Stopwatch> { (publ
double elapsedTime();
- bool isActive() const { return !isnan(m_lastStartTime); }
+ bool isActive() const { return !std::isnan(m_lastStartTime); }
private:
Stopwatch() { reset(); }
@@ -60,14 +60,14 @@ inline void Stopwatch::reset()
inline void Stopwatch::start()
{
- ASSERT_WITH_MESSAGE(isnan(m_lastStartTime), "Tried to start the stopwatch, but it is already running.");
+ ASSERT_WITH_MESSAGE(std::isnan(m_lastStartTime), "Tried to start the stopwatch, but it is already running.");
m_lastStartTime = monotonicallyIncreasingTime();
}
inline void Stopwatch::stop()
{
- ASSERT_WITH_MESSAGE(!isnan(m_lastStartTime), "Tried to stop the stopwatch, but it is not running.");
+ ASSERT_WITH_MESSAGE(!std::isnan(m_lastStartTime), "Tried to stop the stopwatch, but it is not running.");
m_elapsedTime += monotonicallyIncreasingTime() - m_lastStartTime;
m_lastStartTime = NAN;
@@ -75,7 +75,7 @@ inline void Stopwatch::stop()
inline double Stopwatch::elapsedTime()
{
- bool shouldSuspend = !isnan(m_lastStartTime);
+ bool shouldSuspend = !std::isnan(m_lastStartTime);
if (shouldSuspend)
stop();

13
www/webkitgtk4/patches/patch-Source_WTF_wtf_dtoa_utils_h
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-Source_WTF_wtf_dtoa_utils_h,v 1.2 2014/10/07 07:31:41 ajacoutot Exp $
--- Source/WTF/wtf/dtoa/utils.h.orig Mon Aug 25 13:27:53 2014
+++ Source/WTF/wtf/dtoa/utils.h Tue Aug 26 13:54:25 2014
@@ -50,6 +50,7 @@ defined(__ARMEL__) || \
$OpenBSD: patch-Source_WTF_wtf_dtoa_utils_h,v 1.3 2015/03/27 18:38:45 ajacoutot Exp $
--- Source/WTF/wtf/dtoa/utils.h.orig Wed Mar 4 15:25:16 2015
+++ Source/WTF/wtf/dtoa/utils.h Fri Mar 27 10:18:18 2015
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(SPARC64)
-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(SPARC64)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)

15
www/webkitgtk4/patches/patch-Source_WTF_wtf_gobject_GMutexLocker_h
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-Source_WTF_wtf_gobject_GMutexLocker_h,v 1.1 2015/03/27 16:03:07 ajacoutot Exp $
https://trac.webkit.org/changeset/179866
--- Source/WTF/wtf/gobject/GMutexLocker.h.orig Wed Jan 7 14:16:08 2015
+++ Source/WTF/wtf/gobject/GMutexLocker.h Thu Mar 26 13:23:55 2015
@@ -97,8 +97,6 @@ class GMutexLocker { (private)
} // namespace WTF
-using WTF::GMutexLocker;
-
#endif // USE(GLIB)
#endif // GMutexLocker_h

42
www/webkitgtk4/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase_cpp
View File

@ -1,42 +0,0 @@
$OpenBSD: patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase_cpp,v 1.1 2015/03/27 16:03:07 ajacoutot Exp $
https://trac.webkit.org/changeset/179866
--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig Thu Jan 15 10:40:35 2015
+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp Thu Mar 26 13:23:43 2015
@@ -137,7 +137,7 @@ IntSize MediaPlayerPrivateGStreamerBase::naturalSize()
if (!m_videoSize.isEmpty())
return m_videoSize;
- GMutexLocker<GMutex> lock(m_sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (!m_sample)
return IntSize();
@@ -279,7 +279,7 @@ void MediaPlayerPrivateGStreamerBase::muteChanged()
#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
{
- GMutexLocker<GMutex> lock(m_sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (!m_sample)
return nullptr;
@@ -330,7 +330,7 @@ void MediaPlayerPrivateGStreamerBase::triggerRepaint(G
g_return_if_fail(GST_IS_SAMPLE(sample));
{
- GMutexLocker<GMutex> lock(m_sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (m_sample)
gst_sample_unref(m_sample);
m_sample = gst_sample_ref(sample);
@@ -364,7 +364,7 @@ void MediaPlayerPrivateGStreamerBase::paint(GraphicsCo
if (!m_player->visible())
return;
- GMutexLocker<GMutex> lock(m_sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (!m_sample)
return;

51
www/webkitgtk4/patches/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer_cpp
View File

@ -1,51 +0,0 @@
$OpenBSD: patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer_cpp,v 1.1 2015/03/27 16:03:07 ajacoutot Exp $
https://trac.webkit.org/changeset/179866
--- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig Wed Jan 14 15:36:54 2015
+++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp Thu Mar 26 13:23:33 2015
@@ -117,7 +117,7 @@ static void webkitVideoSinkTimeoutCallback(WebKitVideo
{
WebKitVideoSinkPrivate* priv = sink->priv;
- GMutexLocker<GMutex> lock(priv->sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
GstSample* sample = priv->sample;
priv->sample = 0;
@@ -136,7 +136,7 @@ static GstFlowReturn webkitVideoSinkRender(GstBaseSink
WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
WebKitVideoSinkPrivate* priv = sink->priv;
- GMutexLocker<GMutex> lock(priv->sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
if (priv->unlocked)
return GST_FLOW_OK;
@@ -234,7 +234,7 @@ static void webkitVideoSinkFinalize(GObject* object)
static void unlockSampleMutex(WebKitVideoSinkPrivate* priv)
{
- GMutexLocker<GMutex> lock(priv->sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
if (priv->sample) {
gst_sample_unref(priv->sample);
@@ -260,7 +260,7 @@ static gboolean webkitVideoSinkUnlockStop(GstBaseSink*
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
{
- GMutexLocker<GMutex> lock(priv->sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
priv->unlocked = false;
}
@@ -285,7 +285,7 @@ static gboolean webkitVideoSinkStart(GstBaseSink* base
{
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
- GMutexLocker<GMutex> lock(priv->sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
priv->unlocked = false;
return TRUE;
}

186
www/webkitgtk4/patches/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer_cpp
View File

@ -1,186 +0,0 @@
$OpenBSD: patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer_cpp,v 1.1 2015/03/27 16:03:07 ajacoutot Exp $
https://trac.webkit.org/changeset/179866
--- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig Thu Jan 15 10:40:35 2015
+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp Thu Mar 26 13:23:37 2015
@@ -353,7 +353,7 @@ static void webKitWebSrcGetProperty(GObject* object, g
WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
WebKitWebSrcPrivate* priv = src->priv;
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
switch (propID) {
case PROP_IRADIO_NAME:
g_value_set_string(value, priv->iradioName);
@@ -393,7 +393,7 @@ static void webKitWebSrcStop(WebKitWebSrc* src)
ASSERT(isMainThread());
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
bool seeking = priv->seekSource.isActive();
@@ -449,7 +449,7 @@ static void webKitWebSrcStart(WebKitWebSrc* src)
ASSERT(isMainThread());
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->pendingStart = FALSE;
priv->corsAccessCheck = CORSNoCheck;
@@ -542,7 +542,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(Gs
return ret;
}
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_DEBUG_OBJECT(src, "READY->PAUSED");
@@ -579,7 +579,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pa
gst_query_parse_duration(query, &format, NULL);
GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
gst_query_set_duration(query, format, src->priv->size);
result = TRUE;
@@ -587,7 +587,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pa
break;
}
case GST_QUERY_URI: {
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
gst_query_set_uri(query, src->priv->uri);
result = TRUE;
break;
@@ -637,7 +637,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handle
WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
gchar* ret;
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
ret = g_strdup(src->priv->uri);
return ret;
}
@@ -652,7 +652,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* hand
return FALSE;
}
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
g_free(priv->uri);
priv->uri = 0;
@@ -688,7 +688,7 @@ static void webKitWebSrcNeedDataMainCb(WebKitWebSrc* s
ASSERT(isMainThread());
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->paused = FALSE;
locker.unlock();
@@ -703,7 +703,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint l
GST_DEBUG_OBJECT(src, "Need more data: %u", length);
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (priv->needDataSource.isScheduled() || !priv->paused)
return;
@@ -718,7 +718,7 @@ static void webKitWebSrcEnoughDataMainCb(WebKitWebSrc*
ASSERT(isMainThread());
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->paused = TRUE;
locker.unlock();
@@ -733,7 +733,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpoin
GST_DEBUG_OBJECT(src, "Have enough data");
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (priv->enoughDataSource.isScheduled() || priv->paused)
return;
@@ -756,7 +756,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, gui
WebKitWebSrcPrivate* priv = src->priv;
GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (offset == priv->offset && priv->requestedOffset == priv->offset)
return TRUE;
@@ -775,7 +775,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, gui
void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
{
ASSERT(player);
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
src->priv->player = player;
}
@@ -805,7 +805,7 @@ char* StreamingClient::createReadBuffer(size_t request
mapGstBuffer(buffer);
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->buffer = adoptGRef(buffer);
locker.unlock();
@@ -831,7 +831,7 @@ void StreamingClient::handleResponseReceived(const Res
return;
}
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->corsAccessCheck = corsAccessCheck;
@@ -930,7 +930,7 @@ void StreamingClient::handleDataReceived(const char* d
WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
WebKitWebSrcPrivate* priv = src->priv;
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
@@ -999,7 +999,7 @@ void StreamingClient::handleNotifyFinished()
GST_DEBUG_OBJECT(src, "Have EOS");
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (!priv->seekSource.isActive()) {
locker.unlock();
gst_app_src_end_of_stream(priv->appsrc);
@@ -1158,7 +1158,7 @@ void ResourceHandleStreamingClient::wasBlocked(Resourc
GST_ERROR_OBJECT(src, "Request was blocked");
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
uri.reset(g_strdup(src->priv->uri));
locker.unlock();
@@ -1172,7 +1172,7 @@ void ResourceHandleStreamingClient::cannotShowURL(Reso
GST_ERROR_OBJECT(src, "Cannot show URL");
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
uri.reset(g_strdup(src->priv->uri));
locker.unlock();

12
www/webkitgtk4/patches/patch-Source_WebCore_plugins_PluginDatabase_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Source_WebCore_plugins_PluginDatabase_cpp,v 1.1.1.1 2014/09/30 08:25:28 ajacoutot Exp $
--- Source/WebCore/plugins/PluginDatabase.cpp.orig Tue Jan 21 15:06:51 2014
+++ Source/WebCore/plugins/PluginDatabase.cpp Fri Feb 14 20:41:39 2014
@@ -395,7 +395,7 @@ Vector<String> PluginDatabase::defaultPluginDirectorie
paths.append(userPluginPath);
paths.append("/usr/lib/browser/plugins");
- paths.append("/usr/local/lib/mozilla/plugins");
+ paths.append("${LOCALBASE}/lib/mozilla/plugins");
paths.append("/usr/lib/firefox/plugins");
paths.append("/usr/lib64/browser-plugins");
paths.append("/usr/lib/browser-plugins");

12
www/webkitgtk4/patches/patch-Source_WebKit2_UIProcess_Plugins_unix_PluginInfoStoreUnix_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Source_WebKit2_UIProcess_Plugins_unix_PluginInfoStoreUnix_cpp,v 1.1 2015/03/27 18:38:45 ajacoutot Exp $
--- Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp.orig Fri Mar 27 10:20:01 2015
+++ Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp Fri Mar 27 10:20:34 2015
@@ -49,7 +49,7 @@ Vector<String> PluginInfoStore::pluginsDirectories()
result.append(homeDirectoryPath() + "/.mozilla/plugins");
result.append(homeDirectoryPath() + "/.netscape/plugins");
result.append("/usr/lib/browser/plugins");
- result.append("/usr/local/lib/mozilla/plugins");
+ result.append("${LOCALBASE}/lib/mozilla/plugins");
result.append("/usr/lib/firefox/plugins");
result.append("/usr/lib64/browser-plugins");
result.append("/usr/lib/browser-plugins");

8
www/webkitgtk4/patches/patch-Source_cmake_OptionsCommon_cmake
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.1.1.1 2014/09/30 08:25:27 ajacoutot Exp $
$OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.2 2015/03/27 18:38:45 ajacoutot Exp $
Undefined references to libc functions.
--- Source/cmake/OptionsCommon.cmake.orig Sun Sep 28 12:19:37 2014
+++ Source/cmake/OptionsCommon.cmake Sun Sep 28 12:20:11 2014
@@ -54,9 +54,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND "${L
--- Source/cmake/OptionsCommon.cmake.orig Wed Mar 4 15:25:17 2015
+++ Source/cmake/OptionsCommon.cmake Fri Mar 27 10:17:27 2015
@@ -95,9 +95,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND "${L
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-Wl,--no-keep-memory ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")
endif ()

15
www/webkitgtk4/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2014/09/30 08:25:28 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2015/03/27 18:38:45 ajacoutot Exp $
@bin bin/jsc
include/webkitgtk-${API}/
include/webkitgtk-${API}/JavaScriptCore/
@ -13,6 +13,7 @@ include/webkitgtk-${API}/webkit2/
include/webkitgtk-${API}/webkit2/WebKitAuthenticationRequest.h
include/webkitgtk-${API}/webkit2/WebKitBackForwardList.h
include/webkitgtk-${API}/webkit2/WebKitBackForwardListItem.h
include/webkitgtk-${API}/webkit2/WebKitColorChooserRequest.h
include/webkitgtk-${API}/webkit2/WebKitContextMenu.h
include/webkitgtk-${API}/webkit2/WebKitContextMenuActions.h
include/webkitgtk-${API}/webkit2/WebKitContextMenuItem.h
@ -35,6 +36,8 @@ include/webkitgtk-${API}/webkit2/WebKitJavascriptResult.h
include/webkitgtk-${API}/webkit2/WebKitMimeInfo.h
include/webkitgtk-${API}/webkit2/WebKitNavigationAction.h
include/webkitgtk-${API}/webkit2/WebKitNavigationPolicyDecision.h
include/webkitgtk-${API}/webkit2/WebKitNotification.h
include/webkitgtk-${API}/webkit2/WebKitNotificationPermissionRequest.h
include/webkitgtk-${API}/webkit2/WebKitPermissionRequest.h
include/webkitgtk-${API}/webkit2/WebKitPlugin.h
include/webkitgtk-${API}/webkit2/WebKitPolicyDecision.h
@ -49,9 +52,11 @@ include/webkitgtk-${API}/webkit2/WebKitURIResponse.h
include/webkitgtk-${API}/webkit2/WebKitURISchemeRequest.h
include/webkitgtk-${API}/webkit2/WebKitUserContent.h
include/webkitgtk-${API}/webkit2/WebKitUserContentManager.h
include/webkitgtk-${API}/webkit2/WebKitUserMediaPermissionRequest.h
include/webkitgtk-${API}/webkit2/WebKitVersion.h
include/webkitgtk-${API}/webkit2/WebKitWebContext.h
include/webkitgtk-${API}/webkit2/WebKitWebExtension.h
include/webkitgtk-${API}/webkit2/WebKitWebHitTestResult.h
include/webkitgtk-${API}/webkit2/WebKitWebInspector.h
include/webkitgtk-${API}/webkit2/WebKitWebPage.h
include/webkitgtk-${API}/webkit2/WebKitWebResource.h
@ -80,6 +85,7 @@ include/webkitgtk-${API}/webkitdom/WebKitDOMCharacterData.h
include/webkitgtk-${API}/webkitdom/WebKitDOMCharacterDataUnstable.h
include/webkitgtk-${API}/webkitdom/WebKitDOMComment.h
include/webkitgtk-${API}/webkitdom/WebKitDOMCustom.h
include/webkitgtk-${API}/webkitdom/WebKitDOMCustomUnstable.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDOMApplicationCache.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDOMImplementation.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDOMMimeType.h
@ -99,6 +105,7 @@ include/webkitgtk-${API}/webkitdom/WebKitDOMDOMWindowSpeechSynthesis.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDOMWindowUnstable.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDataCue.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDatabase.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDeprecated.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDocument.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDocumentFragment.h
include/webkitgtk-${API}/webkitdom/WebKitDOMDocumentFragmentUnstable.h
@ -162,6 +169,7 @@ include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLLabelElement.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLLabelElementUnstable.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLLegendElement.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLLinkElement.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLLinkElementUnstable.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLMapElement.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLMarqueeElement.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLMarqueeElementUnstable.h
@ -176,6 +184,7 @@ include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLObjectElementUnstable.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLOptGroupElement.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLOptionElement.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLOptionsCollection.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLOptionsCollectionUnstable.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLParagraphElement.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLParamElement.h
include/webkitgtk-${API}/webkitdom/WebKitDOMHTMLPreElement.h
@ -213,6 +222,7 @@ include/webkitgtk-${API}/webkitdom/WebKitDOMNode.h
include/webkitgtk-${API}/webkitdom/WebKitDOMNodeFilter.h
include/webkitgtk-${API}/webkitdom/WebKitDOMNodeIterator.h
include/webkitgtk-${API}/webkitdom/WebKitDOMNodeList.h
include/webkitgtk-${API}/webkitdom/WebKitDOMNodeUnstable.h
include/webkitgtk-${API}/webkitdom/WebKitDOMObject.h
include/webkitgtk-${API}/webkitdom/WebKitDOMPerformance.h
include/webkitgtk-${API}/webkitdom/WebKitDOMPerformanceEntry.h
@ -244,12 +254,15 @@ include/webkitgtk-${API}/webkitdom/WebKitDOMTrackEvent.h
include/webkitgtk-${API}/webkitdom/WebKitDOMTreeWalker.h
include/webkitgtk-${API}/webkitdom/WebKitDOMUIEvent.h
include/webkitgtk-${API}/webkitdom/WebKitDOMUIEventUnstable.h
include/webkitgtk-${API}/webkitdom/WebKitDOMUserMessageHandler.h
include/webkitgtk-${API}/webkitdom/WebKitDOMUserMessageHandlersNamespace.h
include/webkitgtk-${API}/webkitdom/WebKitDOMVTTCue.h
include/webkitgtk-${API}/webkitdom/WebKitDOMValidityState.h
include/webkitgtk-${API}/webkitdom/WebKitDOMVideoPlaybackQuality.h
include/webkitgtk-${API}/webkitdom/WebKitDOMVideoTrack.h
include/webkitgtk-${API}/webkitdom/WebKitDOMVideoTrackList.h
include/webkitgtk-${API}/webkitdom/WebKitDOMWebKitNamedFlow.h
include/webkitgtk-${API}/webkitdom/WebKitDOMWebKitNamespace.h
include/webkitgtk-${API}/webkitdom/WebKitDOMWebKitPoint.h
include/webkitgtk-${API}/webkitdom/WebKitDOMWheelEvent.h
include/webkitgtk-${API}/webkitdom/WebKitDOMWheelEventUnstable.h