commit: b858236bcaf2dfacdeb7c9e129ad71b24d44f35f Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Fri Sep 21 11:25:48 2018 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Fri Sep 21 11:25:48 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b858236b
dev-qt/qtwebengine: remove upstreamed libxml catalog patch With 5.9999 no longer needing this, it can be fully removed. Package-Manager: Portage-2.3.49, Repoman-2.3.10 .../files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch | 12 ------------ dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 +---- 2 files changed, 1 insertion(+), 16 deletions(-) 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 deleted file mode 100644 index 5fd14b0d..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch +++ /dev/null @@ -1,12 +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 diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 63a7df36..4fab7ab9 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -79,10 +79,7 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " -PATCHES+=( - "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078 - "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" -) +PATCHES+=( "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" ) src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )