commit: 64664507e8311690d16bec79324880f1bd261ebd Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Wed Aug 16 21:50:04 2023 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Wed Aug 16 21:50:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64664507
net-misc/wget2: fix compilation with USE=lzip Closes: https://bugs.gentoo.org/822057 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> net-misc/wget2/files/wget2-2.0.1-stdint.patch | 24 +++++++ net-misc/wget2/wget2-2.0.1-r4.ebuild | 97 +++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) diff --git a/net-misc/wget2/files/wget2-2.0.1-stdint.patch b/net-misc/wget2/files/wget2-2.0.1-stdint.patch new file mode 100644 index 000000000000..984cf52c1fc0 --- /dev/null +++ b/net-misc/wget2/files/wget2-2.0.1-stdint.patch @@ -0,0 +1,24 @@ +From 96fda91da2df356a7e0897187822e27125a3e40b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.rueh...@gmx.de> +Date: Mon, 22 May 2023 19:56:35 +0200 +Subject: * libwget/decompressor.c: Explicitly include stdint.h before lzlib.h + +--- + libwget/decompressor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libwget/decompressor.c b/libwget/decompressor.c +index 53ed884..69ce5dd 100644 +--- a/libwget/decompressor.c ++++ b/libwget/decompressor.c +@@ -60,6 +60,7 @@ + #endif + + #ifdef WITH_LZIP ++#include <stdint.h> + #include <lzlib.h> + #endif + +-- +cgit v1.1 + diff --git a/net-misc/wget2/wget2-2.0.1-r4.ebuild b/net-misc/wget2/wget2-2.0.1-r4.ebuild new file mode 100644 index 000000000000..981ce1c60b0c --- /dev/null +++ b/net-misc/wget2/wget2-2.0.1-r4.ebuild @@ -0,0 +1,97 @@ +# 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 + "${FILESDIR}"/${P}-stdint.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 +}