[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jimi Huotari" <chiitoo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
Date: Fri, 24 Aug 2018 22:58:31 +0000 (UTC)	[thread overview]
Message-ID: <1535151288.02166c221b4f60cafef3e1b3499de924ad583a25.chiitoo@gentoo> (raw)

commit:     02166c221b4f60cafef3e1b3499de924ad583a25
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 22:54:00 2018 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 22:54:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=02166c22

dev-qt/qtwebengine: update libxml catalogs patches

The Chromium part has been upstreamed, and is no longer needed in
5.11.2 nor in 5.12.

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 ...webengine-5.11.1-libxml2-disable-catalogs.patch | 35 ----------------------
 ...webengine-5.11.2-libxml2-disable-catalogs.patch | 12 ++++++++
 ...webengine-5.12.0-libxml2-disable-catalogs.patch | 35 ----------------------
 dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild    |  2 +-
 dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild    |  2 +-
 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild       |  2 +-
 6 files changed, 15 insertions(+), 73 deletions(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
deleted file mode 100644
index 7e0efcf3..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/config.tests/xml2/xml2.cpp
-+++ b/config.tests/xml2/xml2.cpp
-@@ -27,9 +27,6 @@
- ****************************************************************************/
- 
- #include <libxml/xmlversion.h>
--#if defined(LIBXML_CATALOG_ENABLED)
--#error "libxml catalog enabled"
--#endif
- #if !defined(LIBXML_ICU_ENABLED)
- #error "libxml icu not enabled"
- #endif
---- a/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
-@@ -28,6 +28,10 @@
- 
- #include <libxml/parser.h>
- #include <libxml/parserInternals.h>
-+#include <libxml/xmlversion.h>
-+#if defined(LIBXML_CATALOG_ENABLED)
-+#include <libxml/catalog.h>
-+#endif
- #include <libxslt/xslt.h>
- #include <memory>
- #include "core/css/StyleEngine.h"
-@@ -646,6 +650,9 @@
-   if (did_init)
-     return;
- 
-+#if defined(LIBXML_CATALOG_ENABLED)
-+  xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
-+#endif
-   xmlInitParser();
-   xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
-   xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch
new file mode 100644
index 00000000..5fd14b0d
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch
@@ -0,0 +1,12 @@
+--- a/config.tests/xml2/xml2.cpp
++++ b/config.tests/xml2/xml2.cpp
+@@ -27,9 +27,6 @@
+ ****************************************************************************/
+ 
+ #include <libxml/xmlversion.h>
+-#if defined(LIBXML_CATALOG_ENABLED)
+-#error "libxml catalog enabled"
+-#endif
+ #if !defined(LIBXML_ICU_ENABLED)
+ #error "libxml icu not enabled"
+ #endif

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch
deleted file mode 100644
index 6093b145..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/config.tests/xml2/xml2.cpp
-+++ b/config.tests/xml2/xml2.cpp
-@@ -27,9 +27,6 @@
- ****************************************************************************/
- 
- #include <libxml/xmlversion.h>
--#if defined(LIBXML_CATALOG_ENABLED)
--#error "libxml catalog enabled"
--#endif
- #if !defined(LIBXML_ICU_ENABLED)
- #error "libxml icu not enabled"
- #endif
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-@@ -28,6 +28,10 @@
- 
- #include <libxml/parser.h>
- #include <libxml/parserInternals.h>
-+#include <libxml/xmlversion.h>
-+#if defined(LIBXML_CATALOG_ENABLED)
-+#include <libxml/catalog.h>
-+#endif
- #include <libxslt/xslt.h>
- 
- #include <memory>
-@@ -646,6 +650,9 @@ static void InitializeLibXMLIfNecessary() {
-   if (did_init)
-     return;
- 
-+#if defined(LIBXML_CATALOG_ENABLED)
-+  xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
-+#endif
-   xmlInitParser();
-   xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
-   xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 32fb11c5..c3b6285f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -79,7 +79,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES+=(
-	"${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078
+	"${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078
 	"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
 )
 

diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 91c3f9fb..7c793ad2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -78,7 +78,7 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES+=( "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" ) # bug 653078
+PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078
 
 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 91c3f9fb..7c793ad2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -78,7 +78,7 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES+=( "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" ) # bug 653078
+PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078
 
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )

next             reply	other threads:[~2018-08-24 22:58 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-24 22:58 Jimi Huotari [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-23 13:35 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ Andreas Sturmlechner
2022-06-18 14:27 Andreas Sturmlechner
2022-04-09 15:05 Andreas Sturmlechner
2022-04-05 17:07 Andreas Sturmlechner
2021-12-24 23:33 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-03-14 15:36 Andreas Sturmlechner
2020-06-03 10:45 Andreas Sturmlechner
2020-05-10  5:40 Jimi Huotari
2020-04-30  9:26 Andreas Sturmlechner
2020-02-28 20:34 Jimi Huotari
2020-02-10  6:47 Andreas Sturmlechner
2019-10-29 23:54 Jimi Huotari
2019-09-30 19:28 Andreas Sturmlechner
2019-03-16 22:39 Andreas Sturmlechner
2019-02-05 20:38 Andreas Sturmlechner
2019-02-04 18:40 Jimi Huotari
2018-10-31 19:29 Jimi Huotari
2018-09-21 11:26 Jimi Huotari
2018-08-25  4:32 Jimi Huotari
2018-06-16 18:06 Andreas Sturmlechner
2018-04-11 12:56 Jimi Huotari
2017-12-09 23:02 Jimi Huotari
2017-06-04  5:10 Michael Palimaka
2016-12-06  8:21 Michael Palimaka
2016-12-06  7:24 Michael Palimaka
2016-05-08  1:28 Davide Pesavento
2016-04-19  1:21 Davide Pesavento
2016-01-17 19:14 Michael Palimaka

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7e0efcf dfblob:5fd14b0 dfblob:6093b14 dfblob:32fb11c
dfblob:c3b6285 dfblob:91c3f9f dfblob:7c793ad dfblob:91c3f9f
dfblob:7c793ad )
 OR (
bs:"[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1535151288.02166c221b4f60cafef3e1b3499de924ad583a25.chiitoo@gentoo \
    --to=chiitoo@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox