[SCM] qt5webkit packaging branch, experimental, updated. debian/5.4.0+dfsg-1-7-g6224dba

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=6224dba

The following commit has been merged in the experimental branch:
commit 6224dbae7fb67d3591a7fbd9b1e3ed9748d00fc5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Feb 28 21:07:17 2015 +0300

    Add a patch to use Debian path to memenv.h.
---
 debian/changelog                        |  1 +
 debian/patches/leveldb_memenv_path.diff | 18 ++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c7c86c6..fc4316b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtwebkit-opensource-src (5.4.1+dfsg-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.4.1.
   * Build-depend on libleveldb-dev so that the system leveldb copy
     is used, and not the private one.
+    - Add a patch to use Debian path to memenv.h.
   * Refresh patches for the new release.
   * Minor debian/copyright updates.
 
diff --git a/debian/patches/leveldb_memenv_path.diff b/debian/patches/leveldb_memenv_path.diff
new file mode 100644
index 0000000..1f7dac5
--- /dev/null
+++ b/debian/patches/leveldb_memenv_path.diff
@@ -0,0 +1,18 @@
+Description: in Debian, memenv.h is on a different path
+ See 0113-makefile_memenv.patch in leveldb packaging.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-02-28
+
+--- 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**)
+ {
+
diff --git a/debian/patches/series b/debian/patches/series
index ab2532d..37a0aab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ no_gc_sections.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
 fix_nonlinux_glibc_linkage.diff
+leveldb_memenv_path.diff

-- 
qt5webkit packaging