1 |
commit: ea2ae777d028e584cd175b2d4081dea826c8f7d1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 3 06:06:37 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 3 06:09:14 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2ae777 |
7 |
|
8 |
dev-qt/qtwebkit: 5.212.0_pre20180120 snapshot bump |
9 |
|
10 |
Closes: https://bugs.gentoo.org/624404 |
11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
12 |
|
13 |
dev-qt/qtwebkit/Manifest | 1 + |
14 |
.../qtwebkit-5.212.0_pre20180120-functional.patch | 22 ++++ |
15 |
dev-qt/qtwebkit/metadata.xml | 1 + |
16 |
.../qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 141 +++++++++++++++++++++ |
17 |
4 files changed, 165 insertions(+) |
18 |
|
19 |
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest |
20 |
index 97b9f0eada0..36eb87329b0 100644 |
21 |
--- a/dev-qt/qtwebkit/Manifest |
22 |
+++ b/dev-qt/qtwebkit/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
+DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047 |
25 |
DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5 |
26 |
|
27 |
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..d8b5ba6cf31 |
30 |
--- /dev/null |
31 |
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch |
32 |
@@ -0,0 +1,22 @@ |
33 |
+From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001 |
34 |
+From: Konstantin Tokarev <annulen@××××××.ru> |
35 |
+Date: Fri, 26 Jan 2018 20:50:07 +0300 |
36 |
+Subject: [PATCH] Add missing #include <functional> |
37 |
+ |
38 |
+Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f |
39 |
+--- |
40 |
+ Source/WebCore/dom/SlotAssignment.h | 1 + |
41 |
+ 1 file changed, 1 insertion(+) |
42 |
+ |
43 |
+diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h |
44 |
+index 0fcd4dfa6de8..9b9ebe429816 100644 |
45 |
+--- a/Source/WebCore/dom/SlotAssignment.h |
46 |
++++ b/Source/WebCore/dom/SlotAssignment.h |
47 |
+@@ -28,6 +28,7 @@ |
48 |
+ |
49 |
+ #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT) |
50 |
+ |
51 |
++#include <functional> |
52 |
+ #include <wtf/HashMap.h> |
53 |
+ #include <wtf/HashSet.h> |
54 |
+ #include <wtf/Vector.h> |
55 |
|
56 |
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml |
57 |
index 645be81df28..c7df499ff74 100644 |
58 |
--- a/dev-qt/qtwebkit/metadata.xml |
59 |
+++ b/dev-qt/qtwebkit/metadata.xml |
60 |
@@ -9,6 +9,7 @@ |
61 |
<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag> |
62 |
<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> |
63 |
<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag> |
64 |
+ <flag name="hyphen">Enable hyphenation support via <pkg>dev-libs/hyphen</pkg></flag> |
65 |
<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag> |
66 |
<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag> |
67 |
<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag> |
68 |
|
69 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild |
70 |
new file mode 100644 |
71 |
index 00000000000..506e3879d34 |
72 |
--- /dev/null |
73 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild |
74 |
@@ -0,0 +1,141 @@ |
75 |
+# Copyright 1999-2018 Gentoo Foundation |
76 |
+# Distributed under the terms of the GNU General Public License v2 |
77 |
+ |
78 |
+EAPI=6 |
79 |
+ |
80 |
+COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da |
81 |
+CMAKE_MAKEFILE_GENERATOR="ninja" |
82 |
+PYTHON_COMPAT=( python2_7 ) |
83 |
+USE_RUBY="ruby23 ruby24 ruby25" |
84 |
+inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs |
85 |
+ |
86 |
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" |
87 |
+HOMEPAGE="https://www.qt.io/" |
88 |
+SRC_URI="http://code.qt.io/cgit/qt/${PN}.git/snapshot/${COMMIT}.tar.gz -> ${P}.tar.gz" |
89 |
+ |
90 |
+LICENSE="BSD LGPL-2+" |
91 |
+SLOT="5/5.212" |
92 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
93 |
+IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" |
94 |
+ |
95 |
+REQUIRED_USE=" |
96 |
+ nsplugin? ( X ) |
97 |
+ qml? ( opengl ) |
98 |
+ ?? ( gstreamer multimedia ) |
99 |
+" |
100 |
+ |
101 |
+QT_MIN_VER="5.9.1:5" |
102 |
+# Dependencies found at Source/cmake/OptionsQt.cmake |
103 |
+RDEPEND=" |
104 |
+ dev-db/sqlite:3 |
105 |
+ dev-libs/icu:= |
106 |
+ dev-libs/libxml2:2 |
107 |
+ dev-libs/libxslt |
108 |
+ >=dev-qt/qtcore-${QT_MIN_VER} |
109 |
+ >=dev-qt/qtgui-${QT_MIN_VER} |
110 |
+ >=dev-qt/qtnetwork-${QT_MIN_VER} |
111 |
+ >=dev-qt/qtwidgets-${QT_MIN_VER} |
112 |
+ media-libs/libpng:0= |
113 |
+ virtual/jpeg:0 |
114 |
+ geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} ) |
115 |
+ gstreamer? ( |
116 |
+ dev-libs/glib:2 |
117 |
+ media-libs/gstreamer:1.0 |
118 |
+ media-libs/gst-plugins-base:1.0 |
119 |
+ media-libs/gst-plugins-bad:1.0 |
120 |
+ ) |
121 |
+ hyphen? ( dev-libs/hyphen ) |
122 |
+ multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) |
123 |
+ opengl? ( |
124 |
+ >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] |
125 |
+ >=dev-qt/qtopengl-${QT_MIN_VER} |
126 |
+ ) |
127 |
+ orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) |
128 |
+ printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) |
129 |
+ qml? ( |
130 |
+ >=dev-qt/qtdeclarative-${QT_MIN_VER} |
131 |
+ >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] |
132 |
+ ) |
133 |
+ webp? ( media-libs/libwebp:0= ) |
134 |
+ X? ( |
135 |
+ x11-libs/libX11 |
136 |
+ x11-libs/libXcomposite |
137 |
+ x11-libs/libXrender |
138 |
+ ) |
139 |
+" |
140 |
+ |
141 |
+# Need real bison, not yacc |
142 |
+DEPEND="${RDEPEND} |
143 |
+ ${PYTHON_DEPS} |
144 |
+ ${RUBY_DEPS} |
145 |
+ dev-lang/perl |
146 |
+ dev-util/gperf |
147 |
+ >=sys-devel/bison-2.4.3 |
148 |
+ sys-devel/flex |
149 |
+ virtual/pkgconfig |
150 |
+" |
151 |
+ |
152 |
+CHECKREQS_DISK_BUILD="16G" # Debug build requires much more see bug #417307 |
153 |
+ |
154 |
+S="${WORKDIR}/${COMMIT}" |
155 |
+ |
156 |
+PATCHES=( "${FILESDIR}/${P}-functional.patch" ) |
157 |
+ |
158 |
+_check_reqs() { |
159 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
160 |
+ einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
161 |
+ check-reqs_pkg_pretend |
162 |
+ fi |
163 |
+} |
164 |
+ |
165 |
+pkg_pretend() { |
166 |
+ _check_reqs |
167 |
+} |
168 |
+ |
169 |
+pkg_setup() { |
170 |
+ _check_reqs |
171 |
+ python-any-r1_pkg_setup |
172 |
+} |
173 |
+ |
174 |
+src_configure() { |
175 |
+ # Respect CC, otherwise fails on prefix #395875 |
176 |
+ tc-export CC |
177 |
+ |
178 |
+ # Multiple rendering bugs on youtube, github, etc without this, bug #547224 |
179 |
+ append-flags $(test-flags -fno-strict-aliasing) |
180 |
+ |
181 |
+ local mycmakeargs=( |
182 |
+ -DPORT=Qt |
183 |
+ -DENABLE_API_TESTS=OFF |
184 |
+ -DENABLE_GEOLOCATION=$(usex geolocation) |
185 |
+ -DUSE_GSTREAMER=$(usex gstreamer) |
186 |
+ -DENABLE_JIT=$(usex jit) |
187 |
+ -DUSE_QT_MULTIMEDIA=$(usex multimedia) |
188 |
+ -DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin) |
189 |
+ -DENABLE_OPENGL=$(usex opengl) |
190 |
+ -DENABLE_DEVICE_ORIENTATION=$(usex orientation) |
191 |
+ -DENABLE_WEBKIT2=$(usex qml) |
192 |
+ $(cmake-utils_use_find_package webp WebP) |
193 |
+ -DENABLE_X11_TARGET=$(usex X) |
194 |
+ ) |
195 |
+ |
196 |
+ if has_version "virtual/rubygems[ruby_targets_ruby25]"; then |
197 |
+ mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) |
198 |
+ elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
199 |
+ mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) ) |
200 |
+ else |
201 |
+ mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby23) ) |
202 |
+ fi |
203 |
+ |
204 |
+ cmake-utils_src_configure |
205 |
+} |
206 |
+ |
207 |
+src_install() { |
208 |
+ cmake-utils_src_install |
209 |
+ |
210 |
+ # bug 572056 |
211 |
+ if [[ ! -f ${D%/}$(qt5_get_libdir)/libQt5WebKit.so ]]; then |
212 |
+ eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." |
213 |
+ die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' |
214 |
+ fi |
215 |
+} |