Date: Sun, 15 Feb 2026 09:59:31 +0000 From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 976b8ec2fc25 - main - ports-mgmt/appstream-generator: Restore i386 compat patches Message-ID: <69919903.2047c.5bdb80bb@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=976b8ec2fc25b85c3a8dba59bd0894ab7ab91307 commit 976b8ec2fc25b85c3a8dba59bd0894ab7ab91307 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2026-02-11 18:26:49 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-02-15 09:59:27 +0000 ports-mgmt/appstream-generator: Restore i386 compat patches Reported by: pkg-fallout --- ports-mgmt/appstream-generator/Makefile | 1 + .../files/patch-src_backends_freebsd_fbsdpkg.cpp | 11 +++++++++++ .../files/patch-src_backends_freebsd_fbsdpkgindex.cpp | 11 +++++++++++ ports-mgmt/appstream-generator/files/patch-src_config.h | 11 +++++++++++ ports-mgmt/appstream-generator/files/patch-src_engine.cpp | 11 +++++++++++ 5 files changed, 45 insertions(+) diff --git a/ports-mgmt/appstream-generator/Makefile b/ports-mgmt/appstream-generator/Makefile index cf89eacea0b8..0902a5e8a736 100644 --- a/ports-mgmt/appstream-generator/Makefile +++ b/ports-mgmt/appstream-generator/Makefile @@ -1,6 +1,7 @@ PORTNAME= appstream-generator DISTVERSIONPREFIX= v DISTVERSION= 0.10.2 +PORTREVISION= 1 CATEGORIES= ports-mgmt MAINTAINER= arrowd@FreeBSD.org diff --git a/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkg.cpp b/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkg.cpp new file mode 100644 index 000000000000..483431c05781 --- /dev/null +++ b/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkg.cpp @@ -0,0 +1,11 @@ +--- src/backends/freebsd/fbsdpkg.cpp.orig 2026-02-10 19:57:51 UTC ++++ src/backends/freebsd/fbsdpkg.cpp +@@ -40,7 +40,7 @@ FreeBSDPackage *FreeBSDPackage::CreateFromWorkdir(cons + if (!entry.is_regular_file()) + continue; + +- if (entry.path().extension() != "pkg") ++ if (entry.path().extension() != ".pkg") + continue; + + count++; diff --git a/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkgindex.cpp b/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkgindex.cpp new file mode 100644 index 000000000000..e5ddbc7c6f8e --- /dev/null +++ b/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkgindex.cpp @@ -0,0 +1,11 @@ +--- src/backends/freebsd/fbsdpkgindex.cpp.orig 2026-02-10 19:57:51 UTC ++++ src/backends/freebsd/fbsdpkgindex.cpp +@@ -154,7 +154,7 @@ std::shared_ptr<Package> FreeBSDPackageIndex::packageF + return nullptr; + } + +- return nullptr; ++ return std::shared_ptr<FreeBSDPackage>(FreeBSDPackage::CreateFromWorkdir(fname)); + } + + bool FreeBSDPackageIndex::hasChanges( diff --git a/ports-mgmt/appstream-generator/files/patch-src_config.h b/ports-mgmt/appstream-generator/files/patch-src_config.h new file mode 100644 index 000000000000..d3385e733f68 --- /dev/null +++ b/ports-mgmt/appstream-generator/files/patch-src_config.h @@ -0,0 +1,11 @@ +--- src/config.h.orig 2026-02-10 19:57:51 UTC ++++ src/config.h +@@ -44,7 +44,7 @@ inline constexpr std::array<ImageSize, 6> AllowedIconS + /** + * Fake package name AppStream Generator uses internally to inject additional metainfo on users' request + */ +-inline constexpr std::string EXTRA_METAINFO_FAKE_PKGNAME = "+extra-metainfo"; ++inline const std::string EXTRA_METAINFO_FAKE_PKGNAME = "+extra-metainfo"; + + /** + * Describes a suite in a software repository. diff --git a/ports-mgmt/appstream-generator/files/patch-src_engine.cpp b/ports-mgmt/appstream-generator/files/patch-src_engine.cpp new file mode 100644 index 000000000000..3b91d9f89fd8 --- /dev/null +++ b/ports-mgmt/appstream-generator/files/patch-src_engine.cpp @@ -0,0 +1,11 @@ +--- src/engine.cpp.orig 2026-02-10 19:57:51 UTC ++++ src/engine.cpp +@@ -69,7 +69,7 @@ Engine::Engine() + // Configure a TBB task arena to limit parallelism a little (use half the available CPU cores, or at least 6 + // threads) This avoids having too many parallel downloads on high-core-count machines, and also leaves some room + // for additional parallelism of the used libraries, e.g. for image processing. +- const auto numCPU = std::thread::hardware_concurrency(); ++ const std::int32_t numCPU = std::thread::hardware_concurrency(); + const auto maxThreads = std::max((long)numCPU > 6 ? 6L : numCPU, std::lround(numCPU * 0.60)); + m_taskArena = std::make_unique<tbb::task_arena>(maxThreads); +home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69919903.2047c.5bdb80bb>