[SCM] qtwebengine packaging branch, experimental, updated. debian/5.7.1+dfsg-6.1-28-gae664da

Sandro Knauß hefee at moszumanska.debian.org
Thu Jun 29 11:33:53 UTC 2017


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

The following commit has been merged in the experimental branch:
commit b85754aa0f318579191460528873e2bf1d2c2200
Author: Sandro Knauß <hefee at debian.org>
Date:   Thu Jun 29 13:25:11 2017 +0200

    Add dep3 headers for patches from Fedora
---
 debian/patches/linux-pri.patch          |  9 +++++++++
 debian/patches/no-icudtl-dat.patch      | 12 ++++++++++++
 debian/patches/system-icu-utf.patch     | 11 +++++++++++
 debian/patches/system-nspr-prtime.patch |  8 ++++++++
 debian/patches/system-re2.patch         |  8 ++++++++
 5 files changed, 48 insertions(+)

diff --git a/debian/patches/linux-pri.patch b/debian/patches/linux-pri.patch
index c671f6b..1f63099 100644
--- a/debian/patches/linux-pri.patch
+++ b/debian/patches/linux-pri.patch
@@ -1,3 +1,12 @@
+Description: some tweaks to linux.pri
+ use system libs, link libpci, run unbundling script
+Author: Kevin Kofler
+Origin: Fedora, http://pkgs.fedoraproject.org/cgit/rpms/qt5-qtwebengine.git/commit/qtwebengine-opensource-src-5.9.0-linux-pri.patch?id=c87d486b0024c40d9ecb66f76d518aadb53deb92
+Forwarded: not-needed
+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
diff --git a/debian/patches/no-icudtl-dat.patch b/debian/patches/no-icudtl-dat.patch
index 96a1583..497674b 100644
--- a/debian/patches/no-icudtl-dat.patch
+++ b/debian/patches/no-icudtl-dat.patch
@@ -1,3 +1,15 @@
+Description: Do not check for ICU data file
+ quick hack to avoid checking for the nonexistent icudtl.dat and silence the
+ resulting warnings - not upstreamable as is because it removes the fallback
+ mechanism for the ICU data directory (which is not used in our builds because
+ we use the system ICU, which embeds the data statically) completely
+Author: Kevin Kofler
+Origin: Fedora, http://pkgs.fedoraproject.org/cgit/rpms/qt5-qtwebengine.git/commit/qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch?id=4f844a7b2b6550e1d13c2ea973059eef0abcda99
+Forwarded: not-needed
+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/
 --- a/src/core/web_engine_library_info.cpp
 +++ b/src/core/web_engine_library_info.cpp
 @@ -254,24 +254,7 @@
diff --git a/debian/patches/system-icu-utf.patch b/debian/patches/system-icu-utf.patch
index 1c905e4..b3fb482 100644
--- a/debian/patches/system-icu-utf.patch
+++ b/debian/patches/system-icu-utf.patch
@@ -1,3 +1,14 @@
+Description: use the system ICU UTF functions
+ We already depend on ICU, so it is useless to copy these functions here.
+ I checked the history of that directory, and other than the renames I am
+ undoing, there were no modifications at all.
+Author: Kevin, Kofler
+Origin: Fedora, http://pkgs.fedoraproject.org/cgit/rpms/qt5-qtwebengine.git/tree/qtwebengine-opensource-src-5.9.0-system-icu-utf.patch?id=ac7d2ae4c97de63eac6cf0e3d270b6b9c743acfa
+Forwarded: not-needed
+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-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.9.0-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn
 --- qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn	2017-06-08 10:52:51.565409865 +0200
 +++ qtwebengine-opensource-src-5.9.0-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn	2017-06-08 11:13:47.297983554 +0200
diff --git a/debian/patches/system-nspr-prtime.patch b/debian/patches/system-nspr-prtime.patch
index cc4f1b5..73f7411 100644
--- a/debian/patches/system-nspr-prtime.patch
+++ b/debian/patches/system-nspr-prtime.patch
@@ -1,3 +1,11 @@
+Description: Use system NSPR prtime
+Author: Kevin Kofler
+Origin: Fedora, http://pkgs.fedoraproject.org/cgit/rpms/qt5-qtwebengine.git/tree/qtwebengine-opensource-src-5.9.0-system-nspr-prtime.patch?id=f6784380ac380455d2c88b78543c5a4c2c5d0578
+Forwarded: not-needed
+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/
 --- a/src/3rdparty/chromium/base/BUILD.gn
 +++ b/src/3rdparty/chromium/base/BUILD.gn
 @@ -49,6 +49,9 @@
diff --git a/debian/patches/system-re2.patch b/debian/patches/system-re2.patch
index ac7bf5d..80735f4 100644
--- a/debian/patches/system-re2.patch
+++ b/debian/patches/system-re2.patch
@@ -1,3 +1,11 @@
+Description: Fix system re2 usage
+Author: Kevin Kofler
+Origin: Fedora, http://pkgs.fedoraproject.org/cgit/rpms/qt5-qtwebengine.git/commit/qtwebengine-opensource-src-5.9.0-system-re2.patch?id=ac7d2ae4c97de63eac6cf0e3d270b6b9c743acfa
+Forwarded: not-needed
+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/3rdparty/chromium/build/linux/unbundle/re2.gn qtwebengine-opensource-src-5.9.0-system-re2/src/3rdparty/chromium/build/linux/unbundle/re2.gn
 --- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/build/linux/unbundle/re2.gn	2017-05-18 16:51:44.000000000 +0200
 +++ qtwebengine-opensource-src-5.9.0-system-re2/src/3rdparty/chromium/build/linux/unbundle/re2.gn	2017-06-10 23:22:13.065385884 +0200

-- 
qtwebengine packaging



More information about the pkg-kde-commits mailing list