| Message ID | 20220128105917.30421-1-thomas.devoogdt@barco.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] package/libglib2: bump version to 2.69.1 | expand |
>>>>> "Thomas" == Thomas Devoogdt <thomas.devoogdt@gmail.com> writes: > The internal_pcre option was dropped in: > https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> > --- > package/libglib2/0002-remove-cpp-requirement.patch | 2 +- > package/libglib2/libglib2.hash | 4 ++-- > package/libglib2/libglib2.mk | 6 ++---- > 3 files changed, 5 insertions(+), 7 deletions(-) > +++ b/package/libglib2/libglib2.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > -LIBGLIB2_VERSION_MAJOR = 2.68 > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 > +LIBGLIB2_VERSION_MAJOR = 2.69 > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 The "odd" libglib versions numbers are afaik development versions. We normally only use stable versions in Buildroot. Do you have any idea when 2.70 is planned?
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: Hi, >> -LIBGLIB2_VERSION_MAJOR = 2.68 >> -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 >> +LIBGLIB2_VERSION_MAJOR = 2.69 >> +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 > The "odd" libglib versions numbers are afaik development versions. We > normally only use stable versions in Buildroot. Do you have any idea > when 2.70 is planned? Ahh, it is already out: https://download.gnome.org/sources/glib/2.70/
diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index c402cbafa5..ce73d54f16 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.68.4', + version : '2.69.1', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index d421e025ff..0363b6e081 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum -sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz +# https://download.gnome.org/sources/glib/2.69/glib-2.69.1.sha256sum +sha256 f92f34057a091fc8638d91f10cece842cb8618e9a1090b0ddb19cc15a21bf39c glib-2.69.1.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index af73aeb3bf..46bbba18ad 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.69 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -30,7 +30,6 @@ HOST_LIBGLIB2_CONF_OPTS = \ -Dselinux=disabled \ -Dsystemtap=false \ -Dxattr=false \ - -Dinternal_pcre=false \ -Dtests=false \ -Doss_fuzz=disabled @@ -52,7 +51,6 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ -Dglib_debug=disabled \ - -Dinternal_pcre=false \ -Dlibelf=disabled \ -Dgio_module_dir=/usr/lib/gio/modules \ -Dtests=false \
The internal_pcre option was dropped in: https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> --- package/libglib2/0002-remove-cpp-requirement.patch | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-)