Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 699156
Collapse All | Expand All

(-)a/mail-client/evolution/evolution-3.30.5.ebuild (-1 / +1 lines)
Lines 31-37 COMMON_DEPEND=" Link Here
31
	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
31
	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
32
	>=media-libs/libcanberra-0.25[gtk3]
32
	>=media-libs/libcanberra-0.25[gtk3]
33
	>=net-libs/libsoup-2.42:2.4
33
	>=net-libs/libsoup-2.42:2.4
34
	>=net-libs/webkit-gtk-2.16.0:4
34
	>=net-libs/webkit-gtk-2.26.2:4[evo]
35
	>=x11-libs/cairo-1.9.15:=[glib]
35
	>=x11-libs/cairo-1.9.15:=[glib]
36
	>=x11-libs/gdk-pixbuf-2.24:2
36
	>=x11-libs/gdk-pixbuf-2.24:2
37
	>=x11-libs/gtk+-3.22:3
37
	>=x11-libs/gtk+-3.22:3
(-)a/mail-client/evolution/evolution-3.32.4.ebuild (-1 / +1 lines)
Lines 31-37 COMMON_DEPEND=" Link Here
31
	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
31
	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
32
	>=media-libs/libcanberra-0.25[gtk3]
32
	>=media-libs/libcanberra-0.25[gtk3]
33
	>=net-libs/libsoup-2.42:2.4
33
	>=net-libs/libsoup-2.42:2.4
34
	>=net-libs/webkit-gtk-2.16.0:4
34
	>=net-libs/webkit-gtk-2.26.2:4[evo]
35
	>=x11-libs/cairo-1.9.15:=[glib]
35
	>=x11-libs/cairo-1.9.15:=[glib]
36
	>=x11-libs/gdk-pixbuf-2.24:2
36
	>=x11-libs/gdk-pixbuf-2.24:2
37
	>=x11-libs/gtk+-3.22:3
37
	>=x11-libs/gtk+-3.22:3
(-)a/mail-client/geary/geary-0.12.4.ebuild (-1 / +1 lines)
Lines 17-23 KEYWORDS="~amd64 ~x86" Link Here
17
DEPEND="
17
DEPEND="
18
	>=dev-libs/glib-2.42:2
18
	>=dev-libs/glib-2.42:2
19
	>=x11-libs/gtk+-3.14.0:3[introspection]
19
	>=x11-libs/gtk+-3.14.0:3[introspection]
20
	>=net-libs/webkit-gtk-2.10.0:4=[introspection]
20
	>=net-libs/webkit-gtk-2.26.2:4=[introspection,evo]
21
	app-text/iso-codes
21
	app-text/iso-codes
22
	>=dev-db/sqlite-3.12:3
22
	>=dev-db/sqlite-3.12:3
23
23
(-)a/mail-client/geary/geary-3.32.0-r1.ebuild (-1 / +1 lines)
Lines 22-28 KEYWORDS="~amd64" Link Here
22
DEPEND="
22
DEPEND="
23
	>=dev-libs/glib-2.54:2
23
	>=dev-libs/glib-2.54:2
24
	>=x11-libs/gtk+-3.22.26:3[introspection]
24
	>=x11-libs/gtk+-3.22.26:3[introspection]
25
	>=net-libs/webkit-gtk-2.20:4=[introspection]
25
	>=net-libs/webkit-gtk-2.26.2:4=[introspection,evo]
26
	app-text/iso-codes
26
	app-text/iso-codes
27
	>=dev-db/sqlite-3.12:3
27
	>=dev-db/sqlite-3.12:3
28
28
(-)a/mail-client/geary/geary-3.34.2.ebuild (-1 / +1 lines)
Lines 24-30 DEPEND=" Link Here
24
	>=dev-libs/glib-2.54:2
24
	>=dev-libs/glib-2.54:2
25
	>=gui-libs/libhandy-0.0.9:0.0=
25
	>=gui-libs/libhandy-0.0.9:0.0=
26
	>=x11-libs/gtk+-3.22.26:3[introspection]
26
	>=x11-libs/gtk+-3.22.26:3[introspection]
27
	>=net-libs/webkit-gtk-2.20:4=[introspection]
27
	>=net-libs/webkit-gtk-2.26.2:4=[introspection,evo]
28
	app-text/gspell[vala]
28
	app-text/gspell[vala]
29
	app-text/iso-codes
29
	app-text/iso-codes
30
	>=dev-db/sqlite-3.12:3
30
	>=dev-db/sqlite-3.12:3
