glib: add 2.66.2 and 2.64.6 (#19793)

This commit is contained in:
Michael Kuhn 2020-11-07 03:49:21 +01:00 committed by GitHub
parent 07b1ddee23
commit 010ad6011e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 1 deletions

View file

@ -0,0 +1,30 @@
--- a/meson.build
+++ b/meson.build
@@ -2003,9 +2003,10 @@
# 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')
+gettext_opt = get_option('gettext')
+if ['auto', 'libc'].contains(gettext_opt) and cc.has_function('ngettext')
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
-else
+elif ['auto', 'external'].contains(gettext_opt)
# 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.
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,6 +9,12 @@
value : 'auto',
description : 'iconv implementation to use (\'libc\' = \'Part of the C library\'; \'external\' = \'External libiconv\'; \'auto\' = \'Auto-detect which iconv is available\')')
+option('gettext',
+ type : 'combo',
+ choices : ['auto', 'libc', 'external'],
+ value : 'auto',
+ description : 'gettext implementation to use (\'libc\' = \'Part of the C library\'; \'external\' = \'External libintl\'; \'auto\' = \'Auto-detect which gettext is available\')')
+
option('charsetalias_dir',
type : 'string',
value : '',

View file

@ -21,6 +21,8 @@ class Glib(Package):
homepage = "https://developer.gnome.org/glib/"
url = "https://ftp.gnome.org/pub/gnome/sources/glib/2.53/glib-2.53.1.tar.xz"
version('2.66.2', sha256='ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4')
version('2.64.6', sha256='c36ee07a70164c71f046016fe6aaacd6368333c42590bc0cba47c344ffb853f1')
version('2.64.5', sha256='9cbd5bd2715ead1c28d53c46f7b7b6ff6166f5887b772c1a9e3bf2910cfecc11')
version('2.64.4', sha256='f7e0b325b272281f0462e0f7fff25a833820cac19911ff677251daf6d87bce50')
version('2.64.3', sha256='fe9cbc97925d14c804935f067a3ad77ef55c0bbe9befe68962318f5a767ceb22')
@ -73,7 +75,8 @@ class Glib(Package):
# glib prefers the libc version of gettext, which breaks the build if the
# external version is also found.
patch('meson-gettext.patch', when='@2.58.0:')
patch('meson-gettext.patch', when='@2.58:2.64')
patch('meson-gettext-2.66.patch', when='@2.66:')
def url_for_version(self, version):
"""Handle glib's version-based custom URLs."""