Re: git: 12f7734039dc - main - sysutils/flashrom: update to 1.6.0
Date: Tue, 29 Jul 2025 13:41:02 UTC
29.07.2025 09:27, Osipov, Michael пишет:
>> On Mon, Jul 28, 2025 at 06:51:32PM +0300, Vladimir Druzenko wrote:
>>> 28.07.2025 12:29, Michael Zhilin пишет:
>>>> The branch main has been updated by mizhka:
>>>>
>>>> URL:
>> https://cgit.FreeBSD.org/ports/commit/?id=12f7734039dc523fb74143fd1b07f0abad6d0
>> 53a
>>>> 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<OnlineArchiveReposit
>> ory>(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
>> 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.
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287652
I know about this, but what is it:
DOCS_MESON_ENABLED= documentation **man-pages**
?
--
Best regards,
Vladimir Druzenko