diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-25 11:03:46 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-25 11:03:46 +0000 |
commit | 05e19c5517a36fa78707b8674e83e6268b0efc6b (patch) | |
tree | e906c76aee4f5424b941193ad5cc3d842416cbf4 /dev-qt/qtwebkit | |
parent | e21290ee862e0f0d18ff63eeb650bff14e586aa8 (diff) |
drop our Qt5 ebuilds, use the ones from Gentoo
Diffstat (limited to 'dev-qt/qtwebkit')
-rw-r--r-- | dev-qt/qtwebkit/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch | 22 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild | 140 |
3 files changed, 0 insertions, 163 deletions
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest deleted file mode 100644 index 2edec829..00000000 --- a/dev-qt/qtwebkit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047 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 deleted file mode 100644 index d8b5ba6c..00000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev <annulen@yandex.ru> -Date: Fri, 26 Jan 2018 20:50:07 +0300 -Subject: [PATCH] Add missing #include <functional> - -Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f ---- - Source/WebCore/dom/SlotAssignment.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h -index 0fcd4dfa6de8..9b9ebe429816 100644 ---- a/Source/WebCore/dom/SlotAssignment.h -+++ b/Source/WebCore/dom/SlotAssignment.h -@@ -28,6 +28,7 @@ - - #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT) - -+#include <functional> - #include <wtf/HashMap.h> - #include <wtf/HashSet.h> - #include <wtf/Vector.h> diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild deleted file mode 100644 index 98972468..00000000 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da -CMAKE_MAKEFILE_GENERATOR="ninja" -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby23 ruby24 ruby25" - -inherit check-reqs cmake-utils 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="http://code.qt.io/cgit/qt/${PN}.git/snapshot/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD LGPL-2+" -SLOT="5/5.212" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="geolocation gles2 +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" -RDEPEND=" - 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-base:1.0 - media-libs/gst-plugins-bad:1.0 - ) - hyphen? ( dev-libs/hyphen ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) - opengl? ( - >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] - >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=] - ) - 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 - ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - ${RUBY_DEPS} - dev-lang/perl - dev-util/gperf - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig -" - -S=${WORKDIR}/${COMMIT} - -PATCHES=( "${FILESDIR}/${P}-functional.patch" ) - -CHECKREQS_DISK_BUILD="16G" # bug 417307 - -_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_GEOLOCATION=$(usex geolocation) - -DUSE_GSTREAMER=$(usex gstreamer) - -DENABLE_JIT=$(usex jit) - -DUSE_QT_MULTIMEDIA=$(usex multimedia) - -DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_DEVICE_ORIENTATION=$(usex orientation) - -DENABLE_WEBKIT2=$(usex qml) - $(cmake-utils_use_find_package webp WebP) - -DENABLE_X11_TARGET=$(usex X) - ) - - if has_version "virtual/rubygems[ruby_targets_ruby25]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) - elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) ) - else - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby23) ) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_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 -} |