| 1 |
commit: 4edd7498d17a82aa77810f74d955a2bddddfed83 |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Sat Aug 18 06:28:09 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 18 09:51:20 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4edd7498 |
| 7 |
|
| 8 |
net-libs/webkit-gtk: sync with tree |
| 9 |
|
| 10 |
net-libs/webkit-gtk/Manifest | 2 +- |
| 11 |
.../webkit-gtk/files/webkit-gtk-2.18.1-musl.patch | 84 +++++++++++----------- |
| 12 |
.../files/webkit-gtk-2.8.5-fix-alpha-build.patch | 22 ------ |
| 13 |
.../files/webkit-gtk-2.8.5-fix-ia64-build.patch | 21 ------ |
| 14 |
...-gtk-2.18.6.ebuild => webkit-gtk-2.20.4.ebuild} | 65 +++++++---------- |
| 15 |
5 files changed, 68 insertions(+), 126 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest |
| 18 |
index 06548c5..263e59d 100644 |
| 19 |
--- a/net-libs/webkit-gtk/Manifest |
| 20 |
+++ b/net-libs/webkit-gtk/Manifest |
| 21 |
@@ -1 +1 @@ |
| 22 |
-DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029 |
| 23 |
+DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090 |
| 24 |
|
| 25 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch |
| 26 |
index d46dd47..8ce2d14 100644 |
| 27 |
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch |
| 28 |
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch |
| 29 |
@@ -1,55 +1,54 @@ |
| 30 |
-diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h |
| 31 |
---- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h 2017-08-09 02:13:46.000000000 -0700 |
| 32 |
-+++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h 2017-10-23 13:37:19.427607525 -0700 |
| 33 |
-@@ -146,7 +146,7 @@ |
| 34 |
+--- a/Source/JavaScriptCore/runtime/MachineContext.h |
| 35 |
++++ b/Source/JavaScriptCore/runtime/MachineContext.h |
| 36 |
+@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) |
| 37 |
#error Unknown Architecture |
| 38 |
#endif |
| 39 |
|
| 40 |
--#elif defined(__GLIBC__) |
| 41 |
-+#elif OS(LINUX) |
| 42 |
+-#elif defined(__GLIBC__) || defined(__BIONIC__) |
| 43 |
++#elif defined(__linux__) |
| 44 |
|
| 45 |
#if CPU(X86) |
| 46 |
return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); |
| 47 |
-@@ -251,7 +251,7 @@ |
| 48 |
+@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) |
| 49 |
#error Unknown Architecture |
| 50 |
#endif |
| 51 |
|
| 52 |
--#elif defined(__GLIBC__) |
| 53 |
-+#elif OS(LINUX) |
| 54 |
+-#elif defined(__GLIBC__) || defined(__BIONIC__) |
| 55 |
++#elif defined(__linux__) |
| 56 |
|
| 57 |
// The following sequence depends on glibc's sys/ucontext.h. |
| 58 |
#if CPU(X86) |
| 59 |
-@@ -354,7 +354,7 @@ |
| 60 |
+@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) |
| 61 |
#error Unknown Architecture |
| 62 |
#endif |
| 63 |
|
| 64 |
--#elif defined(__GLIBC__) |
| 65 |
-+#elif OS(LINUX) |
| 66 |
+-#elif defined(__GLIBC__) || defined(__BIONIC__) |
| 67 |
++#elif defined(__linux__) |
| 68 |
|
| 69 |
// The following sequence depends on glibc's sys/ucontext.h. |
| 70 |
#if CPU(X86) |
| 71 |
-@@ -466,7 +466,7 @@ |
| 72 |
+@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) |
| 73 |
#error Unknown Architecture |
| 74 |
#endif |
| 75 |
|
| 76 |
--#elif defined(__GLIBC__) |
| 77 |
-+#elif OS(LINUX) |
| 78 |
+-#elif defined(__GLIBC__) || defined(__BIONIC__) |
| 79 |
++#elif defined(__linux__) |
| 80 |
|
| 81 |
// The following sequence depends on glibc's sys/ucontext.h. |
| 82 |
#if CPU(X86) |
| 83 |
-@@ -583,7 +583,7 @@ |
| 84 |
+@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) |
| 85 |
#error Unknown Architecture |
| 86 |
#endif |
| 87 |
|
| 88 |
--#elif defined(__GLIBC__) |
| 89 |
-+#elif OS(LINUX) |
| 90 |
+-#elif defined(__GLIBC__) || defined(__BIONIC__) |
| 91 |
++#elif defined(__linux__) |
| 92 |
|
| 93 |
// The following sequence depends on glibc's sys/ucontext.h. |
| 94 |
#if CPU(X86) |
| 95 |
-diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h |
| 96 |
---- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h 2017-08-13 23:05:57.000000000 -0700 |
| 97 |
-+++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h 2017-10-23 13:37:19.428607525 -0700 |
| 98 |
-@@ -120,9 +120,9 @@ |
| 99 |
+ |
| 100 |
+--- a/Source/JavaScriptCore/runtime/Options.h |
| 101 |
++++ b/Source/JavaScriptCore/runtime/Options.h |
| 102 |
+@@ -126,9 +126,9 @@ |
| 103 |
\ |
| 104 |
v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ |
| 105 |
\ |
| 106 |
@@ -62,10 +61,10 @@ diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h webkitg |
| 107 |
\ |
| 108 |
v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ |
| 109 |
v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ |
| 110 |
-diff -Naur webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp |
| 111 |
---- webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp 2017-08-09 02:13:47.000000000 -0700 |
| 112 |
-+++ webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp 2017-10-23 13:46:31.956597630 -0700 |
| 113 |
-@@ -839,7 +839,7 @@ |
| 114 |
+ |
| 115 |
+--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp |
| 116 |
++++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp |
| 117 |
+@@ -836,7 +836,7 @@ |
| 118 |
#if YYERROR_VERBOSE |
| 119 |
|
| 120 |
# ifndef yystrlen |
| 121 |
@@ -74,7 +73,7 @@ diff -Naur webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/preprocess |
| 122 |
# define yystrlen strlen |
| 123 |
# else |
| 124 |
/* Return the length of YYSTR. */ |
| 125 |
-@@ -855,7 +855,7 @@ |
| 126 |
+@@ -852,7 +852,7 @@ |
| 127 |
# endif |
| 128 |
|
| 129 |
# ifndef yystpcpy |
| 130 |
@@ -83,10 +82,10 @@ diff -Naur webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/preprocess |
| 131 |
# define yystpcpy stpcpy |
| 132 |
# else |
| 133 |
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
| 134 |
-diff -Naur webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp |
| 135 |
---- webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp 2017-08-09 02:13:47.000000000 -0700 |
| 136 |
-+++ webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp 2017-10-23 13:46:13.605597959 -0700 |
| 137 |
-@@ -1994,7 +1994,7 @@ |
| 138 |
+ |
| 139 |
+--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp |
| 140 |
++++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp |
| 141 |
+@@ -1975,7 +1975,7 @@ |
| 142 |
#if YYERROR_VERBOSE |
| 143 |
|
| 144 |
# ifndef yystrlen |
| 145 |
@@ -95,7 +94,7 @@ diff -Naur webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/translator |
| 146 |
# define yystrlen strlen |
| 147 |
# else |
| 148 |
/* Return the length of YYSTR. */ |
| 149 |
-@@ -2010,7 +2010,7 @@ |
| 150 |
+@@ -1991,7 +1991,7 @@ |
| 151 |
# endif |
| 152 |
|
| 153 |
# ifndef yystpcpy |
| 154 |
@@ -104,21 +103,20 @@ diff -Naur webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/translator |
| 155 |
# define yystpcpy stpcpy |
| 156 |
# else |
| 157 |
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
| 158 |
-diff -Naur webkitgtk-2.18.1.orig/Source/WTF/wtf/Platform.h webkitgtk-2.18.1/Source/WTF/wtf/Platform.h |
| 159 |
---- webkitgtk-2.18.1.orig/Source/WTF/wtf/Platform.h 2017-10-16 05:18:56.000000000 -0700 |
| 160 |
-+++ webkitgtk-2.18.1/Source/WTF/wtf/Platform.h 2017-10-23 13:44:27.882599852 -0700 |
| 161 |
-@@ -676,7 +676,7 @@ |
| 162 |
+ |
| 163 |
+--- a/Source/WTF/wtf/Platform.h |
| 164 |
++++ b/Source/WTF/wtf/Platform.h |
| 165 |
+@@ -679,7 +679,7 @@ |
| 166 |
#define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 |
| 167 |
#endif |
| 168 |
|
| 169 |
--#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
| 170 |
-+#if OS(DARWIN) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
| 171 |
+-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
| 172 |
++#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
| 173 |
#define HAVE_MACHINE_CONTEXT 1 |
| 174 |
#endif |
| 175 |
- |
| 176 |
-diff -Naur webkitgtk-2.18.1.orig/Source/WebCore/xml/XPathGrammar.cpp webkitgtk-2.18.1/Source/WebCore/xml/XPathGrammar.cpp |
| 177 |
---- webkitgtk-2.18.1.orig/Source/WebCore/xml/XPathGrammar.cpp 2017-08-09 02:13:52.000000000 -0700 |
| 178 |
-+++ webkitgtk-2.18.1/Source/WebCore/xml/XPathGrammar.cpp 2017-10-23 13:43:16.467601131 -0700 |
| 179 |
+ |
| 180 |
+--- a/Source/WebCore/xml/XPathGrammar.cpp |
| 181 |
++++ b/Source/WebCore/xml/XPathGrammar.cpp |
| 182 |
@@ -967,7 +967,7 @@ |
| 183 |
#if YYERROR_VERBOSE |
| 184 |
|
| 185 |
@@ -136,4 +134,4 @@ diff -Naur webkitgtk-2.18.1.orig/Source/WebCore/xml/XPathGrammar.cpp webkitgtk-2 |
| 186 |
+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE |
| 187 |
# define yystpcpy stpcpy |
| 188 |
# else |
| 189 |
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
| 190 |
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
| 191 |
|
| 192 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch |
| 193 |
deleted file mode 100644 |
| 194 |
index 3817bce..0000000 |
| 195 |
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch |
| 196 |
+++ /dev/null |
| 197 |
@@ -1,22 +0,0 @@ |
| 198 |
---- a/Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 |
| 199 |
-+++ b/Source/JavaScriptCore/CMakeLists.txt 2015-10-29 17:47:10.535712494 +0300 |
| 200 |
-@@ -1146,6 +1146,7 @@ |
| 201 |
- list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj) |
| 202 |
- endif () |
| 203 |
- elseif (WTF_CPU_ARM64) |
| 204 |
-+elseif (WTF_CPU_ALPHA) |
| 205 |
- elseif (WTF_CPU_HPPA) |
| 206 |
- elseif (WTF_CPU_IA64) |
| 207 |
- elseif (WTF_CPU_PPC) |
| 208 |
- elseif (WTF_CPU_PPC64) |
| 209 |
---- a/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 |
| 210 |
-+++ b/CMakeLists.txt 2015-10-29 01:23:37.416886279 +0300 |
| 211 |
-@@ -82,6 +82,8 @@ |
| 212 |
- set(WTF_CPU_ARM 1) |
| 213 |
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") |
| 214 |
- set(WTF_CPU_ARM64 1) |
| 215 |
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha") |
| 216 |
-+ set(WTF_CPU_ALPHA 1) |
| 217 |
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") |
| 218 |
- set(WTF_CPU_MIPS 1) |
| 219 |
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4") |
| 220 |
|
| 221 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch |
| 222 |
deleted file mode 100644 |
| 223 |
index 6c88c49..0000000 |
| 224 |
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch |
| 225 |
+++ /dev/null |
| 226 |
@@ -1,21 +0,0 @@ |
| 227 |
---- a/CMakeLists.txt |
| 228 |
-+++ b/CMakeLists.txt |
| 229 |
-@@ -98,6 +98,8 @@ |
| 230 |
- set(WTF_CPU_PPC64LE 1) |
| 231 |
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*") |
| 232 |
- set(WTF_CPU_HPPA 1) |
| 233 |
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64") |
| 234 |
-+ set(WTF_CPU_IA64 1) |
| 235 |
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390") |
| 236 |
- set(WTF_CPU_S390 1) |
| 237 |
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") |
| 238 |
---- a/Source/JavaScriptCore/CMakeLists.txt |
| 239 |
-+++ b/Source/JavaScriptCore/CMakeLists.txt |
| 240 |
-@@ -1147,6 +1147,7 @@ |
| 241 |
- endif () |
| 242 |
- elseif (WTF_CPU_ARM64) |
| 243 |
- elseif (WTF_CPU_HPPA) |
| 244 |
-+elseif (WTF_CPU_IA64) |
| 245 |
- elseif (WTF_CPU_PPC) |
| 246 |
- elseif (WTF_CPU_PPC64) |
| 247 |
- elseif (WTF_CPU_PPC64LE) |
| 248 |
|
| 249 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild |
| 250 |
similarity index 84% |
| 251 |
rename from net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild |
| 252 |
rename to net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild |
| 253 |
index 6a5cc7d..01d4acd 100644 |
| 254 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild |
| 255 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild |
| 256 |
@@ -6,28 +6,27 @@ CMAKE_MAKEFILE_GENERATOR="ninja" |
| 257 |
PYTHON_COMPAT=( python2_7 ) |
| 258 |
USE_RUBY="ruby23 ruby24 ruby25" |
| 259 |
|
| 260 |
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx |
| 261 |
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx |
| 262 |
|
| 263 |
MY_P="webkitgtk-${PV}" |
| 264 |
DESCRIPTION="Open source web browser engine" |
| 265 |
-HOMEPAGE="https://www.webkitgtk.org/" |
| 266 |
+HOMEPAGE="https://www.webkitgtk.org" |
| 267 |
SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
| 268 |
|
| 269 |
LICENSE="LGPL-2+ BSD" |
| 270 |
SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
| 271 |
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" |
| 272 |
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" |
| 273 |
|
| 274 |
IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X" |
| 275 |
|
| 276 |
# webgl needs gstreamer, bug #560612 |
| 277 |
REQUIRED_USE=" |
| 278 |
geolocation? ( introspection ) |
| 279 |
- gles2? ( egl ) |
| 280 |
+ gles2? ( egl !opengl ) |
| 281 |
introspection? ( gstreamer ) |
| 282 |
nsplugin? ( X ) |
| 283 |
- webgl? ( ^^ ( gles2 opengl ) ) |
| 284 |
- !webgl? ( ?? ( gles2 opengl ) ) |
| 285 |
- webgl? ( gstreamer ) |
| 286 |
+ webgl? ( gstreamer |
| 287 |
+ || ( gles2 opengl ) ) |
| 288 |
wayland? ( egl ) |
| 289 |
|| ( aqua wayland X ) |
| 290 |
" |
| 291 |
@@ -41,7 +40,7 @@ RESTRICT="test" |
| 292 |
# Various compile-time optionals for gtk+-3.22.0 - ensure it |
| 293 |
# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) |
| 294 |
RDEPEND=" |
| 295 |
- >=x11-libs/cairo-1.10.2:= |
| 296 |
+ >=x11-libs/cairo-1.10.2:=[X?] |
| 297 |
>=media-libs/fontconfig-2.8.0:1.0 |
| 298 |
>=media-libs/freetype-2.4.2:2 |
| 299 |
>=dev-libs/libgcrypt-1.6.0:0= |
| 300 |
@@ -59,6 +58,7 @@ RDEPEND=" |
| 301 |
|
| 302 |
>=dev-libs/glib-2.40:2 |
| 303 |
>=dev-libs/libxslt-1.1.7 |
| 304 |
+ media-libs/woff2 |
| 305 |
gnome-keyring? ( app-crypt/libsecret ) |
| 306 |
geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
| 307 |
introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
| 308 |
@@ -69,10 +69,9 @@ RDEPEND=" |
| 309 |
gstreamer? ( |
| 310 |
>=media-libs/gstreamer-1.2.3:1.0 |
| 311 |
>=media-libs/gst-plugins-base-1.2.3:1.0 |
| 312 |
- >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) |
| 313 |
+ >=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] ) |
| 314 |
|
| 315 |
X? ( |
| 316 |
- x11-libs/cairo[X] |
| 317 |
x11-libs/libX11 |
| 318 |
x11-libs/libXcomposite |
| 319 |
x11-libs/libXdamage |
| 320 |
@@ -84,10 +83,8 @@ RDEPEND=" |
| 321 |
|
| 322 |
egl? ( media-libs/mesa[egl] ) |
| 323 |
gles2? ( media-libs/mesa[gles2] ) |
| 324 |
- opengl? ( virtual/opengl |
| 325 |
- x11-libs/cairo[opengl] ) |
| 326 |
+ opengl? ( virtual/opengl ) |
| 327 |
webgl? ( |
| 328 |
- x11-libs/cairo[opengl] |
| 329 |
x11-libs/libXcomposite |
| 330 |
x11-libs/libXdamage ) |
| 331 |
" |
| 332 |
@@ -109,16 +106,16 @@ DEPEND="${RDEPEND} |
| 333 |
dev-lang/perl |
| 334 |
virtual/perl-Data-Dumper |
| 335 |
virtual/perl-Carp |
| 336 |
+ virtual/perl-JSON-PP |
| 337 |
|
| 338 |
doc? ( >=dev-util/gtk-doc-1.10 ) |
| 339 |
geolocation? ( dev-util/gdbus-codegen ) |
| 340 |
introspection? ( jit? ( sys-apps/paxctl ) ) |
| 341 |
- test? ( |
| 342 |
- dev-lang/python:2.7 |
| 343 |
- dev-python/pygobject:3[python_targets_python2_7] |
| 344 |
- x11-themes/hicolor-icon-theme |
| 345 |
- jit? ( sys-apps/paxctl ) ) |
| 346 |
" |
| 347 |
+# test? ( |
| 348 |
+# dev-python/pygobject:3[python_targets_python2_7] |
| 349 |
+# x11-themes/hicolor-icon-theme |
| 350 |
+# jit? ( sys-apps/paxctl ) ) |
| 351 |
|
| 352 |
S="${WORKDIR}/${MY_P}" |
| 353 |
|
| 354 |
@@ -150,8 +147,6 @@ pkg_setup() { |
| 355 |
} |
| 356 |
|
| 357 |
src_prepare() { |
| 358 |
- # https://bugs.gentoo.org/show_bug.cgi?id=555504 |
| 359 |
- eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch |
| 360 |
# musl and jit |
| 361 |
eapply "${FILESDIR}"/${PN}-2.18.1-musl.patch |
| 362 |
cmake-utils_src_prepare |
| 363 |
@@ -192,17 +187,17 @@ src_configure() { |
| 364 |
# Multiple rendering bugs on youtube, github, etc without this, bug #547224 |
| 365 |
append-flags $(test-flags -fno-strict-aliasing) |
| 366 |
|
| 367 |
+ # Ruby situation is a bit complicated. See bug 513888 |
| 368 |
+ local rubyimpl |
| 369 |
local ruby_interpreter="" |
| 370 |
- |
| 371 |
- if has_version "virtual/rubygems[ruby_targets_ruby25]"; then |
| 372 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby25)" |
| 373 |
- elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
| 374 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)" |
| 375 |
- elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then |
| 376 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)" |
| 377 |
- else |
| 378 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)" |
| 379 |
- fi |
| 380 |
+ for rubyimpl in ${USE_RUBY}; do |
| 381 |
+ if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then |
| 382 |
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" |
| 383 |
+ fi |
| 384 |
+ done |
| 385 |
+ # This will rarely occur. Only a couple of corner cases could lead us to |
| 386 |
+ # that failure. See bug 513888 |
| 387 |
+ [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" |
| 388 |
|
| 389 |
# TODO: Check Web Audio support |
| 390 |
# should somehow let user select between them? |
| 391 |
@@ -218,14 +213,6 @@ src_configure() { |
| 392 |
opengl_enabled=OFF |
| 393 |
fi |
| 394 |
|
| 395 |
- # support for webgl (aka 2d-canvas accelerating) |
| 396 |
- local canvas_enabled |
| 397 |
- if use webgl && ! use gles2 ; then |
| 398 |
- canvas_enabled=ON |
| 399 |
- else |
| 400 |
- canvas_enabled=OFF |
| 401 |
- fi |
| 402 |
- |
| 403 |
local mycmakeargs=( |
| 404 |
-DENABLE_QUARTZ_TARGET=$(usex aqua) |
| 405 |
-DENABLE_API_TESTS=$(usex test) |
| 406 |
@@ -239,6 +226,7 @@ src_configure() { |
| 407 |
-DENABLE_JIT=$(usex jit) |
| 408 |
-DUSE_LIBNOTIFY=$(usex libnotify) |
| 409 |
-DUSE_LIBSECRET=$(usex gnome-keyring) |
| 410 |
+ -DUSE_WOFF2=ON |
| 411 |
-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin) |
| 412 |
-DENABLE_SPELLCHECK=$(usex spell) |
| 413 |
-DENABLE_WAYLAND_TARGET=$(usex wayland) |
| 414 |
@@ -247,7 +235,6 @@ src_configure() { |
| 415 |
$(cmake-utils_use_find_package opengl OpenGL) |
| 416 |
-DENABLE_X11_TARGET=$(usex X) |
| 417 |
-DENABLE_OPENGL=${opengl_enabled} |
| 418 |
- -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled} |
| 419 |
-DCMAKE_BUILD_TYPE=Release |
| 420 |
-DPORT=GTK |
| 421 |
${ruby_interpreter} |
Archives