From 0f0a5187a67aaf149dce92ac70500d67c434055b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 17 Aug 2020 14:36:27 -0700 Subject: [PATCH] glib2: update to 2.65.1 Add a small hack to glib2 to avoid using proxy-intl and break compilation under uClibc-ng. Signed-off-by: Rosen Penev --- libs/glib2/Makefile | 6 +++--- libs/glib2/patches/001-no-libelf.patch | 2 +- libs/glib2/patches/004-no-distutils.patch | 2 +- libs/glib2/patches/005-uclibc.patch | 13 +++++++++++++ 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 libs/glib2/patches/005-uclibc.patch diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 7afdd5335..cc7170a2b 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 -PKG_VERSION:=2.65.0 -PKG_RELEASE:=5 +PKG_VERSION:=2.65.1 +PKG_RELEASE:=1 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/glib/2.65 -PKG_HASH:=b041e63cd0ac1fccb486374022ade040d907aad29b278e27d9e43e9294a6e7a3 +PKG_HASH:=bc63bf6c32713e0ee1dddc28e03f23b4a20c78bcb9a2c5b0f4eea41e46fb9cee PKG_MAINTAINER:=Peter Wagner PKG_LICENSE:=LGPL-2.1-or-later diff --git a/libs/glib2/patches/001-no-libelf.patch b/libs/glib2/patches/001-no-libelf.patch index 0bbc8261a..a1fe738da 100644 --- a/libs/glib2/patches/001-no-libelf.patch +++ b/libs/glib2/patches/001-no-libelf.patch @@ -1,6 +1,6 @@ --- a/gio/meson.build +++ b/gio/meson.build -@@ -881,20 +881,6 @@ endif +@@ -874,20 +874,6 @@ endif # Dependencies used by executables below have_libelf = false diff --git a/libs/glib2/patches/004-no-distutils.patch b/libs/glib2/patches/004-no-distutils.patch index 1558f3b8c..f43ba9b5b 100644 --- a/libs/glib2/patches/004-no-distutils.patch +++ b/libs/glib2/patches/004-no-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -2137,16 +2137,10 @@ endif +@@ -2168,16 +2168,10 @@ endif glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline) diff --git a/libs/glib2/patches/005-uclibc.patch b/libs/glib2/patches/005-uclibc.patch new file mode 100644 index 000000000..d1059c68b --- /dev/null +++ b/libs/glib2/patches/005-uclibc.patch @@ -0,0 +1,13 @@ +--- a/meson.build ++++ b/meson.build +@@ -1986,8 +1986,8 @@ 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') +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') ++if true ++ have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', prefix :'#include ') + else + # First just find the bare library. + libintl = cc.find_library('intl', required : false)