From 229d5601ae2eca4f143dabdfb36406376cf88c03 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 May 2023 17:49:26 +0100 Subject: gentoo auto-resync : 12:05:2023 - 17:49:26 --- app-text/xmlstarlet/Manifest | 2 + .../files/xmlstarlet-1.6.1-clang16.patch | 32 ++++++++++++ app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild | 59 ++++++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch create mode 100644 app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild (limited to 'app-text/xmlstarlet') diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest index 4825dd94f488..a4245db3ff8a 100644 --- a/app-text/xmlstarlet/Manifest +++ b/app-text/xmlstarlet/Manifest @@ -1,3 +1,5 @@ +AUX xmlstarlet-1.6.1-clang16.patch 1140 BLAKE2B 5adade599c64b6598754be6b15f118ddc3fc91d850ec8e01b956355c972d3afeb107a98aad4fc398dede34b3d2e61483c89667693403a47c01b04953d52a110c SHA512 4197ed29065608ae5dcff398a339237c2bd3af1f329b25acc0ff567668856262882e703c1299ad578dea2b1fb9c9e114bd667504668018eff2eecb8bd0f4b9e3 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b +EBUILD xmlstarlet-1.6.1-r1.ebuild 1555 BLAKE2B 4e201fceb88038f197998b96440f9b14d43a2ac5bb16cdf732427c843f5e52e553524ddd09523f2dd2c9f5f73f8baac7a6789ff8b821ad45747825ae56fbdf67 SHA512 65f06a89215f5118749a1f722fcffff5c14187c9f8afa98ac9a6e02fc15d601e7da1b946ccf4c1ead0d111449f2a5883613f8e406c1b043c666afcbd29fafff4 EBUILD xmlstarlet-1.6.1.ebuild 1498 BLAKE2B f5586ad77fd7009f26f742327aa3be3001f8e21ec43ed608865ca73d21555acfc57e65aaa91d1b7a0493432c0834bb3edb53fb5cd920f7ee91aa07d6d2d1577e SHA512 7de636b3a72e72167a589cb8030fdb97b9691cb8b2af1e75e231a19eba3d0e41f8a54a9b3bb69bb6c397d9dd1f98d80f965a7a298840a30ab8f3d5ff4f2254a7 MISC metadata.xml 294 BLAKE2B 15c32d1ad62c8dc9e94ca2cd9554c9f16dd8eb26194eb24f5810202b9d0da8ab6d2638ebdc2f8c43aa6068de35616f3c29609fa85016f34839ddf46f2ec3be2b SHA512 518df7e45f852b93f924300a846be03d00c8dc9a4ad23d0f90b115e0f1fb98f7b41de45a550d05ccf290fe5cbadffb3dacb4e9d632b64996063b42b4289c80bc 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 +} -- cgit v1.2.3