diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-03-15 05:20:44 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-03-15 05:20:44 +1100 |
| commit | fa9569964aba22b7849b2a91b38d4479e3a6293e (patch) | |
| tree | cfed1274a6d1a401925b1a05f2c91564ed1ee3c2 | |
| parent | app-text/coolreader3: add freetype2 fix by yoshi314 from forums (diff) | |
| download | qt-fa956996.tar.gz qt-fa956996.tar.bz2 qt-fa956996.zip | |
[dev-qt/qtwebkit] Ensure system copy of dev-libs/leveldb is used wrt bug #519190.
Package-Manager: portage-2.2.17
| -rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch | 25 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild | 3 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild | 3 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 3 |
4 files changed, 34 insertions, 0 deletions
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch new file mode 100644 index 00000000..0a476c64 --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-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/qtwebkit-5.4.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild index 568f10ea..48021cc6 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild @@ -24,6 +24,7 @@ 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] @@ -65,6 +66,8 @@ DEPEND="${RDEPEND} virtual/rubygems " +PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" ) + src_prepare() { if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild index 568f10ea..48021cc6 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild @@ -24,6 +24,7 @@ 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] @@ -65,6 +66,8 @@ DEPEND="${RDEPEND} virtual/rubygems " +PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" ) + src_prepare() { if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild index 568f10ea..48021cc6 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild @@ -24,6 +24,7 @@ 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] @@ -65,6 +66,8 @@ DEPEND="${RDEPEND} virtual/rubygems " +PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" ) + src_prepare() { if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" |