| Message ID | 20210520172508.802556-1-aduskett@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Next:1/1] package/libglib2: bump version to 2.68.2 | expand |
Adam, All, On 2021-05-20 10:25 -0700, Adam Duskett spake thusly: > Includes an important bugfix: #2387 json-glib does not build with glib 2.68.1 > > Signed-off-by: Adam Duskett <aduskett@gmail.com> Applied to next, thanks. Regards, Yann E. MORIN. > --- > package/libglib2/0002-remove-cpp-requirement.patch | 2 +- > package/libglib2/libglib2.hash | 4 ++-- > package/libglib2/libglib2.mk | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch > index 35d46e161b..9393bd258a 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.1', > + version : '2.68.2', > # 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 e3a3aa7561..15e0085f78 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.1.sha256sum > -sha256 241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333 glib-2.68.1.tar.xz > +# https://download.gnome.org/sources/glib/2.68/glib-2.68.2.sha256sum > +sha256 ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb glib-2.68.2.tar.xz > # License files, locally calculated > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > index e3263ce9ce..4f13622e36 100644 > --- a/package/libglib2/libglib2.mk > +++ b/package/libglib2/libglib2.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBGLIB2_VERSION_MAJOR = 2.68 > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 > 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+ > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 35d46e161b..9393bd258a 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.1', + version : '2.68.2', # 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 e3a3aa7561..15e0085f78 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.1.sha256sum -sha256 241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333 glib-2.68.1.tar.xz +# https://download.gnome.org/sources/glib/2.68/glib-2.68.2.sha256sum +sha256 ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb glib-2.68.2.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index e3263ce9ce..4f13622e36 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 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+
Includes an important bugfix: #2387 json-glib does not build with glib 2.68.1 Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/libglib2/0002-remove-cpp-requirement.patch | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)