(-)a/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-evolution-exception.patch (+24 lines)
Line 0 Link Here
1
--- webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-08-26 17:55:46.000000000 +0300
Line 0 Link Here
1
Index: webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
2
===================================================================
3
--- webkitgtk.orig/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
4
+++ webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
5
@@ -348,8 +348,16 @@ ALLOW_DEPRECATED_DECLARATIONS_END
6
         configuration.setLocalStorageDirectory(FileSystem::stringFromFileSystemRepresentation(priv->localStorageDirectory.data()));
7
 
8
     const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS");
9
-    if (useSingleWebProcess && strcmp(useSingleWebProcess, "0"))
10
-        configuration.setUsesSingleWebProcess(true);
11
+    if (useSingleWebProcess) {
12
+        if (strcmp(useSingleWebProcess, "0")) {
13
+            configuration.setUsesSingleWebProcess(true);
14
+        }
15
+    } else {
16
+        const char* prgname = g_get_prgname();
17
+        if (!g_strcmp0(prgname, "evolution") || !g_strcmp0(prgname, "geary")) {
18
+            configuration.setUsesSingleWebProcess(true);
19
+        }
20
+    }
21
     priv->processPool = WebProcessPool::create(configuration);
22
 
23
     if (!priv->websiteDataManager)
(-)a/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-icu-65.patch (+53 lines)
Line 0 Link Here
1
From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
2
From: Heiko Becker <heirecka@exherbo.org>
3
Date: Fri, 4 Oct 2019 22:17:11 +0200
4
Subject: [PATCH] Add missing semicolons to fix build with icu 65.1
5
6
---
7
 Source/WTF/wtf/URLHelpers.cpp   |  2 +-
8
 Source/WebCore/dom/Document.cpp |  6 +++---
9
 4 files changed, 25 insertions(+), 4 deletions(-)
10
11
diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
12
index 18e7f13cd61..c584f1a0cb7 100644
13
--- a/Source/WTF/wtf/URLHelpers.cpp
14
+++ b/Source/WTF/wtf/URLHelpers.cpp
15
@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
16
     Optional<UChar32> previousCodePoint;
