Attachment #533630 for bug #653078

View | Details | Raw Unified | Return to bug 653078 | Differences between

and this patch




--- /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" ]

Lines 26-33 RDEPEND=" Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild (-2 / +6 lines)
26	~dev-qt/qtwebchannel-${PV}[qml]	26	~dev-qt/qtwebchannel-${PV}[qml]
27	dev-libs/expat	27	dev-libs/expat
28	dev-libs/libevent:=	28	dev-libs/libevent:=
29	dev-libs/libxml2[icu]	29	dev-libs/libxml2[catalogless,icu]
30	dev-libs/libxslt	30	dev-libs/libxslt[catalogless]
31	dev-libs/protobuf:=	31	dev-libs/protobuf:=
32	dev-libs/re2:=	32	dev-libs/re2:=
33	media-libs/fontconfig	33	media-libs/fontconfig
Lines 77-82 DEPEND="${RDEPEND} Link Here
77	pax_kernel? ( sys-apps/elfix )	77	pax_kernel? ( sys-apps/elfix )
78	"	78	"
79		79
		80	PATCHES=(
		81	"${FILESDIR}/${PN}-5.11.0-libxml2-catalogless_libxslt-catalogless.patch"
		82	)
		83
80	src_prepare() {	84	src_prepare() {
81	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )	85	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
82		86

Lines 26-33 RDEPEND=" Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild (-3 / +6 lines)
26	~dev-qt/qtwebchannel-${PV}[qml]	26	~dev-qt/qtwebchannel-${PV}[qml]
27	dev-libs/expat	27	dev-libs/expat
28	dev-libs/libevent:=	28	dev-libs/libevent:=
29	dev-libs/libxml2[icu]	29	dev-libs/libxml2[catalogless,icu]
30	dev-libs/libxslt	30	dev-libs/libxslt[catalogless]
31	dev-libs/protobuf:=	31	dev-libs/protobuf:=
32	dev-libs/re2:=	32	dev-libs/re2:=
33	media-libs/fontconfig	33	media-libs/fontconfig
Lines 77-82 DEPEND="${RDEPEND} Link Here
77	pax_kernel? ( sys-apps/elfix )	77	pax_kernel? ( sys-apps/elfix )
78	"	78	"
79		79
		80	PATCHES=(
		81	"${FILESDIR}/${PN}-5.11.0-libxml2-catalogless_libxslt-catalogless.patch"
		82	)
		83
80	src_prepare() {	84	src_prepare() {
81	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )	85	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
82	use system-icu && has_version ">=dev-libs/icu-59" && \	86	use system-icu && has_version ">=dev-libs/icu-59" && \
83	-

Return to bug 653078

Line 0 Link Here

(-)a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-libxml2-catalogless_libxslt-catalogless.patch (+62 lines)
	1	--- /config.tests/xml2/xml2.pro
	2	+++ /config.tests/xml2/xml2.pro
	3	@@ -1,3 +1,3 @@
	4	SOURCES = xml2.cpp
	5	CONFIG += link_pkgconfig
	6	-PKGCONFIG += libxml-2.0
	7	+PKGCONFIG += libxml-2.0-catalogless
	8	--- /configure.json
	9	+++ /configure.json
	10	@@ -118,7 +118,7 @@
	11	"webengine-libxml2": {
	12	"label": "libxml2 and libxslt",
	13	"sources": [
	14	- { "type": "pkgConfig", "args": "libxml-2.0 libxslt" }
	15	+ { "type": "pkgConfig", "args": "libxml-2.0-catalogless libxslt-catalogless" }
	16	]
	17	},
	18	"webengine-jsoncpp": {
	19	--- /src/3rdparty/chromium/build/linux/unbundle/libxml.gn
	20	+++ /src/3rdparty/chromium/build/linux/unbundle/libxml.gn
	21	@@ -5,7 +5,7 @@
	22	import("//build/config/linux/pkg_config.gni")
	23
	24	pkg_config("system_libxml") {
	25	- packages = [ "libxml-2.0" ]
	26	+ packages = [ "libxml-2.0-catalogless" ]
	27	}
	28
	29	static_library("libxml") {
	30	--- /src/3rdparty/chromium/build/linux/unbundle/libxslt.gn
	31	+++ /src/3rdparty/chromium/build/linux/unbundle/libxslt.gn
	32	@@ -5,7 +5,7 @@
	33	import("//build/config/linux/pkg_config.gni")
	34
	35	pkg_config("system_libxslt") {
	36	- packages = [ "libxslt" ]
	37	+ packages = [ "libxslt-catalogless" ]
	38	}
	39
	40	source_set("libxslt") {
	41	--- /src/3rdparty/chromium/third_party/libxml/BUILD.gn
	42	+++ /src/3rdparty/chromium/third_party/libxml/BUILD.gn
	43	@@ -249,7 +249,7 @@
	44	if (use_system_libxml) {
	45	import("//build/config/linux/pkg_config.gni")
	46	pkg_config("system_libxml") {
	47	- packages = [ "libxml-2.0" ]
	48	+ packages = [ "libxml-2.0-catalogless" ]
	49	}
	50	source_set("libxml") {
	51	sources = [
	52	--- /src/3rdparty/chromium/third_party/libxslt/BUILD.gn
	53	+++ /src/3rdparty/chromium/third_party/libxslt/BUILD.gn
	54	@@ -109,7 +109,7 @@
	55	if (use_system_libxslt) {
	56	import("//build/config/linux/pkg_config.gni")
	57	pkg_config("system_libxslt") {
	58	- packages = [ "libxslt" ]
	59	+ packages = [ "libxslt-catalogless" ]
	60	}
	61	source_set("libxslt") {
	62	public_configs = [ ":system_libxslt" ]