From b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Jun 2023 15:13:45 +0100 Subject: gentoo auto-resync : 14:06:2023 - 15:13:45 --- net-misc/wget2/Manifest | 2 + .../wget2-fix-build-issues-with-clang-16.patch | 28 +++++++ net-misc/wget2/wget2-2.0.1-r3.ebuild | 96 ++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 net-misc/wget2/files/wget2-fix-build-issues-with-clang-16.patch create mode 100644 net-misc/wget2/wget2-2.0.1-r3.ebuild (limited to 'net-misc/wget2') diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest index 4d8e5324e437..ee9c9348e09c 100644 --- a/net-misc/wget2/Manifest +++ b/net-misc/wget2/Manifest @@ -1,5 +1,7 @@ +AUX wget2-fix-build-issues-with-clang-16.patch 841 BLAKE2B 055c0e61566fa78360481f618dbcdc5fd65f853c94ac4b5d1e75e43a5be9b6295e9281c632635405eec840a79b6d106b30bf068d7577f21d8d087f6b102f39f1 SHA512 59c95329ee7f779be169c2a9032a36dd49e8c596967ba3a6d0dc12ba3cbd67dab8acccabff7d73126232ee60b699b84ee95253c17b39b47e049134b86700608a DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e EBUILD wget2-2.0.1-r2.ebuild 2055 BLAKE2B 0576f5e248d77f224d1dd917c9b28e8eb6476e04ae564b79e953f293acaf7502bde8b1d5b99ab268f716695ba0fbb66617cbaa2b81a78632415b079391cc61a5 SHA512 9053e8ebb0e5c445fd638c4a149864946f126e6f9e91f67615420d5f6bdc71246bdb8a3b229319d801f66d9d8743036f813b9c5722ca83feeebf2bbce5919d88 +EBUILD wget2-2.0.1-r3.ebuild 2126 BLAKE2B af9a29e617300020c65e92601c5b33a4fb3b955c0a9f7bdebfef1e7e8d7511a8312a5297973e63f47f9b5efb213a66f76de8d3172cad7db505ddbdaf4a4ab155 SHA512 10f834711efca9ed76b4efdeed537524aaacefb4c25300a0bc437b3e107d754cac9976dae00e0f08a4afea981cbd5beb73c9d938a24f3be96a1e65b4fa4b5ddf EBUILD wget2-2.0.1.ebuild 2654 BLAKE2B 3feefaf562ace459b805ae2ffac5de2149cba905deae795b69412704b50bcba37c58e03aecc42f1c0f5d0d07d9fa75e24db4e1b517597e56e6fc6d15cfaad03c SHA512 de9c5db375389484d8129a758c0b0b2c089fcb8b02e9170a1042af4408f0cc9cff4472608065dc586c45e780bcf0b9cd3a7657b8cf6e130945f087a8b7e522a9 EBUILD wget2-9999.ebuild 2458 BLAKE2B 4e75262df94e6db8be002957a829714cfac0f03420ed6e453c5da65929ae00364938d066d0f5a707ed9631612d0638d10c527fcc37620c7fc6764534f79a3dee SHA512 20c2d157007f78069d9e04823717ff0efe10cdc4c9dc9a56ab91c696a73c2045b5f787531d68adfc3f8a96c126885a6c1039f71200381883dfd4c32542a88d7c MISC metadata.xml 827 BLAKE2B 707f4ea6684a3ae7180790983d3a622721106990e69e8855fde5c6442fade3ff8ff6ff006c7c310bb055a68a7e4ceb376d855393fa491ae6f41ad2e272072fd5 SHA512 7022b91c3c5eb59d3c5a0bc7a5f3f36b25ae766f866b253cdab284ce4c723f2860a82bc8042a9b761911bc80e4726a84893107e27e3cefe84fa2ad4fcbfd69b4 diff --git a/net-misc/wget2/files/wget2-fix-build-issues-with-clang-16.patch b/net-misc/wget2/files/wget2-fix-build-issues-with-clang-16.patch new file mode 100644 index 000000000000..ca671879a1e3 --- /dev/null +++ b/net-misc/wget2/files/wget2-fix-build-issues-with-clang-16.patch @@ -0,0 +1,28 @@ +https://gitlab.com/gnuwget/wget2/-/merge_requests/523 +From: Brahmajit Das +Date: Mon, 29 May 2023 08:34:33 +0000 +Subject: [PATCH] libwget/thread.c: Fix build issues with clang-16 + +With clang 16, specially on with musl libc, it would result in an +incompatible pointer to integer conversion error. As clang 16 has made a +few options default, including -Wincompatible-function-pointer-types. +This patch fixes that error. + +First discovered on Gentoo's musl llvm profile. Please refer +https://bugs.gentoo.org/898058. + +Signed-off-by: Brahmajit Das +--- a/libwget/thread.c ++++ b/libwget/thread.c +@@ -289,7 +289,7 @@ int wget_thread_join(wget_thread *thread) + */ + wget_thread_id wget_thread_self(void) + { +- return gl_thread_self(); ++ return (wget_thread_id) gl_thread_self(); + } + + /** +-- +2.40.1 + diff --git a/net-misc/wget2/wget2-2.0.1-r3.ebuild b/net-misc/wget2/wget2-2.0.1-r3.ebuild new file mode 100644 index 000000000000..7963200843bb --- /dev/null +++ b/net-misc/wget2/wget2-2.0.1-r3.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="GNU Wget2 is a file and recursive website downloader" +HOMEPAGE="https://gitlab.com/gnuwget/wget2" +SRC_URI="mirror://gnu/wget/${P}.tar.gz" + +# LGPL for libwget +LICENSE="GPL-3+ LGPL-3+" +SLOT="0/0" # subslot = libwget.so version +QA_PKGCONFIG_VERSION="2.1.0" # libwget pkg-config versioning +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib" + +RDEPEND=" + brotli? ( app-arch/brotli ) + bzip2? ( app-arch/bzip2 ) + !gnutls? ( dev-libs/libgcrypt:= ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + dev-libs/openssl:0= + ) + ) + gpgme? ( + app-crypt/gpgme:= + dev-libs/libassuan + dev-libs/libgpg-error + ) + http2? ( net-libs/nghttp2 ) + idn? ( net-dns/libidn2:= ) + lzip? ( app-arch/lzlib ) + lzma? ( app-arch/xz-utils ) + pcre? ( dev-libs/libpcre2 ) + psl? ( net-libs/libpsl ) + xattr? ( sys-apps/attr ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-fix-build-issues-with-clang-16.patch +) + +src_configure() { + local myeconfargs=( + --disable-static + --disable-valgrind-tests + --with-plugin-support + --with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)" + --without-libidn + --without-libmicrohttpd + $(use_enable doc) + $(use_enable xattr) + $(use_with brotli brotlidec) + $(use_with bzip2) + $(use_with gpgme) + $(use_with http2 libnghttp2) + $(use_with idn libidn2) + $(use_with lzip) + $(use_with lzma) + $(use_with pcre libpcre2) + $(use_with psl libpsl) + $(use_with zlib) + + # Avoid calling ldconfig + LDCONFIG=: + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if [[ ${PV} == *9999 ]] ; then + if use doc ; then + local mpage + for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do + doman ${mpage} + done + fi + else + doman docs/man/man{1/*.1,3/*.3} + fi + + find "${D}" -type f -name '*.la' -delete || die + rm "${ED}"/usr/bin/${PN}_noinstall || die +} -- cgit v1.2.3