17
     while (i < length) {
18
         UChar32 c;
19
-        U16_NEXT(buffer, i, length, c)
20
+        U16_NEXT(buffer, i, length, c);
21
         UErrorCode error = U_ZERO_ERROR;
22
         UScriptCode script = uscript_getScript(c, &error);
23
         if (error != U_ZERO_ERROR) {
24
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
25
index 0fd0fa090bf..01f76850f3d 100644
26
--- a/Source/WebCore/dom/Document.cpp
27
+++ b/Source/WebCore/dom/Document.cpp
28
@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
29
     unsigned i = 0;
30
 
31
     UChar32 c;
32
-    U16_NEXT(characters, i, length, c)
33
+    U16_NEXT(characters, i, length, c);
34
     if (!isValidNameStart(c))
35
         return false;
36
 
37
     while (i < length) {
38
-        U16_NEXT(characters, i, length, c)
39
+        U16_NEXT(characters, i, length, c);
40
         if (!isValidNamePart(c))
41
             return false;
42
     }
43
@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
44
 
45
     for (unsigned i = 0; i < length; ) {
46
         UChar32 c;
47
-        U16_NEXT(qualifiedName, i, length, c)
48
+        U16_NEXT(qualifiedName, i, length, c);
49
         if (c == ':') {
50
             if (sawColon)
51
                 return Exception { InvalidCharacterError };
52
-- 
53
2.23.0
(-)a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild (-1 / +282 lines)
Line 0 Link Here
0
- 
1
# Copyright 1999-2019 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
3
4
EAPI=6
5
CMAKE_MAKEFILE_GENERATOR="ninja"
6
PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
7
USE_RUBY="ruby24 ruby25 ruby26"
8
9
inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
10
11
MY_P="webkitgtk-${PV}"
12
DESCRIPTION="Open source web browser engine"
13
HOMEPAGE="https://www.webkitgtk.org"
14
SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
15
16
LICENSE="LGPL-2+ BSD"
17
SLOT="4/37" # soname version of libwebkit2gtk-4.0
18
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
19
20
IUSE="aqua coverage doc +egl +evo +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify +opengl spell wayland +webgl +X"
21
22
# webgl needs gstreamer, bug #560612
23
# gstreamer with opengl/gles2 needs egl
24
REQUIRED_USE="
25
	geolocation? ( introspection )
26
	gles2? ( egl !opengl )
27
	gstreamer? ( opengl? ( egl ) )
28
	webgl? ( gstreamer
29
		|| ( gles2 opengl ) )
30
	wayland? ( egl )
31
	|| ( aqua wayland X )
32
"
33
34
# Tests fail to link for inexplicable reasons
35
# https://bugs.webkit.org/show_bug.cgi?id=148210
36
RESTRICT="test"
37
38
# Aqua support in gtk3 is untested
39
# Dependencies found at Source/cmake/OptionsGTK.cmake
40
# Various compile-time optionals for gtk+-3.22.0 - ensure it
41
# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
42
# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
43
RDEPEND="
44
	>=x11-libs/cairo-1.16.0:=[X?]
45
	>=media-libs/fontconfig-2.13.0:1.0
46
	>=media-libs/freetype-2.9.0:2
47
	>=dev-libs/libgcrypt-1.7.0:0=
48
	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
49
	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
50
	>=dev-libs/icu-3.8.1-r1:=
51
	virtual/jpeg:0=
52
	>=net-libs/libsoup-2.48:2.4[introspection?]
53
	>=dev-libs/libxml2-2.8.0:2
54
	>=media-libs/libpng-1.4:0=
55
	dev-db/sqlite:3=
56
	sys-libs/zlib:0
57
	>=dev-libs/atk-2.8.0
58
	media-libs/libwebp:=
59
	>=dev-libs/glib-2.40:2
60
	>=dev-libs/libxslt-1.1.7
61
	media-libs/woff2
62
	gnome-keyring? ( app-crypt/libsecret )
63
	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
64
	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
65
	dev-libs/libtasn1:=
66
	spell? ( >=app-text/enchant-0.22:= )
67
	gstreamer? (
68
		>=media-libs/gstreamer-1.14:1.0
69
		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
70
		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
71
		>=media-libs/gst-plugins-bad-1.14:1.0 )
72
73
	X? (
74
		x11-libs/libX11
75
		x11-libs/libXcomposite
76
		x11-libs/libXdamage
77
		x11-libs/libXrender
78
		x11-libs/libXt )
79
80
	libnotify? ( x11-libs/libnotify )
81
	dev-libs/hyphen
82
	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
83
84
	egl? ( media-libs/mesa[egl] )
85
	gles2? ( media-libs/mesa[gles2] )
86
	opengl? ( virtual/opengl )
87
	webgl? (
88
		x11-libs/libXcomposite
89
		x11-libs/libXdamage )
90
"
91
92
# paxctl needed for bug #407085
93
# Need real bison, not yacc
94
DEPEND="${RDEPEND}
95
	${PYTHON_DEPS}
96
	${RUBY_DEPS}
97
	>=app-accessibility/at-spi2-core-2.5.3
98
	dev-util/glib-utils
99
	>=dev-util/gtk-doc-am-1.10
100
	>=dev-util/gperf-3.0.1
101
	>=sys-devel/bison-2.4.3
102
	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
103
	sys-devel/gettext
104
	virtual/pkgconfig
105
106
	>=dev-lang/perl-5.10
107
	virtual/perl-Data-Dumper
108
	virtual/perl-Carp
109
	virtual/perl-JSON-PP
110
111
	doc? ( >=dev-util/gtk-doc-1.10 )
112
	geolocation? ( dev-util/gdbus-codegen )
113
"
114
#	test? (
115
#		dev-python/pygobject:3[python_targets_python2_7]
116
#		x11-themes/hicolor-icon-theme
117
#		jit? ( sys-apps/paxctl ) )
118
119
S="${WORKDIR}/${MY_P}"
120
121
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
122
123
pkg_pretend() {
124
	if [[ ${MERGE_TYPE} != "binary" ]] ; then
125
		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
126
			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
127
			check-reqs_pkg_pretend
128
		fi
129
130
		if ! test-flag-CXX -std=c++11 ; then
131
			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
132
		fi
133
134
		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
135
			die 'The active compiler needs to be gcc 4.9 (or newer)'
136
		fi
137
	fi
138
139
	if ! use opengl && ! use gles2; then
140
		ewarn
141
		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
142
		ewarn "This is an unsupported configuration meant for very specific embedded"
143
		ewarn "use cases, where there truly is no GL possible (and even that use case"
144
		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
145
		ewarn "really really should be enabling OpenGL!"
146
		ewarn
147
	fi
148
}
149
150
pkg_setup() {
151
	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
152
		check-reqs_pkg_setup
153
	fi
154
155
	python-any-r1_pkg_setup
156
}
157
158
src_prepare() {
159
	eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596
160
        eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054
161
	if use evo; then
162
		eapply "${FILESDIR}/${P}-evolution-exception.patch" # bug 699156
163
	fi
164
	cmake-utils_src_prepare
165
	gnome2_src_prepare
166
}
167
168
src_configure() {
169
	# Respect CC, otherwise fails on prefix #395875
170
	tc-export CC
171
172
	# It does not compile on alpha without this in LDFLAGS
173
	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
174
	use alpha && append-ldflags "-Wl,--no-relax"
175
176
	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
177
	use ia64 && append-ldflags "-Wl,--no-as-needed"
178
179
	# Sigbuses on SPARC with mcpu and co., bug #???
180
	use sparc && filter-flags "-mvis"
181
182
	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
183
	use ppc64 && append-flags "-mminimal-toc"
184
185
	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
186
	# --no-keep-memory doesn't work on ia64, bug #502492
187
	if ! use ia64; then
188
		append-ldflags "-Wl,--no-keep-memory"
189
	fi
190
191
	# We try to use gold when possible for this package
192
#	if ! tc-ld-is-gold ; then
193
#		append-ldflags "-Wl,--reduce-memory-overheads"
194
#	fi
195
196
	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
197
	append-flags $(test-flags -fno-strict-aliasing)
198
199
	# Ruby situation is a bit complicated. See bug 513888
200
	local rubyimpl
201
	local ruby_interpreter=""
202
	for rubyimpl in ${USE_RUBY}; do
203
		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
204
			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
205
		fi
206
	done
207
	# This will rarely occur. Only a couple of corner cases could lead us to
208
	# that failure. See bug 513888
209
	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
210
211
	# TODO: Check Web Audio support
212
	# should somehow let user select between them?
213
	#
214
	# FTL_JIT requires llvm
215
	#
216
	# opengl needs to be explicetly handled, bug #576634
217
218
	local opengl_enabled
219
	if use opengl || use gles2; then
220
		opengl_enabled=ON
221
	else
222
		opengl_enabled=OFF
223
	fi
224
225
	local mycmakeargs=(
226
		-DENABLE_BUBBLEWRAP_SANDBOX=OFF # TODO: Possibly make into a useflag
227
		-DENABLE_QUARTZ_TARGET=$(usex aqua)
228
		-DENABLE_API_TESTS=$(usex test)
229
		-DENABLE_GTKDOC=$(usex doc)
230
		-DENABLE_GEOLOCATION=$(usex geolocation)
231
		$(cmake-utils_use_find_package gles2 OpenGLES2)
232
		-DENABLE_GLES2=$(usex gles2)
233
		-DENABLE_VIDEO=$(usex gstreamer)
234
		-DENABLE_WEB_AUDIO=$(usex gstreamer)
235
		-DENABLE_INTROSPECTION=$(usex introspection)
236
		-DUSE_LIBNOTIFY=$(usex libnotify)
237
		-DUSE_LIBSECRET=$(usex gnome-keyring)
238
		-DUSE_OPENJPEG=$(usex jpeg2k)
239
		-DUSE_WOFF2=ON
240
		-DUSE_WPE_RENDERER=OFF # TODO: Possibly make into a useflag
241
		-DENABLE_SPELLCHECK=$(usex spell)
242
		-DENABLE_WAYLAND_TARGET=$(usex wayland)
243
		-DENABLE_WEBGL=$(usex webgl)
244
		$(cmake-utils_use_find_package egl EGL)
245
		$(cmake-utils_use_find_package opengl OpenGL)
246
		-DENABLE_X11_TARGET=$(usex X)
247
		-DENABLE_OPENGL=${opengl_enabled}
248
		-DCMAKE_BUILD_TYPE=Release
249
		-DPORT=GTK
250
		${ruby_interpreter}
251
	)
252
253
	# Allow it to use GOLD when possible as it has all the magic to
254
	# detect when to use it and using gold for this concrete package has
255
	# multiple advantages and is also the upstream default, bug #585788
256
#	if tc-ld-is-gold ; then
257
#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
258
#	else
259
#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
260
#	fi
261
262
	cmake-utils_src_configure
263
}
264
265
src_compile() {
266
	cmake-utils_src_compile
267
}
268
269
src_test() {
270
	# Prevents test failures on PaX systems
271
	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
272
273
	cmake-utils_src_test
274
}
275
276
src_install() {
277
	cmake-utils_src_install
278
279
	# Prevents crashes on PaX systems, bug #522808
280
	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
281
	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
282
}

Return to bug 699156