Re: git: 12f7734039dc - main - sysutils/flashrom: update to 1.6.0
Date: Mon, 28 Jul 2025 15:51:32 UTC
28.07.2025 12:29, Michael Zhilin пишет:
> The branch main has been updated by mizhka:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=12f7734039dc523fb74143fd1b07f0abad6d053a
>
> 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
>
> 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(-)
>
> diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PresetArchiveDatabase.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PresetArchiveDatabase.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 = subtree.second.get_optional<bool>("has_installed_printers"); used) {
> + m_has_installed_printer_repositories_uuid[uuid] = *used;
> + } else {
> +- assert(false);
> ++// assert(false);
> + m_has_installed_printer_repositories_uuid[uuid] = false;
> + }
> + m_archive_repositories.emplace_back(std::make_unique<OnlineArchiveRepository>(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= flashrom
> -PORTVERSION= 1.3.0
> +PORTVERSION= 1.6.0
> DISTVERSIONPREFIX= v
> -PORTREVISION= 3
> CATEGORIES= sysutils
> MASTER_SITES= https://download.flashrom.org/releases/
>
> @@ -15,10 +14,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
> NOT_FOR_ARCHS= riscv64
> NOT_FOR_ARCHS_REASON= Unable to determine endianness.
>
> -BUILD_DEPENDS+= cmocka>=0:sysutils/cmocka
> +BUILD_DEPENDS+= cmocka>=0:sysutils/cmocka \
> + ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx
Hi!
Are you sure about this change?
Force py-sphinx for so small port…
Check please this patch:
--- sysutils/flashrom/Makefile.orig
+++ sysutils/flashrom/Makefile
@@ -14,8 +14,7 @@
NOT_FOR_ARCHS= riscv64
NOT_FOR_ARCHS_REASON= Unable to determine endianness.
-BUILD_DEPENDS+= cmocka>=0:sysutils/cmocka \
- sphinx-build:textproc/py-sphinx
+BUILD_DEPENDS= cmocka>=0:sysutils/cmocka
LIB_DEPENDS= libpci.so:devel/libpci
USES= meson pkgconfig tar:xz
@@ -33,6 +32,7 @@
DMIDECODE_RUN_DEPENDS= dmidecode:sysutils/dmidecode
+DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
DOCS_MESON_ENABLED= documentation man-pages
DOCS_MESON_DISABLED= generate_authors_list
--- sysutils/flashrom/pkg-plist.orig
+++ sysutils/flashrom/pkg-plist
@@ -4,5 +4,5 @@
lib/libflashrom.so.1
lib/libflashrom.so.1.0.0
libdata/pkgconfig/flashrom.pc
-share/man/man8/flashrom.8.gz
+%%PORTDOCS%%share/man/man8/flashrom.8.gz
sbin/flashrom
While here - in line "OPTIONS_DEFINE= DOCS FTDI" used space instead of
tab (portlint -t).
> LIB_DEPENDS= libpci.so:devel/libpci
>
> -USES= meson pkgconfig tar:bzip2
> +USES= meson pkgconfig tar:xz
>
> PORTDOCS= *
>
> @@ -28,6 +28,9 @@ OPTIONS_DEFINE_i386= DMIDECODE
> OPTIONS_DEFAULT_amd64= DMIDECODE
> OPTIONS_DEFAULT_i386= DMIDECODE
>
> +DOCS_MESON_ENABLED= documentation man-pages
> +DOCS_MESON_DISABLED= generate_authors_list
> +
> DMIDECODE_DESC= Use dmidecode to gather DMI information
> FTDI_DESC= Enable external FT2232SPI flasher support
>
> @@ -37,7 +40,7 @@ FTDI_LIB_DEPENDS= libftdi1.so:devel/libftdi1
>
> post-install:
> @${MKDIR} ${STAGEDIR}${DOCSDIR}
> - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
> - cd ${WRKSRC}/Documentation && ${INSTALL_DATA} *.txt ${STAGEDIR}${DOCSDIR}
> + ${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}
> +# cd ${WRKSRC}/Documentation && ${INSTALL_DATA} *.txt ${STAGEDIR}${DOCSDIR}
>
> .include <bsd.port.mk>
> diff --git a/sysutils/flashrom/distinfo b/sysutils/flashrom/distinfo
> index 63e7388bd809..8964640cf9ca 100644
> --- a/sysutils/flashrom/distinfo
> +++ b/sysutils/flashrom/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1677403671
> -SHA256 (flashrom-v1.3.0.tar.bz2) = a053234453ccd012e79f3443bdcc61625cf97b7fd7cb4cdd8bfbffbe8b149623
> -SIZE (flashrom-v1.3.0.tar.bz2) = 489782
> +TIMESTAMP = 1753692064
> +SHA256 (flashrom-v1.6.0.tar.xz) = 8b9db3987df9b5fc81e70189d017905dd5f6be1e1410347f22687ab6d4c94423
> +SIZE (flashrom-v1.6.0.tar.xz) = 5285920
> diff --git a/sysutils/flashrom/files/patch-doc_meson.build b/sysutils/flashrom/files/patch-doc_meson.build
> new file mode 100644
> index 000000000000..c9851ce9f21e
> --- /dev/null
> +++ b/sysutils/flashrom/files/patch-doc_meson.build
> @@ -0,0 +1,11 @@
> +--- doc/meson.build.orig 2025-07-28 09:13:11 UTC
> ++++ doc/meson.build
> +@@ -30,7 +30,7 @@ if sphinx.found()
> + git_dir = meson.project_source_root() / '.git'
> +
> + # TODO: investigate whether this version can be lowered.
> +- version_for_authors_list = '7.2.0'
> ++ version_for_authors_list = '5.3.0'
> + # TODO: use sphinx.version().version_compare() instead, after we increase min required meson version to 0.62
> + sphinx_for_authors_list = find_program('sphinx-build',
> + native : true,
> diff --git a/sysutils/flashrom/files/patch-libflashrom.map b/sysutils/flashrom/files/patch-libflashrom.map
> deleted file mode 100644
> index 438f9a51b39a..000000000000
> --- a/sysutils/flashrom/files/patch-libflashrom.map
> +++ /dev/null
> @@ -1,18 +0,0 @@
> ---- libflashrom.map.orig 2024-02-01 08:22:08 UTC
> -+++ libflashrom.map
> -@@ -1,7 +1,5 @@ LIBFLASHROM_1.0 {
> - LIBFLASHROM_1.0 {
> - global:
> -- flashrom_board_info;
> -- flashrom_chipset_info;
> - flashrom_data_free;
> - flashrom_flag_get;
> - flashrom_flag_set;
> -@@ -9,7 +7,6 @@ LIBFLASHROM_1.0 {
> - flashrom_flash_getsize;
> - flashrom_flash_probe;
> - flashrom_flash_release;
> -- flashrom_flashchip_info;
> - flashrom_image_read;
> - flashrom_image_verify;
> - flashrom_image_write;
> diff --git a/sysutils/flashrom/files/patch-meson.build b/sysutils/flashrom/files/patch-meson.build
> index cef6c1d7d054..f1caea9bd663 100644
> --- a/sysutils/flashrom/files/patch-meson.build
> +++ b/sysutils/flashrom/files/patch-meson.build
> @@ -1,6 +1,6 @@
> ---- meson.build.orig 2023-04-27 13:51:02 UTC
> +--- meson.build.orig 2025-07-24 01:31:52 UTC
> +++ meson.build
> -@@ -234,7 +234,7 @@ programmer = {
> +@@ -324,7 +324,7 @@ programmer = {
> },
> 'internal' : {
> 'systems' : systems_hwaccess + ['linux'],
--
Best regards,
Vladimir Druzenko