From nobody Mon Jul 28 09:29:46 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 4brCqZ6SGnz62rn0; Mon, 28 Jul 2025 09:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brCqZ47zxz3Srh; Mon, 28 Jul 2025 09:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753694986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJtT8Ja/1KFetY3HJdNGs/jslMKS26CPhiYKbpDNBFE=; b=A/ef+QjGrE3urg6OExd7nuNmF3qah7xnSGiHpQEQeEHAhmzOY5/P5SRb0VRg2OLqN9XA6t l7TxJ8eofv7ALZLJ63pqGZvARL2/k5GbhtLBpGNV8kNoVS1AbnergnD60WuCuZ1J5iBAgn OFrLRGSyUjVco+jEM1qAKxbD51JmTwyvY5dvdQGc+n2qN/zjDzhkOb7hk7H91cPuhFDSSD fRjwvzMfl7J1tCw5ZE1GbM448cZXvuKNZHdTbmtMCy6mUMapF3t4Ys9sqSxCovA3dfjgR9 ev5SNWJMsPe07dlliStfX0Pf0GbvzkuiRbNSvcYRXDLWPDNOSR6lc3G7rjXqLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753694986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJtT8Ja/1KFetY3HJdNGs/jslMKS26CPhiYKbpDNBFE=; b=DS4PDV1ooYInh5VrD4AOb67GlDRE5iIAKwE98ES+Azuo/71dXrVRHNvlrJxhgGUVaMK8RD KdzDa1ygYX7V2/WzrqPNerfqgINJIKdEU0SuzeIY4lNuiGYcL3m8ChVF122WoI3TdmfYiO 5JCEXVL6VN9jr8Zy+bln3R+rnts53YgEFuC1lzeX9Xb1SUcQM5WrT+0kO0IiDuipnQ2THw MMG+6dqsy5G8BFwivYSArfDD+b8pm+9YrP0PAvpfTEm9u+yNVQbLRA0Ztqtu5rvj1+khR8 IEDZtkN/8gcdKv/Nmx44u/pX7MFb7ZUGCBXxui9A4/f972lvLfrK8u6ek2oFwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753694986; a=rsa-sha256; cv=none; b=oW3pkwCFteo1q+/NKYUqBz7+zTUNPYMENSs9b3zYoElo2GPyHjWFRvBvoTMd+csiWuJh2D HeqPfPvhlI41/z5vXlNSGC3EdVwZfEPV+GcYo+uLN/8q3CTQ/tVVCQKPTm9XKT4yjIYuVz iT1RKY4H3eb8sEfZKtcLWoZy3DwzVff/lxHsnWcs9TconfVyss3eRALxdWfGxcHnQqHlel b5oxCtbLf6Ygv08zv73hV+a/zudbbfmAFCiHwKtt0YZbP+/3Pzr9RTou6B5a9s+C//qVvH hA7EgGfmxZPLQGkqYHvpRsGy8n+gddho+edfvPMbL0VK5XrjqzS8ymHHSpHUJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4brCqZ3f7Czfs9; Mon, 28 Jul 2025 09:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56S9TkYl016440; Mon, 28 Jul 2025 09:29:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56S9TkcM016437; Mon, 28 Jul 2025 09:29:46 GMT (envelope-from git) Date: Mon, 28 Jul 2025 09:29:46 GMT Message-Id: <202507280929.56S9TkcM016437@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Zhilin Subject: git: 12f7734039dc - main - sysutils/flashrom: update to 1.6.0 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: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mizhka X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12f7734039dc523fb74143fd1b07f0abad6d053a Auto-Submitted: auto-generated The branch main has been updated by mizhka: URL: https://cgit.FreeBSD.org/ports/commit/?id=12f7734039dc523fb74143fd1b07f0abad6d053a commit 12f7734039dc523fb74143fd1b07f0abad6d053a Author: Michael Zhilin AuthorDate: 2025-07-28 09:27:05 +0000 Commit: Michael Zhilin 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("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(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 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 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'],