On 12/06/2017 04:38:02 PM, Andrés Becerra Sandoval wrote:
I'm having trouble with these:
net-libs/webkit-gtk-2.4.11-r200
this needs an addtional patch webkit-gtk-2.4.11-icu59.patch which I've
attached
dev-qt/qtwebengine-5.9.3
This needs a tiny change, I've attached my ebuild
net-libs/webkit-gtk
which version? Version 2.18.3 installed just fine here.
Helmut
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML
applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu
widgets"
RDEPEND="
app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
virtual/jpeg:0
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
>=app-arch/gzip-1.7
dev-util/gperf
dev-util/ninja
dev-util/re2c
sys-devel/bison
pax_kernel? ( sys-apps/elfix )
"
src_prepare() {
use pax_kernel && PATCHES+=(
"${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
sed -i -e'/#if U_ICU_VERSION_MAJOR_NUM < 60/ s/60/60 ||
defined(TOOLKIT_QT)/' \
src/3rdparty/chromium/components/url_formatter/url_formatter.cc
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH
+= |&$$QTWEBENGINE_ROOT/include |' || die
qt_use_disable_config alsa alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
src/core/core_common.pri
qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
}
src_configure() {
export NINJA_PATH=/usr/bin/ninja
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs)
-l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
)
qt5-build_src_configure
}
src_install() {
qt5-build_src_install
# bug 601472
if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report
to https://bugs.gentoo.org/";
fi
pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff -ruN webkitgtk-2.4.11.orig/Source/JavaScriptCore/API/JSStringRef.cpp webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.cpp
--- webkitgtk-2.4.11.orig/Source/JavaScriptCore/API/JSStringRef.cpp 2016-04-10 08:48:36.000000000 +0200
+++ webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.cpp 2017-06-11 19:26:55.263795188 +0200
@@ -37,7 +37,7 @@
JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
{
initializeThreading();
- return OpaqueJSString::create(chars, numChars).leakRef();
+ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
}
JSStringRef JSStringCreateWithUTF8CString(const char* string)
@@ -62,7 +62,7 @@
JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
{
initializeThreading();
- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars)).leakRef();
}
JSStringRef JSStringRetain(JSStringRef string)
@@ -83,7 +83,7 @@
const JSChar* JSStringGetCharactersPtr(JSStringRef string)
{
- return string->characters();
+ return reinterpret_cast<const JSChar*>(string->characters());
}
size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
diff -ruN webkitgtk-2.4.11.orig/Source/JavaScriptCore/runtime/DateConversion.cpp webkitgtk-2.4.11/Source/JavaScriptCore/runtime/DateConversion.cpp
--- webkitgtk-2.4.11.orig/Source/JavaScriptCore/runtime/DateConversion.cpp 2013-08-03 18:10:38.000000000 +0200
+++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/DateConversion.cpp 2017-06-11 19:24:18.494788666 +0200
@@ -107,7 +107,8 @@
#if OS(WINDOWS)
TIME_ZONE_INFORMATION timeZoneInformation;
GetTimeZoneInformation(&timeZoneInformation);
- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
+ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
#else
struct tm gtm = t;
char timeZoneName[70];
diff -ruN webkitgtk-2.4.11.orig/Source/WebKit2/Shared/API/c/WKString.cpp webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.cpp
--- webkitgtk-2.4.11.orig/Source/WebKit2/Shared/API/c/WKString.cpp 2016-04-10 08:48:37.000000000 +0200
+++ webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.cpp 2017-06-11 19:31:59.544807847 +0200
@@ -55,7 +55,7 @@
size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
{
COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
+ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
}
size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
