Minor update to webkit-2.4.1.
This commit is contained in:
ajacoutot
parent
5f8a382271
commit
3bd02d9c7c
@ -1,15 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.116 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.117 2014/04/20 16:40:55 ajacoutot Exp $
|
||||
|
||||
COMMENT = open source web browser engine for Gtk+
|
||||
|
||||
V = 2.4.0
|
||||
V = 2.4.1
|
||||
DISTNAME = webkitgtk-${V}
|
||||
PKGNAME = webkit-${V}
|
||||
EPOCH = 1
|
||||
CATEGORIES = www
|
||||
DPB_PROPERTIES =parallel
|
||||
EXTRACT_SUFX = .tar.xz
|
||||
REVISION = 0
|
||||
|
||||
HOMEPAGE = http://webkitgtk.org/
|
||||
MASTER_SITES = ${HOMEPAGE}/releases/
|
||||
@ -140,10 +139,11 @@ pre-configure:
|
||||
echo ${WEBKIT_API_VERSION} > ${WRKSRC}/Documentation/webkitdomgtk/version.xml
|
||||
echo ${WEBKIT_API_VERSION} > ${WRKSRC}/Documentation/webkitgtk/version.xml
|
||||
|
||||
.if ${FLAVOR:Mgtk3}
|
||||
post-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/Programs/.libs/GtkLauncher ${PREFIX}/bin/GtkLauncher
|
||||
.if ${FLAVOR:Mgtk3}
|
||||
mv ${PREFIX}/bin/GtkLauncher ${PREFIX}/bin/GtkLauncher-3
|
||||
cp ${WRKSRC}/Programs/.libs/MiniBrowser ${PREFIX}/bin/MiniBrowser
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/Programs/.libs/MiniBrowser ${PREFIX}/bin/MiniBrowser
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (webkitgtk-2.4.0.tar.xz) = 3FJ3zaie4DhAj3jJSxsH8QGZfwHvh3oUL/7aw7U337s=
|
||||
SIZE (webkitgtk-2.4.0.tar.xz) = 9828272
|
||||
SHA256 (webkitgtk-2.4.1.tar.xz) = bu1dQezc+6/jwvuw8LebnNqHpeoOfQk4r7bGyCmW4vc=
|
||||
SIZE (webkitgtk-2.4.1.tar.xz) = 9836352
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
$OpenBSD: patch-GNUmakefile_in,v 1.33 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
$OpenBSD: patch-GNUmakefile_in,v 1.34 2014/04/20 16:40:55 ajacoutot Exp $
|
||||
|
||||
- chunk 1->4 : remove silent build lines
|
||||
- chunk 5 : install GtkLauncher
|
||||
- chunk 6 : append extra -O0 cflags for sparc64 which otherwise result in overoptimization
|
||||
- chunk 5 : 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)
|
||||
- chunk 7->10 : fix variable quoting to properly install doc in a versionned dir
|
||||
- chunk 6->9 : fix variable quoting to properly install doc in a versionned dir
|
||||
|
||||
--- GNUmakefile.in.orig Mon Mar 24 12:03:00 2014
|
||||
+++ GNUmakefile.in Fri Apr 11 15:11:07 2014
|
||||
@@ -12428,11 +12428,11 @@ am__v_P_0 = false
|
||||
--- GNUmakefile.in.orig Mon Apr 14 14:25:06 2014
|
||||
+++ GNUmakefile.in Sun Apr 20 11:11:51 2014
|
||||
@@ -12426,11 +12426,11 @@ am__v_P_0 = false
|
||||
am__v_P_1 = :
|
||||
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||
@ -23,7 +22,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.33 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
am__v_at_1 =
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@
|
||||
depcomp = $(SHELL) $(top_srcdir)/Source/autotools/depcomp
|
||||
@@ -12442,7 +12442,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
|
||||
@@ -12440,7 +12440,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
AM_V_CC = $(am__v_CC_@AM_V@)
|
||||
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
|
||||
@ -32,7 +31,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.33 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
am__v_CC_1 =
|
||||
CCLD = $(CC)
|
||||
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
@@ -12450,13 +12450,13 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
|
||||
@@ -12448,13 +12448,13 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
|
||||
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
|
||||
@ -48,7 +47,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.33 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
am__v_CXX_1 =
|
||||
CXXLD = $(CXX)
|
||||
CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
||||
@@ -12464,7 +12464,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOL
|
||||
@@ -12462,7 +12462,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOL
|
||||
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
|
||||
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
|
||||
@ -57,16 +56,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.33 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
am__v_CXXLD_1 =
|
||||
SOURCES = $(Libraries_WebExtensions_libWebExtensionTest_la_SOURCES) \
|
||||
$(Libraries_WebExtensions_libWebProcessTest_la_SOURCES) \
|
||||
@@ -13001,7 +13001,7 @@ libwebkitgtkincludedir := $(prefix)/include/webkitgtk-
|
||||
INSPECTOR_SCRIPTS_DIR := $(JavaScriptCore)/inspector/scripts
|
||||
|
||||
# Libraries and support components
|
||||
-bin_PROGRAMS := Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT)
|
||||
+bin_PROGRAMS := Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT) Programs/GtkLauncher$(EXEEXT)
|
||||
noinst_DATA := DerivedSources/webkitdom/webkitdom.symbols \
|
||||
$(am__append_33) $(am__append_94)
|
||||
noinst_HEADERS :=
|
||||
@@ -72792,7 +72792,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
|
||||
@@ -72778,7 +72778,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
|
||||
@ -75,7 +65,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.33 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
@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@
|
||||
@@ -82383,8 +82383,8 @@ install-data-local:
|
||||
@@ -82369,8 +82369,8 @@ install-data-local:
|
||||
@ENABLE_WEBKIT1_TRUE@ then echo 1>&2 'No documentation to install' ; \
|
||||
@ENABLE_WEBKIT1_TRUE@ else \
|
||||
@ENABLE_WEBKIT1_TRUE@ DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
|
||||
@ -86,7 +76,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.33 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
@ENABLE_WEBKIT1_TRUE@ else \
|
||||
@ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk"; \
|
||||
@ENABLE_WEBKIT1_TRUE@ fi; \
|
||||
@@ -82393,9 +82393,9 @@ install-data-local:
|
||||
@@ -82379,9 +82379,9 @@ install-data-local:
|
||||
@ENABLE_WEBKIT1_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \
|
||||
@ENABLE_WEBKIT1_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \
|
||||
@ENABLE_WEBKIT1_TRUE@ done; \
|
||||
@ -98,7 +88,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.33 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
@ENABLE_WEBKIT1_TRUE@ fi; \
|
||||
@ENABLE_WEBKIT1_TRUE@ fi
|
||||
@ENABLE_WEBKIT2_TRUE@ @installfiles=`echo ./Documentation/webkit2gtk/html/*`; \
|
||||
@@ -82423,8 +82423,8 @@ install-data-local:
|
||||
@@ -82409,8 +82409,8 @@ install-data-local:
|
||||
then echo 1>&2 'No documentation to install' ; \
|
||||
else \
|
||||
DOC_MODULE_VERSION=`cat ./Documentation/webkitdomgtk/version.xml`; \
|
||||
@ -109,7 +99,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.33 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
else \
|
||||
installdir="$(DESTDIR)$(HTML_DIR)/webkitdomgtk"; \
|
||||
fi; \
|
||||
@@ -82433,9 +82433,9 @@ install-data-local:
|
||||
@@ -82419,9 +82419,9 @@ install-data-local:
|
||||
echo ' $(INSTALL_DATA) '$$i ; \
|
||||
$(INSTALL_DATA) $$i $${installdir}; \
|
||||
done; \
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
$OpenBSD: patch-Source_WebKit2_Platform_unix_SharedMemoryUnix_cpp,v 1.1 2014/04/11 18:27:45 ajacoutot Exp $
|
||||
|
||||
http://trac.webkit.org/changeset/167128
|
||||
|
||||
--- Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp.orig Mon Mar 24 11:05:16 2014
|
||||
+++ Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp Fri Apr 11 15:11:21 2014
|
||||
@@ -174,24 +174,13 @@ SharedMemory::~SharedMemory()
|
||||
closeWithRetry(m_fileDescriptor);
|
||||
}
|
||||
|
||||
-static inline int accessModeFile(SharedMemory::Protection protection)
|
||||
+bool SharedMemory::createHandle(Handle& handle, Protection)
|
||||
{
|
||||
- switch (protection) {
|
||||
- case SharedMemory::ReadOnly:
|
||||
- return O_RDONLY;
|
||||
- case SharedMemory::ReadWrite:
|
||||
- return O_RDWR;
|
||||
- }
|
||||
-
|
||||
- ASSERT_NOT_REACHED();
|
||||
- return O_RDWR;
|
||||
-}
|
||||
-
|
||||
-bool SharedMemory::createHandle(Handle& handle, Protection protection)
|
||||
-{
|
||||
ASSERT_ARG(handle, !handle.m_size);
|
||||
ASSERT_ARG(handle, handle.isNull());
|
||||
|
||||
+ // FIXME: Handle the case where the passed Protection is ReadOnly.
|
||||
+
|
||||
int duplicatedHandle;
|
||||
while ((duplicatedHandle = dup(m_fileDescriptor)) == -1) {
|
||||
if (errno != EINTR) {
|
||||
@@ -200,7 +189,7 @@ bool SharedMemory::createHandle(Handle& handle, Protec
|
||||
}
|
||||
}
|
||||
|
||||
- while (fcntl(duplicatedHandle, F_SETFD, FD_CLOEXEC) == -1 || fcntl(duplicatedHandle, F_SETFL, accessModeFile(protection)) == -1) {
|
||||
+ while (fcntl(duplicatedHandle, F_SETFD, FD_CLOEXEC) == -1) {
|
||||
if (errno != EINTR) {
|
||||
ASSERT_NOT_REACHED();
|
||||
closeWithRetry(duplicatedHandle);
|
||||
Loading…
Reference in New Issue
Block a user