From 5c89d30bb1754cb73d63908f1224fa3f0f02b6fd Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Tue, 12 Jul 2022 20:10:17 -0500 Subject: [PATCH] glib: 2.73.2 --- extra/glib/build | 2 ++ extra/glib/checksums | 3 ++- extra/glib/patches/musl.patch | 17 +++++++++++++++++ extra/glib/sources | 1 + extra/glib/version | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 extra/glib/patches/musl.patch diff --git a/extra/glib/build b/extra/glib/build index eb1f4610..76b06522 100755 --- a/extra/glib/build +++ b/extra/glib/build @@ -1,5 +1,7 @@ #!/bin/sh -e +patch -p1 < musl.patch + # Remove 'util-linux' dependency. sed 's/libmount_dep.found()/false/' meson.build > _ mv -f _ meson.build diff --git a/extra/glib/checksums b/extra/glib/checksums index fd36f1e5..b064c818 100644 --- a/extra/glib/checksums +++ b/extra/glib/checksums @@ -1 +1,2 @@ -77b21da5bd195a8e5f751206a2acab477636e3d02fe4f3796ede5788255382ae +5f3ee36e34f4aaab393c3e3dc46fb01b32f7ead6c88d41d7f20d88a49cdef1d9 +5476b0c742dc348812de45f0a26dc9f471c432e56aec2c2074a23a8488c1caf6 diff --git a/extra/glib/patches/musl.patch b/extra/glib/patches/musl.patch new file mode 100644 index 00000000..654e9303 --- /dev/null +++ b/extra/glib/patches/musl.patch @@ -0,0 +1,17 @@ +diff --git a/glib/gmain.c b/glib/gmain.c +index fcf0b3dba..af1ed66b4 100644 +--- a/glib/gmain.c ++++ b/glib/gmain.c +@@ -73,6 +73,12 @@ + #include + #include + #include /* P_PIDFD */ ++#ifndef W_EXITCODE ++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) ++#endif ++#ifndef W_STOPCODE ++#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) ++#endif + #endif /* HAVE_PIDFD */ + + #ifdef G_OS_WIN32 diff --git a/extra/glib/sources b/extra/glib/sources index defa65c7..c5fbd0c2 100644 --- a/extra/glib/sources +++ b/extra/glib/sources @@ -1 +1,2 @@ https://download.gnome.org/sources/glib/MAJOR.MINOR/glib-VERSION.tar.xz +patches/musl.patch diff --git a/extra/glib/version b/extra/glib/version index de6a94bb..6ba906e5 100644 --- a/extra/glib/version +++ b/extra/glib/version @@ -1 +1 @@ -2.73.1 1 +2.73.2 1