From 5c6b2b30ba26d2f3a870c0b72a77d92d53b9decc Mon Sep 17 00:00:00 2001 From: Redbeanw44602 Date: Mon, 22 Sep 2025 14:58:55 +0800 Subject: fix version in auto-generated .pc. --- xmake/modules/private/action/require/impl/actions/install.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua index 27e30d77e..76e65eb5f 100644 --- a/xmake/modules/private/action/require/impl/actions/install.lua +++ b/xmake/modules/private/action/require/impl/actions/install.lua @@ -108,6 +108,8 @@ function _patch_pkgconfig(package) -- patch a *.pc file local file = io.open(pcfile, 'w') if file then + -- @see https://github.com/xmake-io/xmake-repo/pull/8165#discussion_r2366249416 + local version = package:version_str():gsub("^v", "") file:print("# Generated by Xmake") file:print("prefix=%s", "${pcfiledir}/" .. path.unix(path.relative(installdir, path.directory(pcfile)))) file:print("exec_prefix=${prefix}") @@ -116,7 +118,7 @@ function _patch_pkgconfig(package) file:print("") file:print("Name: %s", package:name()) file:print("Description: %s", package:description()) - file:print("Version: %s", package:version_str()) + file:print("Version: %s", version) file:print("Libs: %s", libs) file:print("Libs.private: ") file:print("Cflags: %s", cflags) -- cgit v1.3.1 From a5bcafadecc816b0becc89f627151bf4aa6b49df Mon Sep 17 00:00:00 2001 From: Redbeanw44602 Date: Mon, 22 Sep 2025 17:45:13 +0800 Subject: update. --- xmake/modules/private/action/require/impl/actions/install.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua index 76e65eb5f..d7310149a 100644 --- a/xmake/modules/private/action/require/impl/actions/install.lua +++ b/xmake/modules/private/action/require/impl/actions/install.lua @@ -109,7 +109,7 @@ function _patch_pkgconfig(package) local file = io.open(pcfile, 'w') if file then -- @see https://github.com/xmake-io/xmake-repo/pull/8165#discussion_r2366249416 - local version = package:version_str():gsub("^v", "") + local version = package:version_str():ltrim("v") file:print("# Generated by Xmake") file:print("prefix=%s", "${pcfiledir}/" .. path.unix(path.relative(installdir, path.directory(pcfile)))) file:print("exec_prefix=${prefix}") -- cgit v1.3.1