Skip to content

Commit

Permalink
Update xz, gettext, libffi, libpng, expat, pixman, glib, pango, libgp…
Browse files Browse the repository at this point in the history
…g-error
  • Loading branch information
AlienCowEatCake committed Mar 4, 2024
1 parent 0a2bd8a commit 017e70f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
18 changes: 9 additions & 9 deletions modulesets/bootstrap.modules
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@

<!-- https://tukaani.org/xz/ -->
<autotools id="xz" autogen-sh="configure" autogenargs="--disable-doc --disable-static">
<branch repo="github-tarball" module="tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2" version="5.4.6">
<branch repo="github-tarball" module="tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2" version="5.6.0">
<patch file="0001-XZ-disable-futimens.patch" strip="1"/>
</branch>
</autotools>

<!-- https://ftp.gnu.org/gnu/gettext/ -->
<autotools id="gettext" autogen-sh="configure" autogenargs="--disable-static">
<branch repo="ftp.gnu.org" module="gettext/gettext-${version}.tar.gz" version="0.22.4">
<branch repo="ftp.gnu.org" module="gettext/gettext-${version}.tar.gz" version="0.22.5">
<patch file="0001-GETTEXT-disable-futimens-utimensat.patch" strip="1"/>
</branch>
</autotools>
Expand Down Expand Up @@ -130,27 +130,27 @@
<!-- https://github.com/libffi/libffi/releases/ -->
<!-- disable-multi-os-directory: see https://sourceware.org/ml/libffi-discuss/2014/msg00078.html -->
<autotools id="libffi" autogen-sh="configure" autogenargs="--disable-multi-os-directory --disable-builddir --disable-static">
<branch repo="github-tarball" module="libffi/libffi/releases/download/v${version}/libffi-${version}.tar.gz" version="3.4.5"/>
<branch repo="github-tarball" module="libffi/libffi/releases/download/v${version}/libffi-${version}.tar.gz" version="3.4.6"/>
</autotools>

<!-- http://www.libpng.org/pub/png/libpng.html -->
<autotools id="libpng" autogen-sh="configure" autogenargs="--enable-shared --disable-static">
<branch repo="sourceforge" module="libpng/libpng-${version}.tar.gz" version="1.6.42">
<branch repo="sourceforge" module="libpng/libpng-${version}.tar.gz" version="1.6.43">
<patch file="0001-LIBPNG-add-macOS-10.13-guard-for-inflateValidate.patch" strip="1"/>
</branch>
</autotools>

<!-- https://github.com/libexpat/libexpat/releases/ -->
<autotools id="expat" autogen-sh="configure" autogenargs="--without-examples --without-tests --without-docbook --disable-static">
<branch repo="github-tarball" module="libexpat/libexpat/releases/download/R_2_6_0/expat-${version}.tar.bz2" version="2.6.0"/>
<branch repo="github-tarball" module="libexpat/libexpat/releases/download/R_2_6_1/expat-${version}.tar.bz2" version="2.6.1"/>
</autotools>

<!-- https://www.cairographics.org/releases/ -->
<!-- Disable NEON intrinsic support on macOS -->
<!-- Issue ref: https://gitlab.freedesktop.org/pixman/pixman/-/issues/59 -->
<!-- Issue ref: https://gitlab.freedesktop.org/pixman/pixman/-/issues/69 -->
<meson id="pixman" mesonargs="--buildtype=release -Dgtk=disabled -Dtests=disabled -Ddemos=disabled -Dmmx=disabled -Da64-neon=disabled">
<branch repo="cairo" module="pixman-${version}.tar.gz" version="0.43.2"/>
<branch repo="cairo" module="pixman-${version}.tar.gz" version="0.43.4"/>
<after>
<dep package="libpng"/>
</after>
Expand Down Expand Up @@ -214,7 +214,7 @@

<!-- https://download.gnome.org/sources/glib/ -->
<meson id="glib" mesonargs="--buildtype=release -Dlibmount=disabled -Dman-pages=disabled -Ddocumentation=false -Dtests=false">
<branch module="glib/2.79/glib-${version}.tar.xz" version="2.79.2">
<branch module="glib/2.79/glib-${version}.tar.xz" version="2.79.3">
<patch file="0001-GLIB-disable-utimensat.patch" strip="1"/>
</branch>
<dependencies>
Expand Down Expand Up @@ -248,7 +248,7 @@

<!-- https://download.gnome.org/sources/pango/ -->
<meson id="pango" mesonargs="--buildtype=release -Dintrospection=disabled -Dfontconfig=disabled -Dfreetype=disabled">
<branch version="1.51.2" module="pango/1.51/pango-${version}.tar.xz"/>
<branch version="1.52.0" module="pango/1.52/pango-${version}.tar.xz"/>
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
Expand Down Expand Up @@ -415,7 +415,7 @@

<!-- https://www.gnupg.org/ftp/gcrypt/libgpg-error/ -->
<autotools id="libgpg-error" autogenargs="--disable-static --disable-doc --disable-tests --enable-install-gpg-error-config" autogen-sh="configure">
<branch repo="gnupg" module="libgpg-error/libgpg-error-${version}.tar.bz2" version="1.47"/>
<branch repo="gnupg" module="libgpg-error/libgpg-error-${version}.tar.bz2" version="1.48"/>
</autotools>

<!-- https://www.gnupg.org/ftp/gcrypt/libassuan/ -->
Expand Down
10 changes: 5 additions & 5 deletions patches/0001-XZ-disable-futimens.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ Subject: [PATCH] XZ: disable futimens
1 file changed, 3 insertions(+)

diff --git a/config.h.in b/config.h.in
index c8ba420..f95b12c 100644
index 8370ce1..dda69d5 100644
--- a/config.h.in
+++ b/config.h.in
@@ -133,7 +133,10 @@
#undef HAVE_FCNTL_H
@@ -157,7 +157,10 @@
#undef HAVE_FUNC_ATTRIBUTE_IFUNC

/* Define to 1 if you have the `futimens' function. */
/* Define to 1 if you have the 'futimens' function. */
+/*
+// warning: 'futimens' is only available on macOS 10.13 or newer [-Wunguarded-availability-new]
#undef HAVE_FUTIMENS
+*/

/* Define to 1 if you have the `futimes' function. */
/* Define to 1 if you have the 'futimes' function. */
#undef HAVE_FUTIMES
--
2.37.0 (Apple Git-136)
Expand Down

0 comments on commit 017e70f

Please sign in to comment.