[SCM] qt5webkit packaging branch, kubuntu_unstable, updated. debian/5.4.1+dfsg-3-4-g1c95c62

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 186ac1901cfa2538bb771ebb9af6bd33e0ce7e66
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Mar 2 11:25:42 2015 +0300

    Update leveldb_memenv_path.diff to make it really work.
---
 debian/changelog                        |  2 ++
 debian/patches/leveldb_memenv_path.diff | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6a9c54..10f4e86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtwebkit-opensource-src (5.4.1+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update leveldb_memenv_path.diff to make it really work.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Mar 2015 11:18:08 +0300
 
diff --git a/debian/patches/leveldb_memenv_path.diff b/debian/patches/leveldb_memenv_path.diff
index 1f7dac5..5d1f6b1 100644
--- a/debian/patches/leveldb_memenv_path.diff
+++ b/debian/patches/leveldb_memenv_path.diff
@@ -2,7 +2,7 @@ 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
+Last-Update: 2015-03-02
 
 --- a/Tools/qmake/config.tests/leveldb/leveldb.cpp
 +++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp
@@ -15,4 +15,14 @@ Last-Update: 2015-02-28
  
  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>

-- 
qt5webkit packaging