Date: Thu, 09 Apr 2026 14:45:41 +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: 547f63780f9c - main - ports-mgmt/appstream-generator: Pull more patches from upstream Message-ID: <69d7bb95.3d9da.20eb40b0@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=547f63780f9ce030c3fed68afebdb42d815c427c commit 547f63780f9ce030c3fed68afebdb42d815c427c Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2026-04-09 14:41:25 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-04-09 14:45:33 +0000 ports-mgmt/appstream-generator: Pull more patches from upstream --- ports-mgmt/appstream-generator/Makefile | 2 +- ports-mgmt/appstream-generator/files/patch-backend | 96 ++++++++++++++++++++++ .../files/patch-src_backends_freebsd_fbsdpkg.cpp | 11 --- .../patch-src_backends_freebsd_fbsdpkgindex.cpp | 11 --- 4 files changed, 97 insertions(+), 23 deletions(-) diff --git a/ports-mgmt/appstream-generator/Makefile b/ports-mgmt/appstream-generator/Makefile index 0902a5e8a736..30af516c742d 100644 --- a/ports-mgmt/appstream-generator/Makefile +++ b/ports-mgmt/appstream-generator/Makefile @@ -1,7 +1,7 @@ PORTNAME= appstream-generator DISTVERSIONPREFIX= v DISTVERSION= 0.10.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MAINTAINER= arrowd@FreeBSD.org diff --git a/ports-mgmt/appstream-generator/files/patch-backend b/ports-mgmt/appstream-generator/files/patch-backend new file mode 100644 index 000000000000..b8df2f4f9d7a --- /dev/null +++ b/ports-mgmt/appstream-generator/files/patch-backend @@ -0,0 +1,96 @@ +From 0426e92d54ea53b83fb03eab84194f6026356c3d Mon Sep 17 00:00:00 2001 +From: Gleb Popov <6yearold@gmail.com> +Date: Sun, 15 Feb 2026 19:11:30 +0300 +Subject: [PATCH] FreeBSD backend: little fixes for the packageForFile() code + path + +--- + src/backends/freebsd/fbsdpkg.cpp | 6 +++--- + src/backends/freebsd/fbsdpkgindex.cpp | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git src/backends/freebsd/fbsdpkg.cpp src/backends/freebsd/fbsdpkg.cpp +index 3b6ef9b..62b0ecd 100644 +--- src/backends/freebsd/fbsdpkg.cpp ++++ src/backends/freebsd/fbsdpkg.cpp +@@ -40,7 +40,7 @@ FreeBSDPackage *FreeBSDPackage::CreateFromWorkdir(const std::string &workDir) + if (!entry.is_regular_file()) + continue; + +- if (entry.path().extension() != "pkg") ++ if (entry.path().extension() != ".pkg") + continue; + + count++; +@@ -164,9 +164,9 @@ const std::vector<std::string> &FreeBSDPackage::contents() + if (m_isWorkdirPackage) { + std::vector<std::string> ret; + +- for (const auto &entry : fs::directory_iterator(m_stageDir)) { ++ for (const auto &entry : fs::recursive_directory_iterator(m_stageDir)) { + auto relPath = fs::relative(entry.path(), m_stageDir); +- ret.push_back(relPath); ++ ret.push_back(fs::path("/") / relPath); + } + + m_contentsL = ret; +diff --git src/backends/freebsd/fbsdpkgindex.cpp src/backends/freebsd/fbsdpkgindex.cpp +index ef879a2..f593021 100644 +--- src/backends/freebsd/fbsdpkgindex.cpp ++++ src/backends/freebsd/fbsdpkgindex.cpp +@@ -154,7 +154,7 @@ std::shared_ptr<Package> FreeBSDPackageIndex::packageForFile( + return nullptr; + } + +- return nullptr; ++ return std::shared_ptr<FreeBSDPackage>(FreeBSDPackage::CreateFromWorkdir(fname)); + } + + bool FreeBSDPackageIndex::hasChanges( +From 130da611fe7d197cd13f5545060e7e3c5319fcb3 Mon Sep 17 00:00:00 2001 +From: Gleb Popov <6yearold@gmail.com> +Date: Sun, 15 Feb 2026 19:12:44 +0300 +Subject: [PATCH] Engine::processFile: also pass custom prefix to the + IconHandler constructor + +--- + src/engine.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git src/engine.cpp src/engine.cpp +index 78b1fef..f9fbf66 100644 +--- src/engine.cpp ++++ src/engine.cpp +@@ -899,7 +899,8 @@ bool Engine::processFile( + *m_cstore, + m_dstore->mediaExportPoolDir(), + getIconCandidatePackages(suite, sectionName, arch), +- suite.iconTheme); ++ suite.iconTheme, ++ m_pkgIndex->dataPrefix()); + processPackages(pkgs, std::move(iconh), nullptr); + } + +From 80ec49446c8d9dc5b48fcde94a73d64752335177 Mon Sep 17 00:00:00 2001 +From: Gleb Popov <6yearold@gmail.com> +Date: Sun, 15 Feb 2026 19:14:04 +0300 +Subject: [PATCH] IconHandler: set the extra prefix when creating a builtin + hicolor theme + +--- + src/iconhandler.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/iconhandler.cpp src/iconhandler.cpp +index d3b1558..e5b68d3 100644 +--- src/iconhandler.cpp ++++ src/iconhandler.cpp +@@ -370,7 +370,7 @@ IconHandler::IconHandler( + indexData.resize(f.tellg()); + f.seekg(0, std::ios::beg); + f.read(reinterpret_cast<char *>(indexData.data()), indexData.size()); +- tmpThemes["hicolor"] = std::make_unique<Theme>("hicolor", indexData); ++ tmpThemes["hicolor"] = std::make_unique<Theme>("hicolor", indexData, m_extraPrefix); + } + } + } 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 deleted file mode 100644 index 483431c05781..000000000000 --- a/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkg.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index e5ddbc7c6f8e..000000000000 --- a/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkgindex.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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(home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d7bb95.3d9da.20eb40b0>