Date: Tue, 29 Jul 2025 06:58:29 +0200 From: Mathieu Arnold <mat@freebsd.org> To: Vladimir Druzenko <vvd@freebsd.org> Cc: Michael Zhilin <mizhka@freebsd.org>, 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: <qzarlvr5ynrv7pihrvjdgyo64nwu4lvrpys325hkgzcoh3e2vl@3qwvnbgyzmu2> In-Reply-To: <077aae40-56fe-4bbc-87a7-f590065438b6@freebsd.org> References: <202507280929.56S9TkcM016437@gitrepo.freebsd.org> <077aae40-56fe-4bbc-87a7-f590065438b6@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <mizhka@FreeBSD.org> > > AuthorDate: 2025-07-28 09:27:05 +0000 > > Commit: Michael Zhilin <mizhka@FreeBSD.org> > > 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<bool>= ("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<OnlineArchive= Repository>(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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?qzarlvr5ynrv7pihrvjdgyo64nwu4lvrpys325hkgzcoh3e2vl>