diff options
author | Michael Palimaka <kensington@gentoo.org> | 2016-08-19 03:31:50 +1000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-08-19 03:34:12 +1000 |
commit | 5f870e235cb30bb6dd921292d859a8bbb5bd1ba7 (patch) | |
tree | 01ba409d0033fcc9a00bfc2954e13137a40c5901 /dev-qt/qtwebkit | |
parent | app-cdr/dvd+rw-tools: Apply more Fedora patches fixing more bugs (#230648 also) (diff) | |
download | gentoo-5f870e235cb30bb6dd921292d859a8bbb5bd1ba7.tar.gz gentoo-5f870e235cb30bb6dd921292d859a8bbb5bd1ba7.tar.bz2 gentoo-5f870e235cb30bb6dd921292d859a8bbb5bd1ba7.zip |
dev-qt: remove 5.6.0
Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-qt/qtwebkit')
-rw-r--r-- | dev-qt/qtwebkit/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch | 32 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild | 110 |
3 files changed, 0 insertions, 143 deletions
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index eefbc79b3a47..eb19e8af150c 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -2,6 +2,5 @@ DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e0 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 DIST qtwebkit-2.3.4.tar.gz 51648808 SHA256 c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca SHA512 f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4 WHIRLPOOL 1d8e78a8d7f920b132ed79dbc6a6a71b784080d8aa4b9123f22797efa6062eb4f85236ab66f3232900a131049d7c78fc5fc333511b161dc72c30434cd7fef542 DIST qtwebkit-opensource-src-5.5.1.tar.xz 33489924 SHA256 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 SHA512 a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a WHIRLPOOL a54eabaf72fdd4ffba4317b0c64b57da239605f0d1c8020be4282c0ce802727fd9321c4da14f9cb977419bedc97a4ac44cbc34e7003ff80ae31cfd983a577dc9 -DIST qtwebkit-opensource-src-5.6.0.tar.xz 35302972 SHA256 9ca72373841f3a868a7bcc696956cdb0ad7f5e678c693659f6f0b919fdd16dfe SHA512 d9a2d10960cbdf8cf144f1cdaebf52ff95a6ad70b94b19c9ffcd0dd653d98c1e1fab6516e7dc481a4d199af5fb98d36ac41a309e10b96ada0e18f581946bb1af WHIRLPOOL 851174164ed88d3edbffe78b95d3808809f035379a9b2210baad36bbf0f14376f33356c9c84f720c450776aca98bf7bcdf27c3624ccdb96bd3bdc34ec7804dcb DIST qtwebkit-opensource-src-5.6.1.tar.xz 35306084 SHA256 f5cfbfa5fad2b65a9be907d426f99694b86a04c3bb5a8814b21bd0ade4c672aa SHA512 fb244d1913fb4387757580758a43594becbfd3b9fedf53ce3026290ba66a7044f78e242e04269030e200648931bbd625a6192c3455374eafa6021bb7b35c682f WHIRLPOOL c3b00ad976c20f00b6984ba099fe0e03381629c78dde292ec524f2ef8b530c9875a1c57940a0a3652c9bd13afbab83414b66ce0c2e7c4752a9f729767921f70f DIST qtwebkit-opensource-src-5.7.0.tar.xz 35304268 SHA256 c7a3253cbf8e6035c54c3b08d8a9457bd82efbce71d4b363c8f753fd07bd34df SHA512 63c36f35132535c4391f8d0925cc2dfd88d7ec69cc9adefe383fefaec24f6f25280dd57bfb07eadf993506c310712078c315a90965eab09784eb3af9b6096436 WHIRLPOOL b65217bd11798833fa47c82b7cfc88fda4789afe3eaf9af6ed7045bf16b260b9ac466377104b05e57095e3c02234ca8b928c607e8adf45b509ef0bd789e52108 diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch b/dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch deleted file mode 100644 index 7fea8026def6..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> -Date: Mon, 22 Feb 2016 10:57:32 +0100 -Subject: [PATCH] Fix linking with libpthread - -WebKit use libpthread directly but is depending on other qt modules -causing it to be linked against, which might break unless -lpthread -is last. Instead just add it explicitly after the static libraries. - -Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 -Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> -(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df) -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> ---- - Tools/qmake/mkspecs/features/default_post.prf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf -index 67276b7..39bb3f7 100644 ---- a/Tools/qmake/mkspecs/features/default_post.prf -+++ b/Tools/qmake/mkspecs/features/default_post.prf -@@ -201,6 +201,7 @@ needToLink() { - linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir)) - LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs) - } -+ posix:!darwin: LIBS += -lpthread - } - - creating_module { --- -2.8.2 - diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild deleted file mode 100644 index 1ba763b7683e..000000000000 --- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build - -DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" -SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -# TODO: qttestlib - -IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp" -REQUIRED_USE="?? ( gstreamer gstreamer010 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-${PV}[icu] - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtsql-${PV} - ~dev-qt/qtwidgets-${PV} - 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-${PV} ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - ) - multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] ) - opengl? ( ~dev-qt/qtopengl-${PV} ) - orientation? ( ~dev-qt/qtsensors-${PV} ) - printsupport? ( ~dev-qt/qtprintsupport-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV} ) - webchannel? ( ~dev-qt/qtwebchannel-${PV} ) - webp? ( media-libs/libwebp:0= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex - virtual/rubygems -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" - "${FILESDIR}/${PN}-5.6.0-pthread.patch" # bug 581282 -) - -src_prepare() { - # ensure bundled library cannot be used - rm -r Source/ThirdParty/leveldb || 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_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 gstreamer010; then - PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch") - elif ! use gstreamer; then - PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch") - fi - - # bug 562396 - use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch") - - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ - Tools/qmake/mkspecs/features/features.prf || die - 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 -} |