Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -4570,3 +4570,4 @@ libresvg.so.0.46 libresvg0-0.46.0_1
libgpiod.so.3 libgpiod-2.2_4
libgpiodcxx.so.2 libgpiod-2.2_4
libigloo.so.0 libigloo-0.9.5_1
libfyaml.so.0 libfyaml-0.9.6_1
38 changes: 38 additions & 0 deletions srcpkgs/AppStream/patches/libfyaml-0.9.5-compatibility.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 717f1234b6f26c07af4a7758840dcd0e846133a9 Mon Sep 17 00:00:00 2001
From: Naz <ndpm13@ch-naseem.com>
Date: Fri, 17 Apr 2026 16:56:04 +0100
Subject: [PATCH] update YAML test data for libfyaml>=0.9.5 compatibility

---
tests/test-yamldata.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test-yamldata.c b/tests/test-yamldata.c
index b470595..48001d2 100644
--- a/tests/test-yamldata.c
+++ b/tests/test-yamldata.c
@@ -1057,7 +1057,7 @@ static const gchar *yamldata_relations_field = "Type: generic\n"
"- id: org.example.old_test\n"
"Requires:\n"
"- kernel: Linux\n"
- " version: \">= 4.15\"\n"
+ " version: \'>= 4.15\'\n"
"- id: org.example.TestDependency\n"
" version: == 1.2\n"
"- display_length: 4200\n"
@@ -1881,10 +1881,10 @@ test_yaml_rw_branding (void)
" colors:\n"
" - type: primary\n"
" scheme-preference: light\n"
- " value: \"#ff00ff\"\n"
+ " value: \'#ff00ff\'\n"
" - type: primary\n"
" scheme-preference: dark\n"
- " value: \"#993d3d\"\n";
+ " value: \'#993d3d\'\n";
g_autoptr(AsComponent) cpt = NULL;
g_autofree gchar *res = NULL;
AsBranding *branding;
--
2.53.0

13 changes: 9 additions & 4 deletions srcpkgs/AppStream/template
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
# Template file for 'AppStream'
pkgname=AppStream
version=1.0.4
revision=2
version=1.1.2
revision=1
build_style=meson
build_helper="gir qemu"
make_check_args="--print-errorlogs"
configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)
-Dstemming=false -Dapidocs=false -Dqt=true -Dsystemd=false
-Dcompose=true"
hostmakedepends="docbook-xsl gettext glib-devel gperf libxslt pkg-config
qt6-base $(vopt_if vala vala) itstool"
makedepends="libglib-devel libxml2-devel libyaml-devel qt6-base-devel libxmlb-devel
libcurl-devel librsvg-devel qt6-tools"
libcurl-devel librsvg-devel qt6-tools libfyaml-devel bash-completion"
checkdepends="tar"
short_desc="Tools and libraries to work with AppStream metadata"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/ximion/appstream"
changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
checksum=dff6efa67d9ea4797870d70e3370b9e3fa66ce3c749aba68e6b10222473463cf
checksum=564ec87b16e9e4ee81fb021e612250fd27f3a3ecd31c209a5dd1ff59def3022d
triggers="appstream-cache"

if [ "$CROSS_BUILD" ]; then
Expand All @@ -34,6 +35,10 @@ pre_configure() {
export PATH="/usr/lib/qt6/libexec/:$PATH"
}

post_install() {
rm -rf ${DESTDIR}/usr/share/installed-tests
}

AppStream-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
Expand Down
1 change: 1 addition & 0 deletions srcpkgs/libfyaml-devel
88 changes: 88 additions & 0 deletions srcpkgs/libfyaml/patches/cherry-pick-commit-1026d76.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
From 45faa819b6c3eb54b2d63b46d4c7690fa1e8e8ff Mon Sep 17 00:00:00 2001
From: Nanda H Krishna <me@nandahkrishna.com>
Date: Sun, 15 Mar 2026 17:56:13 -0400
Subject: [PATCH] Fix C11 atomics detection and buggy macros for C++
compatibility

