commit: f987e4bacc310cca050f871a135de368e1bc8601
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Nov 4 14:31:30 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 23:58:28 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f987e4ba
net-libs/webkit-gtk: revbump, refresh patch from alpine
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-libs/webkit-gtk/Manifest | 2 +-
...8.1-musl.patch => webkit-gtk-2.22.2-musl.patch} | 70 ++++++++++++----------
...-gtk-2.20.4.ebuild => webkit-gtk-2.22.2.ebuild} | 13 ++--
3 files changed, 48 insertions(+), 37 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 263e59d..2351bf9 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1 @@
-DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B
e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275
SHA512
3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
+DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B
19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0
SHA512
0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
b/net-libs/webkit-gtk/files/webkit-gtk-2.22.2-musl.patch
similarity index 62%
rename from net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
rename to net-libs/webkit-gtk/files/webkit-gtk-2.22.2-musl.patch
index 8ce2d14..b5fd0bb 100644
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.22.2-musl.patch
@@ -1,54 +1,57 @@
+diff --git a/Source/JavaScriptCore/runtime/MachineContext.h
b/Source/JavaScriptCore/runtime/MachineContext.h
+index 836d755..4a0518a 100644
--- a/Source/JavaScriptCore/runtime/MachineContext.h
+++ b/Source/JavaScriptCore/runtime/MachineContext.h
-@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext)
+@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t&
machineContext)
#error Unknown Architecture
#endif
--#elif defined(__GLIBC__) || defined(__BIONIC__)
-+#elif defined(__linux__)
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
#if CPU(X86)
return reinterpret_cast<void*&>((uintptr_t&)
machineContext.gregs[REG_ESP]);
-@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext)
+@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t&
machineContext)
#error Unknown Architecture
#endif
--#elif defined(__GLIBC__) || defined(__BIONIC__)
-+#elif defined(__linux__)
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
-@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t&
machineContext)
+@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t&
machineContext)
#error Unknown Architecture
#endif
--#elif defined(__GLIBC__) || defined(__BIONIC__)
-+#elif defined(__linux__)
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
-@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t&
machineContext)
+@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t&
machineContext)
#error Unknown Architecture
#endif
--#elif defined(__GLIBC__) || defined(__BIONIC__)
-+#elif defined(__linux__)
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
-@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t&
machineContext)
+@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t&
machineContext)
#error Unknown Architecture
#endif
--#elif defined(__GLIBC__) || defined(__BIONIC__)
-+#elif defined(__linux__)
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
-
+diff --git a/Source/JavaScriptCore/runtime/Options.h
b/Source/JavaScriptCore/runtime/Options.h
+index 27396d2..23a7b9e 100644
--- a/Source/JavaScriptCore/runtime/Options.h
+++ b/Source/JavaScriptCore/runtime/Options.h
-@@ -126,9 +126,9 @@
+@@ -144,9 +144,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
\
v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
\
@@ -61,10 +64,11 @@
\
v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to
change the executable allocation size in ExecutableAllocatorFixedVMPool. (In
bytes.)") \
-
+diff --git
a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
+index c0f8b9c..1074cce 100644
--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
-@@ -836,7 +836,7 @@
+@@ -836,7 +836,7 @@ int yydebug;
#if YYERROR_VERBOSE
# ifndef yystrlen
@@ -73,7 +77,7 @@
# define yystrlen strlen
# else
/* Return the length of YYSTR. */
-@@ -852,7 +852,7 @@
+@@ -852,7 +852,7 @@ yystrlen (const char *yystr)
# endif
# ifndef yystpcpy
@@ -82,10 +86,11 @@
# define yystpcpy stpcpy
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-
+diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
+index 14cd536..6084d64 100644
--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
-@@ -1975,7 +1975,7 @@
+@@ -1975,7 +1975,7 @@ int yydebug;
#if YYERROR_VERBOSE
# ifndef yystrlen
@@ -94,7 +99,7 @@
# define yystrlen strlen
# else
/* Return the length of YYSTR. */
-@@ -1991,7 +1991,7 @@
+@@ -1991,7 +1991,7 @@ yystrlen (const char *yystr)
# endif
# ifndef yystpcpy
@@ -103,21 +108,24 @@
# define yystpcpy stpcpy
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 67cfa93..341a9f5 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
-@@ -679,7 +679,7 @@
+@@ -697,7 +697,7 @@
#define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
#endif
--#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__))
&& (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
-+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) ||
CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) ||
defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) ||
CPU(MIPS)))
++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) &&
(CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
#define HAVE_MACHINE_CONTEXT 1
#endif
-
+
+diff --git a/Source/WebCore/xml/XPathGrammar.cpp
b/Source/WebCore/xml/XPathGrammar.cpp
+index 31df1c0..bc569c1 100644
--- a/Source/WebCore/xml/XPathGrammar.cpp
+++ b/Source/WebCore/xml/XPathGrammar.cpp
-@@ -967,7 +967,7 @@
+@@ -966,7 +966,7 @@ int yydebug;
#if YYERROR_VERBOSE
# ifndef yystrlen
@@ -126,7 +134,7 @@
# define yystrlen strlen
# else
/* Return the length of YYSTR. */
-@@ -990,7 +990,7 @@
+@@ -989,7 +989,7 @@ yystrlen (yystr)
# endif
# ifndef yystpcpy
@@ -134,4 +142,4 @@
+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
# define yystpcpy stpcpy
# else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
similarity index 94%
rename from net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
index 01d4acd..cd4405d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -39,6 +39,7 @@ RESTRICT="test"
# Dependencies found at Source/cmake/OptionsGTK.cmake
# Various compile-time optionals for gtk+-3.22.0 - ensure it
# Missing OpenWebRTC checks and conditionals, but
ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# TODO: Raise gst-plugins-opus dep to 1.14.4-r1 once we can, and eventually
drop the blocker from epiphany; or remove the dep when older than
-opus-1.14.4-r1 is not available anymore
RDEPEND="
>=x11-libs/cairo-1.10.2:=[X?]
>=media-libs/fontconfig-2.8.0:1.0
@@ -67,8 +68,9 @@ RDEPEND="
nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
spell? ( >=app-text/enchant-0.22:= )
gstreamer? (
- >=media-libs/gstreamer-1.2.3:1.0
- >=media-libs/gst-plugins-base-1.2.3:1.0
+ >=media-libs/gstreamer-1.8.3:1.0
+ >=media-libs/gst-plugins-base-1.8.3:1.0
+ >=media-plugins/gst-plugins-opus-1.8.3:1.0
>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
X? (
@@ -96,10 +98,11 @@ DEPEND="${RDEPEND}
${RUBY_DEPS}
>=app-accessibility/at-spi2-core-2.5.3
>=dev-lang/perl-5.10
+ dev-util/glib-utils
>=dev-util/gtk-doc-am-1.10
>=dev-util/gperf-3.0.1
>=sys-devel/bison-2.4.3
- || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+ || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
sys-devel/gettext
virtual/pkgconfig
@@ -148,7 +151,7 @@ pkg_setup() {
src_prepare() {
# musl and jit
- eapply "${FILESDIR}"/${PN}-2.18.1-musl.patch
+ eapply "${FILESDIR}"/${PN}-2.22.2-musl.patch
cmake-utils_src_prepare
gnome2_src_prepare
}
