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

[Sandro Knauß]

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

The following commit has been merged in the experimental branch:
commit fb659b5797fac6aa9f7ae0d0e294dd4e9cdce806
Author: Sandro Knauß <hefee at debian.org>
Date:   Sat Jul 1 20:18:24 2017 +0200

    Add patch system-lcms2.patch - use system lcms2
---
 debian/changelog                  |  2 +
 debian/control                    |  1 +
 debian/patches/series             |  1 +
 debian/patches/system-lcms2.patch | 80 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1fa409a..e351747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ qtwebengine-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
   * Update Excluded-File list
   * Clean qmake caches in clean step
   * Update copyright file.
+  * Add patch system-lcms2.patch - use system lcms2
+  * Add liblcms2-dev to Build-Deps
 
   [ Simon Quigley ]
   * New upstream release. (Closes: #865273)
diff --git a/debian/control b/debian/control
index 2935488..4218edd 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Build-Depends: autotools-dev,
                libminizip-dev,
                libnss3-dev,
                libopus-dev,
+               liblcms2-dev,
                libpci-dev,
                libpng-dev,
                libprotobuf-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 4e307f6..2d92e76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 linux-pri.patch
 system-re2.patch
+system-lcms2.patch
 system-nspr-prtime.patch
 system-icu-utf.patch
 no-icudtl-dat.patch
diff --git a/debian/patches/system-lcms2.patch b/debian/patches/system-lcms2.patch
new file mode 100644
index 0000000..3570592
--- /dev/null
+++ b/debian/patches/system-lcms2.patch
@@ -0,0 +1,80 @@
+Description: Use system lcms2
+Author: Sandro Knauß <hefee at debian.org>
+Origin: Debian
+Forwarded: https://bugreports.qt.io/browse/QTBUG-61746
+Reviewed-by: Sandro Knauß <hefee at debian.org>
+Last-Update: 2017-07-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
+@@ -140,58 +140,21 @@ if (!pdf_use_skia && !pdf_use_skia_paths
+   }
+ }
+ 
+-config("fx_lcms2_warnings") {
+-  visibility = [ ":*" ]
+-  if (is_clang) {
+-    cflags = [
+-      # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
+-      # library doesn't appear to have this problem.
+-      "-Wno-missing-braces",
++import("//build/shim_headers.gni")
+ 
+-      # FindPrev() in cmsplugin.c is unused.
+-      "-Wno-unused-function",
+-    ]
+-  }
++shim_headers("lcms2_shim") {
++  root_path = "lcms2-2.6/include"
++  headers = [
++    "lcms2.h",
++    "lcms2_plugin.h",
++  ]
+ }
+ 
+-static_library("fx_lcms2") {
+-  configs -= [ "//build/config/compiler:chromium_code" ]
+-  configs += [
+-    "//build/config/compiler:no_chromium_code",
+-    ":pdfium_third_party_config",
+-
+-    # Must be after no_chromium_code for warning flags to be ordered correctly.
+-    ":fx_lcms2_warnings",
+-  ]
+-  sources = [
+-    "lcms2-2.6/include/lcms2.h",
+-    "lcms2-2.6/include/lcms2_plugin.h",
+-    "lcms2-2.6/src/cmscam02.c",
+-    "lcms2-2.6/src/cmscgats.c",
+-    "lcms2-2.6/src/cmscnvrt.c",
+-    "lcms2-2.6/src/cmserr.c",
+-    "lcms2-2.6/src/cmsgamma.c",
+-    "lcms2-2.6/src/cmsgmt.c",
+-    "lcms2-2.6/src/cmshalf.c",
+-    "lcms2-2.6/src/cmsintrp.c",
+-    "lcms2-2.6/src/cmsio0.c",
+-    "lcms2-2.6/src/cmsio1.c",
+-    "lcms2-2.6/src/cmslut.c",
+-    "lcms2-2.6/src/cmsmd5.c",
+-    "lcms2-2.6/src/cmsmtrx.c",
+-    "lcms2-2.6/src/cmsnamed.c",
+-    "lcms2-2.6/src/cmsopt.c",
+-    "lcms2-2.6/src/cmspack.c",
+-    "lcms2-2.6/src/cmspcs.c",
+-    "lcms2-2.6/src/cmsplugin.c",
+-    "lcms2-2.6/src/cmsps2.c",
+-    "lcms2-2.6/src/cmssamp.c",
+-    "lcms2-2.6/src/cmssm.c",
+-    "lcms2-2.6/src/cmstypes.c",
+-    "lcms2-2.6/src/cmsvirt.c",
+-    "lcms2-2.6/src/cmswtpnt.c",
+-    "lcms2-2.6/src/cmsxform.c",
++source_set("fx_lcms2") {
++  deps = [
++    ":lcms2_shim",
+   ]
++  libs = ["lcms2"]
+ }
+ 
+ # This is only used for standalone builds.

-- 
qtwebengine packaging