Skip to content

Commit ef08f03

Browse files
mologieAbrilRBS
andauthored
pkgconf: add 2.5.1 (#27866)
* pkgconf: add 2.5.1 * Revert recipe change so we don't generate unecessary new revision --------- Co-authored-by: Abril Rincón Blanco <[email protected]>
1 parent c468714 commit ef08f03

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

recipes/pkgconf/all/conandata.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
sources:
2+
"2.5.1":
3+
url: "https://distfiles.ariadne.space/pkgconf/pkgconf-2.5.1.tar.xz"
4+
sha256: "cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a50c243"
25
"2.2.0":
36
url: "https://distfiles.ariadne.space/pkgconf/pkgconf-2.2.0.tar.xz"
47
sha256: "b06ff63a83536aa8c2f6422fa80ad45e4833f590266feb14eaddfe1d4c853c69"
@@ -18,6 +21,8 @@ sources:
1821
url: "https://distfiles.ariadne.space/pkgconf/pkgconf-1.7.4.tar.xz"
1922
sha256: "d73f32c248a4591139a6b17777c80d4deab6b414ec2b3d21d0a24be348c476ab"
2023
patches:
24+
"2.5.1":
25+
- patch_file: "patches/2.5.1-0001-PKG_CONF_PATH-allow-colon+semicolon-separator.patch"
2126
"2.2.0":
2227
- patch_file: "patches/2.2.0-0001-PKG_CONF_PATH-allow-colon+semicolon-separator.patch"
2328
"2.1.0":
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- libpkgconf/path.c
2+
+++ libpkgconf/path.c
3+
@@ -177,7 +177,7 @@
4+
return 0;
5+
6+
iter = workbuf = strdup(text);
7+
- while ((p = strtok(iter, PKG_CONFIG_PATH_SEP_S)) != NULL)
8+
+ while ((p = strtok(iter, ";:")) != NULL)
9+
{
10+
pkgconf_path_add(p, dirlist, filter);
11+

recipes/pkgconf/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versions:
2+
"2.5.1":
3+
folder: "all"
24
"2.2.0":
35
folder: "all"
46
"2.1.0":

0 commit comments

Comments
 (0)