diff --git a/README.md b/README.md index 3da5d1c1..0aa5eefa 100644 --- a/README.md +++ b/README.md @@ -272,15 +272,14 @@ Here are nevertheless some useful hints to run WINE manually: ## Static GNU/Linux libraries This repository contains several `static-compat-*` packages providing static libraries intended to distribute "self-contained" executables. These libraries -are built against and older version of glibc to be able to run on older +are built against an older version of glibc to be able to run on older distributions without having to link against glibc statically. The resulting binaries should run on distributions with glibc 2.26 or newer (or Linux 4.4 and newer when linking against glibc statically), e.g. openSUSE Leap 15.0, Fedora 27, Debian 10 and Ubuntu 18.04. The packages might not be updated as regularly as their normal counterparts but the idea is to provide an environment with a recent version of GCC/libstdc++ and other libraries such as Qt and Boost but -still be able to run the resulting executables on older distributions. Note that -these packages are still experimental at this point. +still be able to run the resulting executables on older distributions. To use the packages, simply invoke `/usr/static-compat/bin/g++` instead of `/usr/bin/g++`. The package `static-compat-environment` provide a script to set diff --git a/glib2/static-compat/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch b/glib2/static-compat/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch index b244a7e0..c2d7b698 100644 --- a/glib2/static-compat/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch +++ b/glib2/static-compat/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch @@ -8,10 +8,10 @@ Subject: [PATCH] glib-compile-schemas: Remove noisy deprecation warnings 1 file changed, 13 deletions(-) diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index 83184e1e8d67..e575dad294e5 100644 +index 326658a88b35..f61d45b9a364 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c -@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, +@@ -1234,19 +1234,6 @@ parse_state_start_schema (ParseState *state, return; } diff --git a/glib2/static-compat/PKGBUILD b/glib2/static-compat/PKGBUILD index ebe39b9f..50360830 100644 --- a/glib2/static-compat/PKGBUILD +++ b/glib2/static-compat/PKGBUILD @@ -3,21 +3,21 @@ _pkgname=glib2 pkgname=static-compat-$_pkgname -pkgver=2.72.3 +pkgver=2.74.0 pkgrel=1 pkgdesc="Low level core library" url="https://wiki.gnome.org/Projects/GLib" license=(LGPL) arch=(x86_64) -depends=(static-compat-pcre static-compat-libffi static-compat-util-linux static-compat-zlib) +depends=(static-compat-pcre2 static-compat-libffi static-compat-util-linux static-compat-zlib) makedepends=(gettext shared-mime-info python libelf git static-compat-meson) checkdepends=(desktop-file-utils) options=(!strip !emptydirs staticlibs) -_commit=dce30492f6087a8e1e288f1706d41142b74ca1ff # tags/2.72.3^0 +_commit=30bd57ecf8aa051de9848ba5a2b140f4810401ff # tags/2.72.3^0 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit" 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch) sha256sums=('SKIP' - 'f410289d8acf787cf0fc512efe5622d4bbd574c032e3ee0efd9cae2155b2c3dc') + '6d51eb5856268d79eee01b97a299fa9f99db18b2abb4df56f2ed9e641a09138a') pkgver() { cd glib @@ -29,6 +29,10 @@ prepare() { # Suppress noise from glib-compile-schemas.hook git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch + + # https://bugs.archlinux.org/task/75980 + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2921 + git cherry-pick -n 'ea3f17d598d550345e94e4571130e429443e91cb' } build() {