* [Buildroot] [PATCH] package/libglib2: bump version to 2.68.4
@ 2021-09-16 17:07 Adam Duskett
2021-09-18 15:07 ` Yann E. MORIN
0 siblings, 1 reply; 3+ messages in thread
From: Adam Duskett @ 2021-09-16 17:07 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett, Fabrice Fontaine
From: Adam Duskett <aduskett@rivian.com>
Signed-off-by: Adam Duskett <aduskett@rivian.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(-)
diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch
index 9393bd258a..c402cbafa5 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.2',
+ version : '2.68.4',
# 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 15e0085f78..d421e025ff 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.2.sha256sum
-sha256 ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb glib-2.68.2.tar.xz
+# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum
+sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz
# License files, locally calculated
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 4f13622e36..af73aeb3bf 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).2
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4
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.30.2
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH] package/libglib2: bump version to 2.68.4
2021-09-16 17:07 [Buildroot] [PATCH] package/libglib2: bump version to 2.68.4 Adam Duskett
@ 2021-09-18 15:07 ` Yann E. MORIN
2021-09-20 16:26 ` Adam Duskett
0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2021-09-18 15:07 UTC (permalink / raw)
To: Adam Duskett; +Cc: Adam Duskett, Fabrice Fontaine, buildroot
Adam, All,
On 2021-09-16 10:07 -0700, Adam Duskett spake thusly:
> From: Adam Duskett <aduskett@rivian.com>
>
> Signed-off-by: Adam Duskett <aduskett@rivian.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(-)
>
> diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch
> index 9393bd258a..c402cbafa5 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.2',
> + version : '2.68.4',
> # 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 15e0085f78..d421e025ff 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.2.sha256sum
> -sha256 ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb glib-2.68.2.tar.xz
> +# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum
> +sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz
> # License files, locally calculated
> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
> diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> index 4f13622e36..af73aeb3bf 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).2
> +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4
$ make libglib2-patch
[...]
Applying 0004-correctly-use-3-parameters-for-close_range.patch using patch:
patching file glib/gspawn.c
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file glib/gspawn.c.rej
make[1]: *** [package/pkg-generic.mk:251: /home/ymorin/dev/buildroot/O/build/libglib2-2.68.4/.stamp_patched] Error 1
make: *** [Makefile:23: _all] Error 2
Meh...
Regards,
Yann E. MORIN.
> 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.30.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@lists.buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH] package/libglib2: bump version to 2.68.4
2021-09-18 15:07 ` Yann E. MORIN
@ 2021-09-20 16:26 ` Adam Duskett
0 siblings, 0 replies; 3+ messages in thread
From: Adam Duskett @ 2021-09-20 16:26 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: Adam Duskett, Fabrice Fontaine, buildroot
I based the patch off of next by mistake! Fixing now!
Sorry about that!
On Sat, Sep 18, 2021 at 8:07 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Adam, All,
>
> On 2021-09-16 10:07 -0700, Adam Duskett spake thusly:
> > From: Adam Duskett <aduskett@rivian.com>
> >
> > Signed-off-by: Adam Duskett <aduskett@rivian.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(-)
> >
> > diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch
> > index 9393bd258a..c402cbafa5 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.2',
> > + version : '2.68.4',
> > # 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 15e0085f78..d421e025ff 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.2.sha256sum
> > -sha256 ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb glib-2.68.2.tar.xz
> > +# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum
> > +sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz
> > # License files, locally calculated
> > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
> > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> > index 4f13622e36..af73aeb3bf 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).2
> > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4
>
> $ make libglib2-patch
> [...]
> Applying 0004-correctly-use-3-parameters-for-close_range.patch using patch:
> patching file glib/gspawn.c
> Reversed (or previously applied) patch detected! Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file glib/gspawn.c.rej
> make[1]: *** [package/pkg-generic.mk:251: /home/ymorin/dev/buildroot/O/build/libglib2-2.68.4/.stamp_patched] Error 1
> make: *** [Makefile:23: _all] Error 2
>
> Meh...
>
> Regards,
> Yann E. MORIN.
>
> > 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.30.2
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@lists.buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-20 16:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-16 17:07 [Buildroot] [PATCH] package/libglib2: bump version to 2.68.4 Adam Duskett
2021-09-18 15:07 ` Yann E. MORIN
2021-09-20 16:26 ` Adam Duskett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox