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 6AB88158649 for ; Fri, 12 May 2023 14:04:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8683E07F9; Fri, 12 May 2023 14:04:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 7541FE07F9 for ; Fri, 12 May 2023 14:04:00 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95BD4340B25 for ; Fri, 12 May 2023 14:03:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B0C8A65 for ; Fri, 12 May 2023 14:03:58 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1683900093.0f0ba1c7b1f617b17eb0b946a5f63e92b3320a01.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/, app-text/xmlstarlet/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild X-VCS-Directories: app-text/xmlstarlet/files/ app-text/xmlstarlet/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 0f0ba1c7b1f617b17eb0b946a5f63e92b3320a01 X-VCS-Branch: master Date: Fri, 12 May 2023 14:03:58 +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: 457663c2-9524-46a2-8fa6-de9073fb9e50 X-Archives-Hash: 2bfdab7bb8c74325f6b445c14a69e41c commit: 0f0ba1c7b1f617b17eb0b946a5f63e92b3320a01 Author: Sebastian Pipping gentoo org> AuthorDate: Fri May 12 14:01:33 2023 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Fri May 12 14:01:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0ba1c7 app-text/xmlstarlet: EAPI 8 + Clang 16 fixes Closes: https://bugs.gentoo.org/883131 Signed-off-by: Sebastian Pipping gentoo.org> .../files/xmlstarlet-1.6.1-clang16.patch | 32 ++++++++++++ app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild | 59 ++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch new file mode 100644 index 000000000000..fda631611216 --- /dev/null +++ b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch @@ -0,0 +1,32 @@ +From d01c3e8a488282bc8bc2fae5bd21efc6c3931a32 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Jan 2023 14:50:08 -0800 +Subject: [PATCH] Fix hash_key_put() signature + +Fixes + +../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(uniq, hash_key_put, &lines); + ^~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- + src/xml_elem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +-- +2.40.1 + diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild new file mode 100644 index 000000000000..a508a3ef094f --- /dev/null +++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents" +HOMEPAGE="https://xmlstar.sourceforge.net/" +SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/libgcrypt:0= + virtual/libiconv" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-clang16.patch +) + +src_prepare() { + default + + # We need to patch use of /usr/lib because it is a problem with + # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600). + # The grep sandwich acts as a regression test so that a future + # version bump cannot break patching without noticing. + if [[ $(get_libdir) != lib ]]; then + grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die + sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die + grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die + fi + + eautoreconf +} + +src_configure() { + append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0) + + # NOTE: Fully built documentation is already shipped with the tarball: + # - doc/xmlstarlet-ug.{pdf,ps,html} + # - doc/xmlstarlet.txt + # - doc/xmlstarlet.1 + econf \ + --disable-build-docs \ + --disable-static-libs +} + +src_install() { + default + dosym xml /usr/bin/xmlstarlet +}