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

Update to webkit-2.4.5.

Browse Source 
ok landry@
This commit is contained in:
ajacoutot 2014-08-26 21:31:03 +00:00
parent 2b7d13c579
commit 5a2ff42e86
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/webkit/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.121 2014/07/14 21:13:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.122 2014/08/26 21:31:03 ajacoutot Exp $
COMMENT = open source web browser engine for Gtk+
V = 2.4.4
V = 2.4.5
DISTNAME = webkitgtk-${V}
PKGNAME = webkit-${V}
EPOCH = 1
@ -79,7 +79,7 @@ WANTLIB = ICE SM X11 Xcomposite Xcursor Xdamage Xext \
EGL X11-xcb Xau Xdmcp glapi xcb-dri2 xcb-glx xcb-shape xcb-xfixes \
expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 jpeg m harfbuzz-icu \
Xxf86vm dbus-1 dbus-glib-1 drm geoclue \
Xxf86vm dbus-1 dbus-glib-1 drm geoclue gbm \
gstaudio-1.0 gstfft-1.0 gdk_pixbuf-2.0 orc-0.4 \
gstreamer-1.0 gstbase-1.0 gstvideo-1.0 gstapp-1.0 gstpbutils-1.0 \
icudata icui18n icuuc sqlite3 xslt enchant soup-2.4 \
@ -123,7 +123,7 @@ WANTLIB += atk-bridge-2.0 atspi
WEBKIT_API_VERSION = 3.0
GTK_API_VERSION = 3.0
SHARED_LIBS += webkit2gtk-${WEBKIT_API_VERSION} 1.0 # 34.0
SHARED_LIBS += webkit2gtk-${WEBKIT_API_VERSION} 1.0 # 35.8
.else
# only works with gtk+3
CONFIGURE_ARGS+= --disable-webkit2
@ -131,8 +131,8 @@ WEBKIT_API_VERSION = 1.0
GTK_API_VERSION = 2.0
.endif
SHARED_LIBS += javascriptcoregtk-${WEBKIT_API_VERSION} 5.0 # 16.4
SHARED_LIBS += webkitgtk-${WEBKIT_API_VERSION} 7.0 # 22.2
SHARED_LIBS += javascriptcoregtk-${WEBKIT_API_VERSION} 5.0 # 16.3
SHARED_LIBS += webkitgtk-${WEBKIT_API_VERSION} 7.0 # 22.11
pre-configure:
${SUBST_CMD} ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp ${WRKSRC}/configure

4
www/webkit/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (webkitgtk-2.4.4.tar.xz) = WMv8fjUq4eH144P592Z5V5TYhIPppSN3opX1bu31Ork=
SIZE (webkitgtk-2.4.4.tar.xz) = 9844048
SHA256 (webkitgtk-2.4.5.tar.xz) = iNBid6rhecIFtUjhhRpeVmPKb1n1qo6Br5uHcy1rihM=
SIZE (webkitgtk-2.4.5.tar.xz) = 9842948

24
www/webkit/patches/patch-Source_WTF_wtf_Platform_h
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.4 2014/03/25 06:25:45 landry Exp $
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.5 2014/08/26 21:31:03 ajacoutot Exp $
Add defines for sparc64/mips64.
Disable yarr jit on anything not having a jit
@ -22,8 +22,8 @@ last chunk needed to build on ppc/sparc64, otherwise yarr jit and
assembler is enabled (because of llint cloop) but there's no asm
for those
--- Source/WTF/wtf/Platform.h.orig Mon Mar 3 09:11:49 2014
+++ Source/WTF/wtf/Platform.h Sat Mar 8 22:59:04 2014
--- Source/WTF/wtf/Platform.h.orig Mon Aug 25 14:50:32 2014
+++ Source/WTF/wtf/Platform.h Tue Aug 26 13:55:22 2014
@@ -71,6 +71,12 @@
#define WTF_CPU_BIG_ENDIAN 1
#endif
@ -54,7 +54,7 @@ for those
#if defined(__MIPSEB__)
#define WTF_CPU_BIG_ENDIAN 1
#endif
@@ -313,7 +324,7 @@
@@ -327,7 +338,7 @@
#endif /* ARM */
@ -63,16 +63,18 @@ for those
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
@@ -641,6 +652,8 @@
|| CPU(ALPHA) \
@@ -656,7 +667,9 @@
|| CPU(ARM64) \
|| CPU(S390X) \
|| CPU(PPC64) \
- || CPU(PPC64LE)
+ || CPU(PPC64LE) \
+ || CPU(SPARC64) \
+ || CPU(MIPS64) \
|| CPU(PPC64)
+ || CPU(MIPS64)
#define WTF_USE_JSVALUE64 1
#else
@@ -708,7 +721,7 @@
#define WTF_USE_JSVALUE32_64 1
@@ -723,7 +736,7 @@
low-level interpreter. */
#if !defined(ENABLE_LLINT) \
&& ENABLE(JIT) \
@ -81,7 +83,7 @@ for those
&& (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) \
&& (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
#define ENABLE_LLINT 1
@@ -716,7 +729,7 @@
@@ -731,7 +744,7 @@
#if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) && !COMPILER(MSVC)
/* Enable the DFG JIT on X86 and X86_64. Only tested on Mac, GNU/Linux and FreeBSD. */
@ -90,7 +92,7 @@ for those
#define ENABLE_DFG_JIT 1
#endif
/* Enable the DFG JIT on ARMv7. Only tested on iOS and Qt/GTK+ Linux. */
@@ -807,7 +820,7 @@
@@ -822,7 +835,7 @@
#define ENABLE_REGEXP_TRACING 0
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */

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

@ -1,12 +1,11 @@
$OpenBSD: patch-Source_WTF_wtf_dtoa_utils_h,v 1.3 2014/03/25 06:25:45 landry Exp $
--- Source/WTF/wtf/dtoa/utils.h.orig Tue Jan 21 15:06:51 2014
+++ Source/WTF/wtf/dtoa/utils.h Fri Feb 14 22:54:18 2014
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
$OpenBSD: patch-Source_WTF_wtf_dtoa_utils_h,v 1.4 2014/08/26 21:31:03 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__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(MIPS64) || CPU(SPARC64)
#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(MIPS64) || CPU(SPARC64)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)