Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-04-15 10:48:31 +00:00
3 changed files with 3 additions and 3 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] CMakeLists.txt: fix pkgconfig install path
pkgconfig pc files need to go under libdir instead of datadir.
Suggested-by: Sam James <sam@gentoo.org>
Upstream-Status: In-Progress [https://github.com/Rajaram-Regupathy/libtypec/pull/32]
Upstream-Status: Backport [upstream commit 8614051]
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

View File

@@ -19,7 +19,7 @@ warning: implicit declaration of function nftw; did you mean ftw?
| ftw
[1] https://linux.die.net/man/3/nftw
Upstream-Status: In-Progress [https://github.com/Rajaram-Regupathy/libtypec/pull/32]
Upstream-Status: Backport [upstream commit f1ecf54]
---
libtypec_sysfs_ops.c | 5 +++++
1 file changed, 5 insertions(+)

View File

@@ -32,7 +32,7 @@ In file included from /var/tmp/portage/dev-libs/libtypec-0.5.0/work/libtypec-0.5
[1]
https://www.gnu.org/software/libc/manual/html_node/Working-with-Directory-Trees.html#index-_005f_005fnftw_005ffunc_005ft
[2] https://man7.org/linux/man-pages/man3/ftw.3.html
Upstream-Status: In-Progress [https://github.com/Rajaram-Regupathy/libtypec/pull/32]
Upstream-Status: Backport [upstream commit d11cd00]
---
libtypec_sysfs_ops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)