summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/Manifest.gzbin9840 -> 9841 bytes
-rw-r--r--dev-qt/qtwebkit/Manifest9
-rw-r--r--dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch25
-rw-r--r--dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch15
-rw-r--r--dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch15
-rw-r--r--dev-qt/qtwebkit/metadata.xml1
-rw-r--r--dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild2
-rw-r--r--dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild120
8 files changed, 3 insertions, 184 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 3da36e3e985d..6aa6bc6c433b 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
Binary files differ
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 58e3f3ec1e59..4d19565cc0f1 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,9 +1,4 @@
AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
-AUX qtwebkit-5.4.2-system-leveldb.patch 711 BLAKE2B 26eb498e422836585b2fb2c1212600bc57ef2b13ed64c790efd346e7a8e780132f3158775bf5df0aefcb795f8f50e510dc065114fb71521bd0afa116f29575e1 SHA512 d95d6e697d5e0b951465180d3f6bfa0ac16fc0f7a29504f773cf3bb28b1a7472f7bab83f379ea980851b6ed64a7d49cefcb27a503d37e5ce90110318628febcb
-AUX qtwebkit-5.5.1-disable-jit.patch 460 BLAKE2B a5ec0644d7f4341993cfbec916bc3c9d69ab992d29df3a62630bf077e211d6c1d3848a93ab25bb6bae2971e44518dafe2841c8b78d3556f1d8f1380d85269fb2 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749
-AUX qtwebkit-5.8.0-disable-gstreamer.patch 714 BLAKE2B 3bb7ec6976934e20d016fc6fa0421cab5d6ce51731a0c5a12b92b6e1611a75396f9db751074f7d9ffdb1c000b1964689d69606ba16e29f3ee5329d141dd3c90a SHA512 7b47d5e549f8bc0113bdff596a191fff3f8c6deafd6ebc456e224c1657a07e0208c478fdd49b9790ef618371cb969ae8aaaf08f9c5f9eb10b5841817f0f8736d
DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
-DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
-EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3683 BLAKE2B b960501bca0851c9de347b0663b57e14a639fa90bdb67baa8f7e47e6ca137f6a9255fc7bfc42afa9a8751d9fd57618529d0ee686e398c5f1db4e6c83a5e0dfa6 SHA512 e8bb2a796964a5e93a607ede7479c212717a2ca65ee4891e15c811c57dfdfd4ff0e66b4f2e68536d6aead0fce6dd3f2c9f993c13d9c8be381cc26fcc85b119f4
-EBUILD qtwebkit-5.9.1.ebuild 3503 BLAKE2B 0bed04771bb14fbea809c3a2db5254943883f34b971b459c3c2a3f008660b24c4813b800cd14bc4a47c1d807ed17725e16eddc30f6f50ed62cf678931d6e2f87 SHA512 5b80352dcf1f6be843cd94b90c90552c06662494359b1d84a91e495274674fc3bc9a807e8e86d67da96ca28e00c7a74590a250e74d845183ff53fd002bec51c9
-MISC metadata.xml 1374 BLAKE2B 582f07a66b4dd4ff72e865c69596a364247bffbe1c11ea4a77c38c8b1dd6af6062a97889116387a251e890aee572724f2293e7b281fb5200fa3b3c1b91d4ccde SHA512 6f845148e018566a18f4dc86f1ff2224c45e5a135083263f7335fb0bb7a5ebba620787485ac1746f5207854b752be9ab3e5385b4fed63251359172bd4c196742
+EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3682 BLAKE2B b7927633dff0c5164841ac131e33312da8ef11353ac5cc30f95c1028c61b5d5cf7e5ec1b9c03526e4ef593afee8771fc66eb7cca24e5e86791a9ac8e34f917d0 SHA512 404d039ece1c9865a1b629bb2ab79a497162740878e6aaa8f62975f4ba36193d3962a9c108c06408188cd38b0eef4801f54a572103dcecc5af7e9a3eba94a027
+MISC metadata.xml 1286 BLAKE2B 61122c95e3fa0f411df1923511df20b059237bf11788a1932e8051d63120ef752c3e73a6a6b6a32e260ae8604e317241e024ae82d3c1c9dbe3d0567dc3565e2b SHA512 4f5bb2036a92a35fcd6dffae3bf3ed1b0a1e55c685765c5374659c909261d9f56a0c31f278b9fd151c0e86601dfd4ce91f7ed0b2de3c2a8afcea26efbaec9c03
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
deleted file mode 100644
index 265d5075f2fa..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Correct header location so system dev-libs/leveldb can be detected.
-
---- a/Tools/qmake/config.tests/leveldb/leveldb.cpp
-+++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp
-@@ -19,7 +19,7 @@
-
- #include <leveldb/db.h>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
-
- int main(int, char**)
- {
-
---- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-+++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-@@ -38,7 +38,7 @@
- #include <leveldb/comparator.h>
- #include <leveldb/db.h>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
- #include <leveldb/slice.h>
- #include <string>
- #include <wtf/PassOwnPtr.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
deleted file mode 100644
index 40e58f0d0dec..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow disabling JIT for hardened.
-
-Author: Magnus Granberg <zorry@gentoo.org>
-Gentoo-bug: 562396
-
---- a/Tools/qmake/mkspecs/features/features.pri
-+++ b/Tools/qmake/mkspecs/features/features.pri
-@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \
- ENABLE_INPUT_TYPE_WEEK=0 \
- ENABLE_INSPECTOR=1 \
- ENABLE_INSPECTOR_SERVER=1 \
-+ ENABLE_JIT=0 \
- ENABLE_JAVASCRIPT_DEBUGGER=1 \
- ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
- ENABLE_LEGACY_NOTIFICATIONS=1 \
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
deleted file mode 100644
index 867e8dcb8ef9..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -101,12 +101,6 @@ defineTest(detectFeatures) {
-
- # HTML5 Media Support for builds with GStreamer
- unix:!mac:qtConfig(pkg-config) {
-- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
-- WEBKIT_CONFIG += video use_gstreamer
-- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
-- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
-- }
-- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
- }
-
- !enable?(video):qtHaveModule(multimediawidgets) {
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index c7df499ff74f..f76a3bfaff32 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -14,7 +14,6 @@
<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
<flag name="qml">Build QML/QtQuick bindings</flag>
- <flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag>
<flag name="webp">Add support for WebP image format</flag>
</use>
<upstream>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
index 3cd293ab98c4..3896c99b4599 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="BSD LGPL-2+"
SLOT="5/5.212"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
REQUIRED_USE="
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
deleted file mode 100644
index 61024cda2c39..000000000000
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-QT_MIN_VER="5.9.1:5"
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp"
-REQUIRED_USE="?? ( gstreamer multimedia )"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/icu:=
- >=dev-libs/leveldb-1.18-r1:=
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=dev-qt/qtcore-${QT_MIN_VER}[icu]
- >=dev-qt/qtgui-${QT_MIN_VER}
- >=dev-qt/qtnetwork-${QT_MIN_VER}
- >=dev-qt/qtsql-${QT_MIN_VER}
- >=dev-qt/qtwidgets-${QT_MIN_VER}
- media-libs/fontconfig:1.0
- media-libs/libpng:0=
- >=sys-libs/zlib-1.2.5
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXrender
- geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
- opengl? (
- >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
- >=dev-qt/qtopengl-${QT_MIN_VER}
- )
- orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
- printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
- qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
- webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
- webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/ruby
- dev-util/gperf
- sys-devel/bison
- sys-devel/flex
- virtual/rubygems
- test? ( >=dev-qt/qttest-${QT_MIN_VER} )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
-)
-
-src_prepare() {
- # ensure bundled library cannot be used
- rm -r Source/ThirdParty/leveldb || die
-
- # force using system library
- sed -i -e 's/qtConfig(system-jpeg)/true/' \
- -e 's/qtConfig(system-png)/true/' \
- Tools/qmake/mkspecs/features/features.prf || die
-
- # bug 466216
- sed -i -e '/CONFIG +=/s/rpath//' \
- Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
- Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
- || die
-
- qt_use_disable_config opengl opengl Tools/qmake/mkspecs/features/features.prf
-
- qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod webchannel webchannel \
- Source/WebKit2/Target.pri \
- Source/WebKit2/WebKit2.pri
-
- if ! use gstreamer; then
- PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
- fi
-
- # bug 562396
- use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
-
- use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
- Tools/qmake/mkspecs/features/features.prf || die
-
- # bug 458222
- sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
- qt5-build_src_prepare
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 572056
- if [[ ! -f ${D%/}${QT5_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
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 21:03:15 +0000