---
include/libfyaml/libfyaml-atomics.h | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/libfyaml/libfyaml-atomics.h b/include/libfyaml/libfyaml-atomics.h
index 54d88ae7..64142a83 100644
--- a/include/libfyaml/libfyaml-atomics.h
+++ b/include/libfyaml/libfyaml-atomics.h
@@ -78,7 +78,7 @@ extern "C" {
#if !defined(FY_HAVE_C11_ATOMICS)
#undef FY_HAVE_STDATOMIC_H

-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(__cplusplus)
#define FY_HAVE_C11_ATOMICS
#elif defined(__clang__) && defined(__has_extension)
#if __has_extension(c_atomic)
@@ -123,7 +123,7 @@ typedef bool atomic_flag;

#define atomic_store(_ptr, _val) \
do { \
- *(_obj) = (_val); \
+ *(_ptr) = (_val); \
} while(0)

#define atomic_exchange(_ptr, _v) \
@@ -152,6 +152,7 @@ typedef bool atomic_flag;

#define atomic_fetch_add(_ptr, _v) \
({ \
+ __typeof__(_ptr) __ptr = (_ptr); \
__typeof__(*(_ptr)) __old = *__ptr; \
*__ptr += (_v); \
__old; \
@@ -159,6 +160,7 @@ typedef bool atomic_flag;

#define atomic_fetch_sub(_ptr, _v) \
({ \
+ __typeof__(_ptr) __ptr = (_ptr); \
__typeof__(*(_ptr)) __old = *__ptr; \
*__ptr -= (_v); \
__old; \
@@ -166,6 +168,7 @@ typedef bool atomic_flag;

#define atomic_fetch_or(_ptr, _v) \
({ \
+ __typeof__(_ptr) __ptr = (_ptr); \
__typeof__(*(_ptr)) __old = *__ptr; \
*__ptr |= (_v); \
__old; \
@@ -173,6 +176,7 @@ typedef bool atomic_flag;

#define atomic_fetch_xor(_ptr, _v) \
({ \
+ __typeof__(_ptr) __ptr = (_ptr); \
__typeof__(*(_ptr)) __old = *__ptr; \
*__ptr ^= (_v); \
__old; \
@@ -180,6 +184,7 @@ typedef bool atomic_flag;

#define atomic_fetch_and(_ptr, _v) \
({ \
+ __typeof__(_ptr) __ptr = (_ptr); \
__typeof__(*(_ptr)) __old = *__ptr; \
*__ptr &= (_v); \
__old; \
@@ -199,13 +204,14 @@ typedef bool atomic_flag;
#define atomic_flag_test_and_set(_ptr) \
({ \
volatile atomic_flag *__ptr = (_ptr); \
+ bool __ret; \
if (!*__ptr) { \
*__ptr = true; \
__ret = true; \
} else \
__ret = false; \
__ret; \
- }
+ })

#endif

27 changes: 27 additions & 0 deletions srcpkgs/libfyaml/patches/fix-32bit.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/include/libfyaml/libfyaml-vlsize.h b/include/libfyaml/libfyaml-vlsize.h
index 6ccb7ab..acfd78d 100644
--- a/include/libfyaml/libfyaml-vlsize.h
+++ b/include/libfyaml/libfyaml-vlsize.h
@@ -810,13 +810,18 @@ fy_decode_size(const uint8_t *start, size_t bufsz, size_t *sizep)
static inline const uint8_t *
fy_decode_size_nocheck(const uint8_t *start, size_t *sizep)
{
- return fy_decode_size32_nocheck(start, sizep);
+ uint64_t sz;
+ const uint8_t *ret;
+
+ ret = fy_decode_size32_nocheck(start, &sz);
+ *sizep = (size_t)sz;
+ return ret;
}

static inline const uint8_t *
fy_skip_size(const uint8_t *start, size_t bufsz)
{
- return fy_skip_size32(start, bufsz, &sz);
+ return fy_skip_size32(start, bufsz);
}

static inline const uint8_t *
--
2.53.0
31 changes: 31 additions & 0 deletions srcpkgs/libfyaml/patches/fix-none-required.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 5580df46df9fe48a960474934c82d53dcf070364 Mon Sep 17 00:00:00 2001
From: Naz <ndpm13@ch-naseem.com>
Date: Fri, 17 Apr 2026 16:32:35 +0100
Subject: [PATCH] build: don't output "none required" to LIBM

---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index b03cf24..1ab4897 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,10 +253,10 @@ AC_DEFINE_UNQUOTED([HAVE_ASAN], [$HAVE_ASAN], [Define to 1 if ASAN is enabled])

# Link libm on platforms where trunc() lives outside libc.
AC_SEARCH_LIBS([trunc], [m])
-LIBM="$ac_cv_search_trunc"
-if test "x$LIBM" = "xno" || test "x$LIBM" = "xyes" ; then
- LIBM=""
-fi
+case "$ac_cv_search_trunc" in
+ no|yes|"none required") LIBM="" ;;
+ *) LIBM="$ac_cv_search_trunc"
+esac
AC_SUBST(LIBM)

# check if there's a qsort_r available (musl does not have it)
--
2.53.0

40 changes: 40 additions & 0 deletions srcpkgs/libfyaml/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Template file for 'libfyaml'
pkgname=libfyaml
version=0.9.6
revision=1
build_style=gnu-configure
configure_args="--disable-network --libdir=/usr/lib"
hostmakedepends="pkg-config autoconf automake libtool git jq
python3-pip"
makedepends="libyaml-devel check-devel"
short_desc="Fully feature complete YAML parser and emitter"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pantoniou/libfyaml"
changelog="https://raw.githubusercontent.com/pantoniou/libfyaml/refs/heads/master/CHANGELOG.md"
distfiles="https://github.com/pantoniou/libfyaml/archive/refs/tags/v${version}.tar.gz"
checksum=2d016379a69f6cf6beaf06d12bcefe1ad1784bab28fbb41a6fa8d49d25f1bc0a

pre_configure() {
case "$XBPS_TARGET_MACHINE" in
armv6l*) export CFLAGS+=" -march=armv6k" ;;
esac

./bootstrap.sh
}

post_install() {
vlicense LICENSE
}

libfyaml-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/share/man/man3
}
}