From nobody Tue Jul 29 04:58:29 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4brjnW6Cs2z5yTxy; Tue, 29 Jul 2025 04:59:43 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brjmB4qKYz4GTG; Tue, 29 Jul 2025 04:58:34 +0000 (UTC) (envelope-from mat@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753765114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=boyhiYAqWg5VMbVWgWWPq+pGY+ypnqoPyBSo0qBdQjE=; b=jfstYy4KgR/fvZGGSJC/NWhPSs8RE6fEg+T2PRwdTJM2duBqMq8uT/JCT1yrNzyVg6/SL4 T1/3MNThr/gdZUzfRVxGFUhWetpUDs9p1sZx49Sg4cM7k7l3hCg+aLojw24LFAVP/tOxRK 7EWBNhWuZHb4Fr3TE7xJlVi6UBz+YH+qVFVXkzcGToCLg3q5LU8xCWXy52KtuVICjuiwGF cDXbqSXXAMYAsKp5NL+IQtj3uaggBxTvOhkAN6x6Jim+diP/70V0sL+HgQUc+zz8raM2D2 5xWXjQNQ739+ENZazGNua/jxmnNTnXtail6f5Xu3lIUmpRICt/GNtwaD750t9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753765114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=boyhiYAqWg5VMbVWgWWPq+pGY+ypnqoPyBSo0qBdQjE=; b=KjibQtYw8EJ10iXFW1+iL0Gxfn/QANr9P8LhnrzKSOUzNxp6hUDvcuxmi30uKmMQK3rkHF PzXb1ZrBD0gpYIhkT1m/Pc/MvI/OBrF7jnXLfwXmT26vfkNMNa6wAvHja/4xNUszpPsRPH JGyydOL8OWArhfCGxR4uj2z9IMv2U4s+B+Y6ljHmqDUboyf4DXSOTkAiigLevn6iswYlYZ pqWsYJG4DsKhJyhtmaW1b17g7foL+1Gia+8WNrIuDV/l7L2osbR6YwzjOVxCsA1kVFdu7j z7JthNu8A3U4lQupVRCZe4EhJk+Xybjy6CvU13brbrrW0BPmYkcqr1KsJq2RAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753765114; a=rsa-sha256; cv=none; b=a1bEcDydokU4Aq5aFg/bwmymE/lW0JeJiLFVhZ/M436vLyx4f+OnYodwlCPm1kbLpOGVTc AWcIAJyf2UQwWF9odTWP3EiDN7CoaTPdEqJmfMZLda1orZgdtyDOdoG/m3Ne+cZTtG7Hfu sgpLwWWcxeKUb+xdZENLzfQbYhdOLvrdvhOEYJIJDBB4aNzthpuAR+9lxiVG/G12OEbpWT hvdKQPdnSz1EKJRJpEUI4edI4uB4yHKQ+roPUxKoS/zLFITWa3D6u1OGVqOoKNgocgPmvk R0ECehnw5wsm+saM5cnAvqiOJOKlJPFC/mma+t+NI0+9hfqrVj5+9hMrHFLoJw== Received: from relay.mat.cc (eqx1.mat.cc [79.143.244.49]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "cow.mat.cc", Issuer "R10" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4brjmB1mM3z1Vf; Tue, 29 Jul 2025 04:58:34 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mat-Laptop-13-AMD-Ryzen-7040Series (unknown [IPv6:2a01:e0a:836:f670:3faf:7631:f251:e95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by relay.mat.cc (Postfix) with ESMTPSA id 284D21FFD1; Tue, 29 Jul 2025 06:58:31 +0200 (CEST) Date: Tue, 29 Jul 2025 06:58:29 +0200 From: Mathieu Arnold To: Vladimir Druzenko Cc: Michael Zhilin , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 12f7734039dc - main - sysutils/flashrom: update to 1.6.0 Message-ID: References: <202507280929.56S9TkcM016437@gitrepo.freebsd.org> <077aae40-56fe-4bbc-87a7-f590065438b6@freebsd.org> List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="vqkctufth5rfckxs" Content-Disposition: inline In-Reply-To: <077aae40-56fe-4bbc-87a7-f590065438b6@freebsd.org> --vqkctufth5rfckxs Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jul 28, 2025 at 06:51:32PM +0300, Vladimir Druzenko wrote: > 28.07.2025 12:29, Michael Zhilin =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > The branch main has been updated by mizhka: > >=20 > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D12f7734039dc523fb74143= fd1b07f0abad6d053a > >=20 > > commit 12f7734039dc523fb74143fd1b07f0abad6d053a > > Author: Michael Zhilin > > AuthorDate: 2025-07-28 09:27:05 +0000 > > Commit: Michael Zhilin > > CommitDate: 2025-07-28 09:29:28 +0000 > >=20 > > sysutils/flashrom: update to 1.6.0 > > Relnotes: https://flashrom.org/release_notes/v_1_6.html > > Sponsored by: Postgres Professional > > --- > > .../patch-src_slic3r_GUI_PresetArchiveDatabase.cpp | 11 +++++++++= ++ > > sysutils/flashrom/Makefile | 15 +++++++++= ------ > > sysutils/flashrom/distinfo | 6 +++--- > > sysutils/flashrom/files/patch-doc_meson.build | 11 +++++++++= ++ > > sysutils/flashrom/files/patch-libflashrom.map | 18 ---------= --------- > > sysutils/flashrom/files/patch-meson.build | 4 ++-- > > 6 files changed, 36 insertions(+), 29 deletions(-) > >=20 > > diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PresetArchiveDa= tabase.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PresetArchiveDataba= se.cpp > > new file mode 100644 > > index 000000000000..cf5b7fe70309 > > --- /dev/null > > +++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PresetArchiveDatabase.= cpp > > @@ -0,0 +1,11 @@ > > +--- src/slic3r/GUI/PresetArchiveDatabase.cpp.orig 2025-07-04 16:42:20 = UTC > > ++++ src/slic3r/GUI/PresetArchiveDatabase.cpp > > +@@ -577,7 +577,7 @@ void PresetArchiveDatabase::load_app_manifest_json= () > > + if (const auto used =3D subtree.second.get_optional= ("has_installed_printers"); used) { > > + m_has_installed_printer_repositories_uuid[uuid] =3D *= used; > > + } else { > > +- assert(false); > > ++// assert(false); > > + m_has_installed_printer_repositories_uuid[uuid] =3D f= alse; > > + } > > + m_archive_repositories.emplace_back(std::make_unique(std::move(uuid), std::move(manifest))); > > diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile > > index 608e241cffc0..06a07beb53a7 100644 > > --- a/sysutils/flashrom/Makefile > > +++ b/sysutils/flashrom/Makefile > > @@ -1,7 +1,6 @@ > > PORTNAME=3D flashrom > > -PORTVERSION=3D 1.3.0 > > +PORTVERSION=3D 1.6.0 > > DISTVERSIONPREFIX=3D v > > -PORTREVISION=3D 3 > > CATEGORIES=3D sysutils > > MASTER_SITES=3D https://download.flashrom.org/releases/ > > @@ -15,10 +14,11 @@ LICENSE_FILE=3D ${WRKSRC}/COPYING > > NOT_FOR_ARCHS=3D riscv64 > > NOT_FOR_ARCHS_REASON=3D Unable to determine endianness. > > -BUILD_DEPENDS+=3D cmocka>=3D0:sysutils/cmocka > > +BUILD_DEPENDS+=3D cmocka>=3D0:sysutils/cmocka \ > > + ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx >=20 > Hi! > Are you sure about this change? > Force py-sphinx for so small port=E2=80=A6 >=20 > Check please this patch: > --- sysutils/flashrom/Makefile.orig > +++ sysutils/flashrom/Makefile > @@ -14,8 +14,7 @@ > =C2=A0NOT_FOR_ARCHS=3D riscv64 > =C2=A0NOT_FOR_ARCHS_REASON=3D=C2=A0 Unable to determine endianness. >=20 > -BUILD_DEPENDS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 cmocka>=3D0:sysutils/cmocka= \ > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0sphinx-build:text= proc/py-sphinx > +BUILD_DEPENDS=3D cmocka>=3D0:sysutils/cmocka > =C2=A0LIB_DEPENDS=3D=C2=A0 =C2=A0libpci.so:devel/libpci >=20 > =C2=A0USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 meson pkgconfig tar:xz > @@ -33,6 +32,7 @@ >=20 > =C2=A0DMIDECODE_RUN_DEPENDS=3D dmidecode:sysutils/dmidecode >=20 > +DOCS_BUILD_DEPENDS=3D=C2=A0 =C2=A0 sphinx-build:textproc/py-sphinx > =C2=A0DOCS_MESON_ENABLED=3D=C2=A0 =C2=A0 documentation man-pages > =C2=A0DOCS_MESON_DISABLED=3D=C2=A0 =C2=A0generate_authors_list >=20 > --- sysutils/flashrom/pkg-plist.orig > +++ sysutils/flashrom/pkg-plist > @@ -4,5 +4,5 @@ > =C2=A0lib/libflashrom.so.1 > =C2=A0lib/libflashrom.so.1.0.0 > =C2=A0libdata/pkgconfig/flashrom.pc > -share/man/man8/flashrom.8.gz > +%%PORTDOCS%%share/man/man8/flashrom.8.gz > =C2=A0sbin/flashrom No, man pages should not be behind the DOCS option, they should either always be installed, or be behind a MANPAGES option that is enabled by default. --=20 Mathieu Arnold --vqkctufth5rfckxs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQITBAABCgB9FiEE9XJBpJetWizkEBUef2IOCp6dQb4FAmiIVPVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY1 NzI0MUE0OTdBRDVBMkNFNDEwMTUxRTdGNjIwRTBBOUU5RDQxQkUACgkQf2IOCp6d Qb5xwAv+KHCwKNZP95W76NopzqEXCE+tUWbe6hiRVH0xx/tgXkzeD+smkv0sRifk Ih0U8kSjUAmsZEfYfrTZUdUrfWwPBaDWjSX8sygnuXRuw7VonJYo0XNhmnI7ZRlO qYzfOolmq+5P0WcaXuI2D+is3Squor7Od04448adqiNmGpLcQMMCXJ40jpJOyTMW eIpzh5EU2aRc51qIlQfE6hh0ADdNRj0bWBTYv/t8rztjx94LewfHkbJzQJcwqDdL sNN9an9qM35LZ85Ai0HpiAzi94QnYkwD61aEl8/9kLEUbu1UAAvjKht+IF4TK7u6 k0WRt2rNAV7+HqHk7aUrSVipXtMOXr8vncxLvEkWINGYkOFgFNsudCc4fLL829gV BBTCXFwPY7aj1ME7A8CBJlVnP8CNTGLRPcQX/MkVB5iuASmYzdDRMltSpDdNsk+A lbLRD2D5Gh7JwLWAzkWY3RggTBjmqBadWq7FiXp/2CEmgHBNWx7k9WMSl60EXK4i HrwX9SCO =5B4f -----END PGP SIGNATURE----- --vqkctufth5rfckxs--