From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA788138334 for ; Fri, 21 Sep 2018 11:26:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1B5AE0866; Fri, 21 Sep 2018 11:26:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B64A1E0866 for ; Fri, 21 Sep 2018 11:26:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4240335D19 for ; Fri, 21 Sep 2018 11:26:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D72253D7 for ; Fri, 21 Sep 2018 11:26:16 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1537529148.b858236bcaf2dfacdeb7c9e129ad71b24d44f35f.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch dev-qt/qtwebengine/qtwebengine-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ dev-qt/qtwebengine/files/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: b858236bcaf2dfacdeb7c9e129ad71b24d44f35f X-VCS-Branch: master Date: Fri, 21 Sep 2018 11:26:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 602599d9-5bab-49fe-8a12-9d005636ca6b X-Archives-Hash: e4b32e652a07636469a476268bf08f6c commit: b858236bcaf2dfacdeb7c9e129ad71b24d44f35f Author: Jimi Huotari gentoo org> AuthorDate: Fri Sep 21 11:25:48 2018 +0000 Commit: Jimi Huotari gentoo 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 --#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" )