From d51dfaebebec3f3f3886cf12f1f683021991cac9 Mon Sep 17 00:00:00 2001 From: chooyy Date: Mon, 1 Dec 2025 14:50:41 +0800 Subject: fix pacman find package --- xmake/modules/package/manager/pacman/find_package.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmake/modules/package/manager/pacman/find_package.lua b/xmake/modules/package/manager/pacman/find_package.lua index 7a38b0f46..af7fd837f 100644 --- a/xmake/modules/package/manager/pacman/find_package.lua +++ b/xmake/modules/package/manager/pacman/find_package.lua @@ -218,8 +218,6 @@ function main(name, opt) result.libfiles = result.libfiles or {} table.insert(result.libfiles, libfile) end - -- version should be the same if a pacman package contains multiples .pc - result.version = pcresult.version result.shared = pcresult.shared result.static = pcresult.static end @@ -238,6 +236,11 @@ function main(name, opt) if result.links then result.links = table.reverse_unique(result.links) end + + -- We should get version from pacman, because if a pacman package contains multiples .pc we may get a wrong version + local version = try { function() return os.iorunv(pacman.program, {"-Q", name}) end } + version = version:trim():split('%s+')[2] + result.version = version:split('-')[1] else -- if there is no .pc, we parse the package content to obtain the data we want result = _find_package_from_list(list, name, pacman, opt) -- cgit v1.3.1 From 20cdfc49126d86c28a9c298ab92ac64e19f2aefc Mon Sep 17 00:00:00 2001 From: chooyy Date: Mon, 1 Dec 2025 15:43:03 +0800 Subject: use semver.match --- xmake/modules/package/manager/pacman/find_package.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xmake/modules/package/manager/pacman/find_package.lua b/xmake/modules/package/manager/pacman/find_package.lua index af7fd837f..3b200db26 100644 --- a/xmake/modules/package/manager/pacman/find_package.lua +++ b/xmake/modules/package/manager/pacman/find_package.lua @@ -20,6 +20,7 @@ -- imports import("core.base.option") +import("core.base.semver") import("core.project.target") import("lib.detect.find_tool") import("private.core.base.is_cross") @@ -238,9 +239,13 @@ function main(name, opt) end -- We should get version from pacman, because if a pacman package contains multiples .pc we may get a wrong version - local version = try { function() return os.iorunv(pacman.program, {"-Q", name}) end } - version = version:trim():split('%s+')[2] - result.version = version:split('-')[1] + local verstr = try { function() return os.iorunv(pacman.program, {"-Q", name}) end } + if verstr then + local version = semver.match(verstr) + if version then + result.version = version:rawstr():split('-')[1] + end + end else -- if there is no .pc, we parse the package content to obtain the data we want result = _find_package_from_list(list, name, pacman, opt) -- cgit v1.3.1