summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-06-17 15:24:04 +0000
committerDavide Pesavento <pesa@gentoo.org>2015-06-17 15:24:04 +0000
commit0e3f32d6de84fc8af3f72075d49cd2c19bc69b82 (patch)
tree5b81bb05749e58852e34d2fee01c315b49257545 /dev-qt
parentVersion bump. (diff)
downloadgentoo-2-0e3f32d6de84fc8af3f72075d49cd2c19bc69b82.tar.gz
gentoo-2-0e3f32d6de84fc8af3f72075d49cd2c19bc69b82.tar.bz2
gentoo-2-0e3f32d6de84fc8af3f72075d49cd2c19bc69b82.zip
Version bump.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtwebkit/ChangeLog9
-rw-r--r--dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch25
-rw-r--r--dev-qt/qtwebkit/metadata.xml2
-rw-r--r--dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild (renamed from dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild)36
4 files changed, 54 insertions, 18 deletions
diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index 3ca098eff673..e0fcddf0aad6 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-qt/qtwebkit
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.37 2015/05/30 10:56:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.38 2015/06/17 15:24:04 pesa Exp $
+
+*qtwebkit-5.4.2 (17 Jun 2015)
+
+ 17 Jun 2015; Davide Pesavento <pesa@gentoo.org>
+ +files/qtwebkit-5.4.2-system-leveldb.patch, +qtwebkit-5.4.2.ebuild,
+ -qtwebkit-5.4.1.ebuild, metadata.xml:
+ Version bump.
30 May 2015; Markus Meier <maekke@gentoo.org> qtwebkit-4.8.6-r1.ebuild:
arm stable, bug #530238
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
new file mode 100644
index 000000000000..0a476c646c52
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -0,0 +1,25 @@
+Correct header location so system dev-libs/leveldb can be detected.
+
+--- Tools/qmake/config.tests/leveldb/leveldb.cpp
++++ 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**)
+ {
+
+--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
++++ 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/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 06b10e2ec97b..0ca02a93e967 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -14,6 +14,6 @@
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>http://qt-project.org/doc/</doc>
+ <doc>http://doc.qt.io/</doc>
</upstream>
</pkgmetadata>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
index a7b64c34316d..429c9c21562f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
@@ -1,18 +1,14 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild,v 1.4 2015/05/16 10:39:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild,v 1.1 2015/06/17 15:24:04 pesa Exp $
EAPI=5
-
PYTHON_COMPAT=( python2_7 )
-
inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework"
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
- KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
@@ -24,16 +20,17 @@ 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}:5[debug=,icu]
- >=dev-qt/qtgui-${PV}:5[debug=]
- >=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtsql-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
+ >=dev-qt/qtcore-${PV}:5[icu]
+ >=dev-qt/qtgui-${PV}:5
+ >=dev-qt/qtnetwork-${PV}:5
+ >=dev-qt/qtsql-${PV}:5
+ >=dev-qt/qtwidgets-${PV}:5
media-libs/fontconfig:1.0
media-libs/libpng:0=
- sys-libs/zlib
+ >=sys-libs/zlib-1.2.5
virtual/jpeg:0
virtual/opengl
x11-libs/libX11
@@ -49,10 +46,10 @@ RDEPEND="
media-libs/gstreamer:0.10
media-libs/gst-plugins-base:0.10
)
- multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
- opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
- printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
- qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+ multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
+ opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
"
@@ -65,7 +62,14 @@ DEPEND="${RDEPEND}
virtual/rubygems
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+)
+
src_prepare() {
+ # ensure bundled library cannot be used
+ rm -r Source/ThirdParty/leveldb || die
+
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
elif ! use gstreamer; then