From nobody Thu Apr 9 14:45:41 2026 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 4fs2mQ0DFqz6Y2Q1 for ; Thu, 09 Apr 2026 14:45:42 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fs2mP6fRNz44bt for ; Thu, 09 Apr 2026 14:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775745942; 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=kwkW8vSUAQUaQx6+X9OQalxbS0+/15g+c9ujHd+7Tng=; b=ExOBxzvedw2ZgGG3DcZ3KFSW379g8Tmev188nZH+sshOR29OF4oEsJk4SLC58y+LRggsE6 d8Q3j1tAhCw44Q7378FWuwdWBzxl0oVXKyoWpRe11CS7yO4nLm4eJfBW7cDRaha2IYhL7m RvKHLHSTWhReRsQ1pyyZdy8IChMl2k8gW+ACRdLld5R4yML63fuO0zZ491Pj605mmvMKl5 MMQez1+7GWiwIXNTNP17bps1sPjsjcQPw6xMAj14Vr2qGiup/WoGaIBsohNUurpxmId6TJ MtCd3rzPHfTdMNk8ch67cXCxI2u/NGbg8rGej3H1fOpIFTlP7dgHglWUbVV32Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775745941; a=rsa-sha256; cv=none; b=AiJWS4L2tIB1JB2ZALFni73fhO5lhuzsjb0SooN+iYvCayf5gvzSLwF2dR12/j9mRKB7p/ FiIL2LfyEklWmXrxH7dQ+fITsiLJfsJPjjJSdSUZRJ3PsLZvVJMdVKEyXnOccWx/aZIQd1 NhHESt8qQv5dmI6UpzGX80OibxfIIx9rjFY61+NThiQblP/I0m1lIXYAJWeCcOGKiCuVjh nDKChI4QVv7sgX7qhZhRyZDbkUG/ZzL2HzQNVsoZCYx71pbpCrVcKwMDUsflXwWN5GRRsf ZiuhRQSD+z6loCT8fLlDqMkaF1M9fAgtuiGjBzAlQs96x845HjzuuVxxfo7t6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775745941; 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=kwkW8vSUAQUaQx6+X9OQalxbS0+/15g+c9ujHd+7Tng=; b=gSTtBZp3vLOcmh0rBunxvJblRSSCSwpSW4vHouC7ZFuah4sBo3jqEz3YKK7dKvv6kapsRh XTd/PFr2eo1O08HQMWUQZ5b27GrpKmzLqIYIY7gXQqJR5Q3vLxfMrf1lyM/UwbJip7v3wn zdo95B6I/WGo3GU5lN+OY4rYK5XU3hkRvx56+FDEBU/NND5aitdpO9/k9FpSiRzwPncerV WZi8CEKcd7L07SOki3jsywuSsYYtzHONriAd50W6nevyumPYwH66+48SzpQauMitDhlsOU v0bPrI3V0zU5XULEGGF0FQoSzaengUfNmgvAXfNLLSpYOKbKINAshreIYeGEig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fs2mP5wQgz1Gtj for ; Thu, 09 Apr 2026 14:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d9da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 14:45:41 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 547f63780f9c - main - ports-mgmt/appstream-generator: Pull more patches from upstream 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 547f63780f9ce030c3fed68afebdb42d815c427c Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 14:45:41 +0000 Message-Id: <69d7bb95.3d9da.20eb40b0@gitrepo.freebsd.org> The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=547f63780f9ce030c3fed68afebdb42d815c427c commit 547f63780f9ce030c3fed68afebdb42d815c427c Author: Gleb Popov AuthorDate: 2026-04-09 14:41:25 +0000 Commit: Gleb Popov 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 &FreeBSDPackage::contents() + if (m_isWorkdirPackage) { + std::vector 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 FreeBSDPackageIndex::packageForFile( + return nullptr; + } + +- return nullptr; ++ return std::shared_ptr(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(indexData.data()), indexData.size()); +- tmpThemes["hicolor"] = std::make_unique("hicolor", indexData); ++ tmpThemes["hicolor"] = std::make_unique("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 FreeBSDPackageIndex::packageF - return nullptr; - } - -- return nullptr; -+ return std::shared_ptr(FreeBSDPackage::CreateFromWorkdir(fname)); - } - - bool FreeBSDPackageIndex::hasChanges(