Upgraded Glib to 2.72.0

This commit is contained in:
dslm4515
2022-03-29 12:11:24 -05:00
parent 1c76ccb7f8
commit cce6f39fbb
3 changed files with 5 additions and 28 deletions

View File

@ -1,7 +1,7 @@
#! /bin/bash
# Glib 2.70.0
# Source: https://download.gnome.org/sources/glib/2.70/glib-2.70.2.tar.xz
# Glib 2.72.0
# Source: ftp://ftp.acc.umu.se/pub/gnome/sources/glib/2.72/glib-2.72.0.tar.xz
#
# $BUILD = Directory to temporarily install
# $PKGS = Directory to store built packages
@ -19,9 +19,8 @@ export CFLAGS+="-O3 -Ofast -falign-functions=32 -ffat-lto-objects -flto=auto "
export CFLAGS+="-fno-semantic-interposition -mprefer-vector-width=256 "
export LDFLAGS="-flto=auto -Wl,-O2 -Wl,--as-needed "
patch -Np1 -i ../patches/glib-lfs/glib-2.70.0-skip_warnings-1.patch
patch -Np1 -i ../patches/glib-lfs/glib-2.72.0-skip_warnings-1.patch
patch -Np1 -i ../patches/glib-alpine/0001-gquark-fix-initialization-with-c-constructors.patch
patch -Np1 -i ../patches/glib-alpine/musl-libintl.patch
mkdir build &&
cd build &&
@ -72,7 +71,7 @@ EOF
sudo mv /tmp/slack-desc install/ &&
read -p "Enter to build and install package" &&
sudo makepkg -l y -c n $PKGS/glib-2.70.2-$(uname -m)-mlfs.txz &&
sudo makepkg -l y -c n $PKGS/glib-2.72.0-$(uname -m)-mlfs.txz &&
cd /BMAN
cat > /tmp/slack-desc << "EOF"
@ -85,6 +84,6 @@ glib-doc: GLib is required by nearly everything that uses GTK+ 1/2/3/4.x
glib-doc:
EOF
sudo mv /tmp/slack-desc install/
sudo makepkg -l y -c n $PKGS/glib-doc-2.70.2-noarch-mlfs.txz
sudo makepkg -l y -c n $PKGS/glib-doc-2.72.0-noarch-mlfs.txz
sudo rm -rf /BMAN/*
sudo rm -rf $BUILD/*

View File

@ -1,22 +0,0 @@
diff --git a/meson.build b/meson.build
index 319f183..3a5fdfc 100644
--- a/meson.build
+++ b/meson.build
@@ -2047,9 +2047,6 @@ endif
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
# implementations. This could be extended if issues are found in some platforms.
libintl_deps = []
-if cc.has_function('ngettext', args : osx_ldflags)
- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
-else
# First just find the bare library.
libintl = cc.find_library('intl', required : false)
# The bare library probably won't link without help if it's static.
@@ -2081,7 +2078,6 @@ else
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags,
dependencies : libintl_deps)
endif
-endif
glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset)