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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46E7715823F for ; Sat, 18 Nov 2023 13:20:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73D352BC014; Sat, 18 Nov 2023 13:20:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 584072BC014 for ; Sat, 18 Nov 2023 13:20:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 649D3335C7E for ; Sat, 18 Nov 2023 13:20:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80745F1A for ; Sat, 18 Nov 2023 13:20:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1700313620.6746ba0521ba0d7d8a00fc0b087e9fb08ffae648.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdoctools/, kde-frameworks/kdoctools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kdoctools/files/kdoctools-5.112.0-libxml2-2.12.patch kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild X-VCS-Directories: kde-frameworks/kdoctools/ kde-frameworks/kdoctools/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6746ba0521ba0d7d8a00fc0b087e9fb08ffae648 X-VCS-Branch: master Date: Sat, 18 Nov 2023 13:20:33 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eef1fa2d-3b17-4f0f-8446-23d29acb9e5a X-Archives-Hash: 0ddbf2a30e034519c9adf03c9f1f403d commit: 6746ba0521ba0d7d8a00fc0b087e9fb08ffae648 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 18 13:18:15 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 18 13:20:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6746ba05 kde-frameworks/kdoctools: Fix build with dev-libs/libxml2-2.12.0 Closes: https://bugs.gentoo.org/917527 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/kdoctools-5.112.0-libxml2-2.12.patch | 25 ++++++++++++++++++++++ kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild | 15 +++++++------ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.112.0-libxml2-2.12.patch b/kde-frameworks/kdoctools/files/kdoctools-5.112.0-libxml2-2.12.patch new file mode 100644 index 000000000000..80f8bdb26f42 --- /dev/null +++ b/kde-frameworks/kdoctools/files/kdoctools-5.112.0-libxml2-2.12.patch @@ -0,0 +1,25 @@ +From b77fe5677f9727778ceea5d3c04c0a97c9a23566 Mon Sep 17 00:00:00 2001 +From: Haochen Tong +Date: Fri, 17 Nov 2023 14:54:23 +0800 +Subject: [PATCH] Fix build with libxml2 v2.12 + +(cherry picked from commit 0a90be000709f9dd85936ffc6a5415684f650c3a) +--- + src/xslt.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/xslt.cpp b/src/xslt.cpp +index 28c724f..dbc5435 100644 +--- a/src/xslt.cpp ++++ b/src/xslt.cpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.42.1 + diff --git a/kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild index 27262d73b28f..3997ed135649 100644 --- a/kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild +++ b/kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild @@ -13,11 +13,6 @@ LICENSE="MIT" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="nls" -BDEPEND=" - dev-lang/perl - dev-perl/URI - nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 ) -" DEPEND=" app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets @@ -27,8 +22,16 @@ DEPEND=" =kde-frameworks/karchive-${PVCUT}*:5 " RDEPEND="${DEPEND}" +BDEPEND=" + dev-lang/perl + dev-perl/URI + nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 ) +" -PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" + "${FILESDIR}/${P}-libxml2-2.12.patch" # in 5.113; bug 917527 +) src_configure() { local mycmakeargs=(