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 F1CB0158020 for ; Sun, 16 Oct 2022 18:04:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 030E7E0D25; Sun, 16 Oct 2022 18:04:10 +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 B94ECE0D25 for ; Sun, 16 Oct 2022 18:04:09 +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 E47E9340C24 for ; Sun, 16 Oct 2022 18:04:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BDC35B5 for ; Sun, 16 Oct 2022 18:04:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1665943312.9da22a2f622eaa9bddd09ae1eeefc879e3de58c1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/hfsutils/, sys-fs/hfsutils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/hfsutils/Manifest sys-fs/hfsutils/files/hfsutils-3.2.6_p15-Include-string.h-for-strcmp.patch sys-fs/hfsutils/files/hfsutils-3.2.6_p15-drop-manual-autoconf.patch sys-fs/hfsutils/hfsutils-3.2.6_p15.ebuild X-VCS-Directories: sys-fs/hfsutils/files/ sys-fs/hfsutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9da22a2f622eaa9bddd09ae1eeefc879e3de58c1 X-VCS-Branch: master Date: Sun, 16 Oct 2022 18:04:07 +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: 82e7f1a0-1016-4a63-8fd3-9c9c206964f9 X-Archives-Hash: 19aca5f13b21dc219e695a7c63cb7b22 commit: 9da22a2f622eaa9bddd09ae1eeefc879e3de58c1 Author: Sam James gentoo org> AuthorDate: Sun Oct 16 18:01:06 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 16 18:01:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da22a2f sys-fs/hfsutils: add 3.2.6_p15, fix build w/ Clang 16 Closes: https://bugs.gentoo.org/871165 Signed-off-by: Sam James gentoo.org> sys-fs/hfsutils/Manifest | 1 + ...ils-3.2.6_p15-Include-string.h-for-strcmp.patch | 17 +++++ .../hfsutils-3.2.6_p15-drop-manual-autoconf.patch | 78 ++++++++++++++++++++++ sys-fs/hfsutils/hfsutils-3.2.6_p15.ebuild | 74 ++++++++++++++++++++ 4 files changed, 170 insertions(+) diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest index a8fde341db17..2bfbbbcea585 100644 --- a/sys-fs/hfsutils/Manifest +++ b/sys-fs/hfsutils/Manifest @@ -1,2 +1,3 @@ DIST hfsutils_3.2.6-14.debian.tar.xz 6780 BLAKE2B 00474d328f5ec2614ec429052e6940b9eb10d04f433399f686ccc24d66ca1559e7ca45c4ab3ebe6386e02fc4de5ffd96242a7aa6f58d6032798d5536da912a61 SHA512 33d44f7b9094743031fc9315cf9380e158225ee2cd5af7a5ec7c55a2ae9af42e16f9cad3c667b153a1d3d9484d4ea773d34b88b78bfe9499df52a8b9d77defb2 +DIST hfsutils_3.2.6-15.debian.tar.xz 6364 BLAKE2B 7a588ceb4fefe50531d669f9c70452d6f7105f54cd674740296154203336a0d0977eb17d6aa9122b003029c26a4aa7674919fcdbbf8c527031be71a56d5a2c3f SHA512 67e3e7d33918b58cb02b7b8626caac890cf6c3bda5d81adeae9d0fa55bf7ad8fad18b0ecec5619bdfb9be037e16b5986eb1c6c8cd2044164e31927c5a1b6b1bf DIST hfsutils_3.2.6.orig.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173 diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-Include-string.h-for-strcmp.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-Include-string.h-for-strcmp.patch new file mode 100644 index 000000000000..4b9db273ec40 --- /dev/null +++ b/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-Include-string.h-for-strcmp.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/871165 + +From 065e349d0a0e1db9fda99f90ff825b7934f191da Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 16 Oct 2022 18:18:58 +0100 +Subject: [PATCH] Include for strcmp + +--- a/hpwd.c ++++ b/hpwd.c +@@ -24,6 +24,7 @@ + # endif + + # include ++# include + + # include "hfs.h" + # include "hcwd.h" diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-drop-manual-autoconf.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-drop-manual-autoconf.patch new file mode 100644 index 000000000000..00f5bfb8a438 --- /dev/null +++ b/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-drop-manual-autoconf.patch @@ -0,0 +1,78 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -197,23 +197,6 @@ dist :: + + ############################################################################### + +-Makefile: config.status +- ./config.status && touch .stamp/config.h +- +-.stamp/config.h: config.status +- ./config.status && touch .stamp/config.h +- +-config.status: .stamp/configure .stamp/config.h.in Makefile.in +- ./config.status --recheck +- +-.stamp/configure: configure.in +- autoconf && touch .stamp/configure +- +-.stamp/config.h.in: configure.in acconfig.h +- autoheader && touch .stamp/config.h.in +- +-############################################################################### +- + $(LIBHFS) :: + cd libhfs && $(MAKE) + +--- a/libhfs/Makefile.in ++++ b/libhfs/Makefile.in +@@ -96,23 +96,6 @@ maintainer-clean :: distclean + + ############################################################################### + +-Makefile: config.status +- ./config.status && touch .stamp/config.h +- +-.stamp/config.h: config.status +- ./config.status && touch .stamp/config.h +- +-config.status: .stamp/configure .stamp/config.h.in Makefile.in +- ./config.status --recheck +- +-.stamp/configure: configure.in +- autoconf && touch .stamp/configure +- +-.stamp/config.h.in: configure.in acconfig.h +- autoheader && touch .stamp/config.h.in +- +-############################################################################### +- + $(HFSTARGET): $(HFSOBJS) + $(AR) $@ $(HFSOBJS) + $(RANLIB) $@ +--- a/librsrc/Makefile.in ++++ b/librsrc/Makefile.in +@@ -92,23 +92,6 @@ maintainer-clean :: distclean + + ############################################################################### + +-Makefile: config.status +- ./config.status && touch .stamp/config.h +- +-.stamp/config.h: config.status +- ./config.status && touch .stamp/config.h +- +-config.status: .stamp/configure .stamp/config.h.in Makefile.in +- ./config.status --recheck +- +-.stamp/configure: configure.in +- autoconf && touch .stamp/configure +- +-.stamp/config.h.in: configure.in acconfig.h +- autoheader && touch .stamp/config.h.in +- +-############################################################################### +- + $(RSRCTARGET): $(RSRCOBJS) + $(AR) $@ $(RSRCOBJS) + $(RANLIB) $@ diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p15.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p15.ebuild new file mode 100644 index 000000000000..dddff37401ba --- /dev/null +++ b/sys-fs/hfsutils/hfsutils-3.2.6_p15.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="HFS FS Access utils" +HOMEPAGE="https://www.mars.org/home/rob/proj/hfs/" +SRC_URI=" + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz +" +S="${WORKDIR}"/${P/_p*} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="tcl tk" +# Tests are enabled only with USE=tcl +RESTRICT="!tcl? ( test )" +# use tk requires tcl - bug #150437 +REQUIRED_USE="tk? ( tcl )" + +DEPEND=" + tcl? ( dev-lang/tcl:= ) + tk? ( dev-lang/tk:= ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${WORKDIR}"/debian/patches + "${FILESDIR}"/${P/_p*}-fix-tcl-8.6.patch + "${FILESDIR}"/${PN}-3.2.6-test-tcl-8.6.patch + "${FILESDIR}"/${PN}-3.2.6_p15-Include-string.h-for-strcmp.patch + "${FILESDIR}"/${PN}-3.2.6_p15-drop-manual-autoconf.patch +) + +src_prepare() { + default + + sed -i -e 's:configure.in:configure.ac:' {libhfs/,librsrc/,}{configure,Makefile,config.h}.in || die + + eautoreconf +} + +src_configure() { + tc-export CC + + econf \ + $(use_with tcl tcl /usr/$(get_libdir) no) \ + $(use_with tk tk /usr/$(get_libdir) no) +} + +src_compile() { + emake AR="$(tc-getAR) rc" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" + emake CC="$(tc-getCC)" -C hfsck +} + +src_test() { + # Tests reuse the same image name. Let's serialize. + emake -j1 check +} + +src_install() { + dodir /usr/bin /usr/lib /usr/share/man/man1 + emake \ + prefix="${ED}"/usr \ + MANDEST="${ED}"/usr/share/man \ + infodir="${ED}"/usr/share/info \ + install + dobin hfsck/hfsck + dodoc BLURB CHANGES README TODO doc/*.txt +}