[SCM] qtwebengine packaging branch, master, updated. debian/5.9.2+dfsg-1-2-gf528c60

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Oct 27 18:35:00 UTC 2017


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

The following commit has been merged in the master branch:
commit ff8ba0abc3042a930f1b7b3e2d0cf5d5ab29348d
Author: Sandro Knauß <hefee at debian.org>
Date:   Wed Oct 18 00:16:28 2017 +0200

    Update patch hunks.
---
 debian/changelog               | 1 +
 debian/patches/linux-pri.patch | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69e37d0..bd3d5df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebengine-opensource-src (5.9.2+dfsg-1~) UNRELEASED; urgency=medium
   [ Sandro Knauß ]
   * New upstream release.
   * Remove upstream applied patch: armhf-options.patch
+  * Update patch hunks.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Oct 2017 23:57:46 +0200
 
diff --git a/debian/patches/linux-pri.patch b/debian/patches/linux-pri.patch
index 1f63099..6493f9b 100644
--- a/debian/patches/linux-pri.patch
+++ b/debian/patches/linux-pri.patch
@@ -7,11 +7,10 @@ Reviewed-by: Sandro Knauß <hefee at debian.org>
 Last-Update: 2017-06-29
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-linux-pri/src/core/config/linux.pri
---- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri	2017-05-19 06:22:04.000000000 +0200
-+++ qtwebengine-opensource-src-5.9.0-linux-pri/src/core/config/linux.pri	2017-06-08 00:20:53.688419747 +0200
-@@ -148,3 +148,22 @@
-     use?(system_ffmpeg):   gn_args += use_system_ffmpeg=true
+--- a/src/core/config/linux.pri
++++ b/src/core/config/linux.pri
+@@ -153,3 +153,22 @@ host_build {
+     use?(system_re2):      gn_args += use_system_re2=true
      #use?(system_protobuf): gn_args += use_system_protobuf=true
  }
 +

-- 
qtwebengine packaging



More information about the pkg-kde-commits mailing list