diff options
| -rw-r--r-- | dev-qt/qtwebkit/Manifest | 1 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch | 55 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild | 144 |
3 files changed, 0 insertions, 200 deletions
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index f9c66a241ca7..7080d4f542b7 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -1,2 +1 @@ -DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d SHA512 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6 diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch deleted file mode 100644 index 1891f73d5a44..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch +++ /dev/null @@ -1,55 +0,0 @@ -From dc02ec4080010e33b737db6491d71d6bb961a77d Mon Sep 17 00:00:00 2001 -From: "commit-queue@webkit.org" - <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Fri, 4 Oct 2019 21:51:37 +0000 -Subject: [PATCH] Fix build with icu 65.1 - https://bugs.webkit.org/show_bug.cgi?id=202600 - -Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04 -Reviewed by Konstantin Tokarev. - -Source/WebCore: - -* dom/Document.cpp: -(WebCore::isValidNameNonASCII): -(WebCore::Document::parseQualifiedName): - -Source/WTF: - -* wtf/URLHelpers.cpp: -(WTF::URLHelpers::allCharactersInIDNScriptWhiteList): - -Change-Id: I1b087322cbae43fbe155facdf933717ac8569b6c -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WebCore/dom/Document.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp -index 1bca2d0a66f8..19355f166019 100644 ---- a/Source/WebCore/dom/Document.cpp -+++ b/Source/WebCore/dom/Document.cpp -@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S - - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(qualifiedName, i, length, c) -+ U16_NEXT(qualifiedName, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild deleted file mode 100644 index 8d4967aaf3ee..000000000000 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby24 ruby25 ruby26 ruby27" -MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot -inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs - -DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" -HOMEPAGE="https://www.qt.io/" -SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz" - -LICENSE="BSD LGPL-2+" -SLOT="5/5.212" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" -IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" - -REQUIRED_USE=" - nsplugin? ( X ) - qml? ( opengl ) - ?? ( gstreamer multimedia ) -" - -# Dependencies found at Source/cmake/OptionsQt.cmake -QT_MIN_VER="5.9.1:5" -BDEPEND=" - ${PYTHON_DEPS} - ${RUBY_DEPS} - dev-lang/perl - dev-util/gperf - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig -" -DEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - dev-libs/libxml2 - dev-libs/libxslt - >=dev-qt/qtcore-${QT_MIN_VER} - >=dev-qt/qtgui-${QT_MIN_VER} - >=dev-qt/qtnetwork-${QT_MIN_VER} - >=dev-qt/qtwidgets-${QT_MIN_VER}= - media-libs/libpng:0= - virtual/jpeg:0 - geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0 - ) - hyphen? ( dev-libs/hyphen ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) - opengl? ( - >=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=] - >=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=] - ) - orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) - printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) - qml? ( - >=dev-qt/qtdeclarative-${QT_MIN_VER} - >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] - ) - webp? ( media-libs/libwebp:= ) - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -CHECKREQS_DISK_BUILD="16G" # bug 417307 - -PATCHES=( "${FILESDIR}/${P}-icu-65.patch" ) - -_check_reqs() { - if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then - einfo "Checking for sufficient disk space to build ${PN} with debugging flags" - check-reqs_$1 - fi -} - -pkg_pretend() { - _check_reqs pkg_pretend -} - -pkg_setup() { - _check_reqs pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - # Respect CC, otherwise fails on prefix, bug #395875 - tc-export CC - - # Multiple rendering bugs on youtube, github, etc without this, bug #547224 - append-flags $(test-flags -fno-strict-aliasing) - - local mycmakeargs=( - -DPORT=Qt - -DENABLE_API_TESTS=OFF - -DENABLE_TOOLS=OFF - -DENABLE_GEOLOCATION=$(usex geolocation) - -DUSE_GSTREAMER=$(usex gstreamer) - -DUSE_LIBHYPHEN=$(usex hyphen) - -DENABLE_JIT=$(usex jit) - -DUSE_QT_MULTIMEDIA=$(usex multimedia) - -DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_PRINT_SUPPORT=$(usex printsupport) - -DENABLE_DEVICE_ORIENTATION=$(usex orientation) - -DENABLE_WEBKIT2=$(usex qml) - $(cmake_use_find_package webp WebP) - -DENABLE_X11_TARGET=$(usex X) - ) - - if has_version "virtual/rubygems[ruby_targets_ruby27]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) ) - elif has_version "virtual/rubygems[ruby_targets_ruby26]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) ) - elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) - else - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # bug 572056 - if [[ ! -f ${ED}$(qt5_get_libdir)/libQt5WebKit.so ]]; then - eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." - die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' - fi -} |