From 17dbb324b28067799e2604796dc0606cbca7fe40 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Mon, 28 May 2018 10:27:49 +0200
Subject: [PATCH] dev-qt/qtwebengine: Use libxml2-catalogless and
 libxslt-catalogless.

Bug: https://bugs.gentoo.org/653078
---
 ...xml2-catalogless_libxslt-catalogless.patch | 62 +++++++++++++++++++
 .../qtwebengine/qtwebengine-5.11.9999.ebuild  |  8 ++-
 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild  |  8 ++-
 3 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.11.0-libxml2-catalogless_libxslt-catalogless.patch

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-libxml2-catalogless_libxslt-catalogless.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-libxml2-catalogless_libxslt-catalogless.patch
new file mode 100644
index 00000000..7981bf2c
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-libxml2-catalogless_libxslt-catalogless.patch
@@ -0,0 +1,62 @@
+--- /config.tests/xml2/xml2.pro
++++ /config.tests/xml2/xml2.pro
+@@ -1,3 +1,3 @@
+ SOURCES = xml2.cpp
+ CONFIG += link_pkgconfig
+-PKGCONFIG += libxml-2.0
++PKGCONFIG += libxml-2.0-catalogless
+--- /configure.json
++++ /configure.json
+@@ -118,7 +118,7 @@
+         "webengine-libxml2": {
+             "label": "libxml2 and libxslt",
+             "sources": [
+-                { "type": "pkgConfig", "args": "libxml-2.0 libxslt" }
++                { "type": "pkgConfig", "args": "libxml-2.0-catalogless libxslt-catalogless" }
+             ]
+         },
+         "webengine-jsoncpp": {
+--- /src/3rdparty/chromium/build/linux/unbundle/libxml.gn
++++ /src/3rdparty/chromium/build/linux/unbundle/libxml.gn
+@@ -5,7 +5,7 @@
+ import("//build/config/linux/pkg_config.gni")
+ 
+ pkg_config("system_libxml") {
+-  packages = [ "libxml-2.0" ]
++  packages = [ "libxml-2.0-catalogless" ]
+ }
+ 
+ static_library("libxml") {
+--- /src/3rdparty/chromium/build/linux/unbundle/libxslt.gn
++++ /src/3rdparty/chromium/build/linux/unbundle/libxslt.gn
+@@ -5,7 +5,7 @@
+ import("//build/config/linux/pkg_config.gni")
+ 
+ pkg_config("system_libxslt") {
+-  packages = [ "libxslt" ]
++  packages = [ "libxslt-catalogless" ]
+ }
+ 
+ source_set("libxslt") {
+--- /src/3rdparty/chromium/third_party/libxml/BUILD.gn
++++ /src/3rdparty/chromium/third_party/libxml/BUILD.gn
+@@ -249,7 +249,7 @@
+ if (use_system_libxml) {
+   import("//build/config/linux/pkg_config.gni")
+   pkg_config("system_libxml") {
+-    packages = [ "libxml-2.0" ]
++    packages = [ "libxml-2.0-catalogless" ]
+   }
+   source_set("libxml") {
+     sources = [
+--- /src/3rdparty/chromium/third_party/libxslt/BUILD.gn
++++ /src/3rdparty/chromium/third_party/libxslt/BUILD.gn
+@@ -109,7 +109,7 @@
+ if (use_system_libxslt) {
+   import("//build/config/linux/pkg_config.gni")
+   pkg_config("system_libxslt") {
+-    packages = [ "libxslt" ]
++    packages = [ "libxslt-catalogless" ]
+   }
+   source_set("libxslt") {
+     public_configs = [ ":system_libxslt" ]
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 22f8752c..4df9a7ea 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	~dev-qt/qtwebchannel-${PV}[qml]
 	dev-libs/expat
 	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
+	dev-libs/libxml2[catalogless,icu]
+	dev-libs/libxslt[catalogless]
 	dev-libs/protobuf:=
 	dev-libs/re2:=
 	media-libs/fontconfig
@@ -77,6 +77,10 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11.0-libxml2-catalogless_libxslt-catalogless.patch"
+)
+
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
 
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 79fbf3c5..0d6ac1ec 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	~dev-qt/qtwebchannel-${PV}[qml]
 	dev-libs/expat
 	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
+	dev-libs/libxml2[catalogless,icu]
+	dev-libs/libxslt[catalogless]
 	dev-libs/protobuf:=
 	dev-libs/re2:=
 	media-libs/fontconfig
@@ -77,6 +77,10 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11.0-libxml2-catalogless_libxslt-catalogless.patch"
+)
+
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
 	use system-icu && has_version ">=dev-libs/icu-59" && \
-- 
2.17.0