All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.69.3
@ 2021-09-07 11:45 James Hilliard
  2021-09-19 12:27 ` Arnout Vandecappelle
  0 siblings, 1 reply; 3+ messages in thread
From: James Hilliard @ 2021-09-07 11:45 UTC (permalink / raw)
  To: buildroot; +Cc: James Hilliard, Fabrice Fontaine

Rebase remove cpp requirement patch.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 .../libglib2/0002-remove-cpp-requirement.patch   | 16 ++++++++--------
 package/libglib2/libglib2.hash                   |  4 ++--
 package/libglib2/libglib2.mk                     |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch
index 9393bd258a..691f3147ef 100644
--- a/package/libglib2/0002-remove-cpp-requirement.patch
+++ b/package/libglib2/0002-remove-cpp-requirement.patch
@@ -1,4 +1,4 @@
-From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001
+From 36f4c37fb2a27d93cd58460fa9cc54a0c1cd957e Mon Sep 17 00:00:00 2001
 From: Adam Duskett <Aduskett@gmail.com>
 Date: Mon, 16 Sep 2019 10:12:38 -0700
 Subject: [PATCH] remove cpp requirement
@@ -17,7 +17,7 @@ https://gitlab.gnome.org/GNOME/glib/issues/1748
  3 files changed, 1 insertion(+), 23 deletions(-)
 
 diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
-index 7ef8c48..128e65d 100644
+index 873cb0314..5ada525f7 100644
 --- a/glib/glibconfig.h.in
 +++ b/glib/glibconfig.h.in
 @@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
@@ -29,13 +29,13 @@ index 7ef8c48..128e65d 100644
  /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
   * is passed ISO vararg support is turned off, and there is no work
 diff --git a/meson.build b/meson.build
-index 4bbf4c2..ac59f4e 100644
+index 4f1178aa4..a087d6e27 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -1,4 +1,4 @@
 -project('glib', 'c', 'cpp',
 +project('glib', 'c',
-   version : '2.68.2',
+   version : '2.69.3',
    # 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',
@@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644
  
  cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper()
  
-@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs
+@@ -1697,20 +1696,6 @@ if g_have_iso_c_varargs
  #endif''')
  endif
  
@@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644
  g_have_gnuc_varargs = cc.compiles('''
    void some_func (void) {
      int a(int p1, int p2, int p3);
-@@ -2330,7 +2315,6 @@ subdir('gobject')
+@@ -2340,7 +2325,6 @@ subdir('gobject')
  subdir('gthread')
  subdir('gmodule')
  subdir('gio')
@@ -76,7 +76,7 @@ index 4bbf4c2..ac59f4e 100644
    subdir('tests')
  endif
 diff --git a/tests/meson.build b/tests/meson.build
-index e4ea226..7fd974c 100644
+index 6741f8f52..316cf2527 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -55,11 +55,6 @@ tests = {
@@ -92,5 +92,5 @@ index e4ea226..7fd974c 100644
  
  test_extra_programs = {
 -- 
-2.23.0
+2.25.1
 
diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash
index 15e0085f78..b045a74a46 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.69/glib-2.69.3.sha256sum
+sha256  47af2c6e06becee44d447ae7d1212dbab255b002b5141d9b62a4357c0ecc058f  glib-2.69.3.tar.xz
 # License files, locally calculated
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 4f13622e36..4315ceca52 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).2
+LIBGLIB2_VERSION_MAJOR = 2.69
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
 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.25.1

_______________________________________________
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 1/1] package/libglib2: bump to version 2.69.3
  2021-09-07 11:45 [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.69.3 James Hilliard
@ 2021-09-19 12:27 ` Arnout Vandecappelle
  2021-09-19 12:35   ` James Hilliard
  0 siblings, 1 reply; 3+ messages in thread
From: Arnout Vandecappelle @ 2021-09-19 12:27 UTC (permalink / raw)
  To: James Hilliard, buildroot; +Cc: Fabrice Fontaine

  Hi James,

On 07/09/2021 13:45, James Hilliard wrote:
> Rebase remove cpp requirement patch.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

  AFAIK, glib2's odd releases, like 2.69, are experimental, and the even 
releases, i.e. 2.68, are the stable ones. Normally we'd track only the stable 
releases. Any reason to switch to the experimental one now?

  Regards,
  Arnout

> ---
>   .../libglib2/0002-remove-cpp-requirement.patch   | 16 ++++++++--------
>   package/libglib2/libglib2.hash                   |  4 ++--
>   package/libglib2/libglib2.mk                     |  4 ++--
>   3 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch
> index 9393bd258a..691f3147ef 100644
> --- a/package/libglib2/0002-remove-cpp-requirement.patch
> +++ b/package/libglib2/0002-remove-cpp-requirement.patch
> @@ -1,4 +1,4 @@
> -From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001
> +From 36f4c37fb2a27d93cd58460fa9cc54a0c1cd957e Mon Sep 17 00:00:00 2001
>   From: Adam Duskett <Aduskett@gmail.com>
>   Date: Mon, 16 Sep 2019 10:12:38 -0700
>   Subject: [PATCH] remove cpp requirement
> @@ -17,7 +17,7 @@ https://gitlab.gnome.org/GNOME/glib/issues/1748
>    3 files changed, 1 insertion(+), 23 deletions(-)
>   
>   diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
> -index 7ef8c48..128e65d 100644
> +index 873cb0314..5ada525f7 100644
>   --- a/glib/glibconfig.h.in
>   +++ b/glib/glibconfig.h.in
>   @@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
> @@ -29,13 +29,13 @@ index 7ef8c48..128e65d 100644
>    /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
>     * is passed ISO vararg support is turned off, and there is no work
>   diff --git a/meson.build b/meson.build
> -index 4bbf4c2..ac59f4e 100644
> +index 4f1178aa4..a087d6e27 100644
>   --- a/meson.build
>   +++ b/meson.build
>   @@ -1,4 +1,4 @@
>   -project('glib', 'c', 'cpp',
>   +project('glib', 'c',
> -   version : '2.68.2',
> +   version : '2.69.3',
>      # 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',
> @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644
>    
>    cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper()
>    
> -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs
> +@@ -1697,20 +1696,6 @@ if g_have_iso_c_varargs
>    #endif''')
>    endif
>    
> @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644
>    g_have_gnuc_varargs = cc.compiles('''
>      void some_func (void) {
>        int a(int p1, int p2, int p3);
> -@@ -2330,7 +2315,6 @@ subdir('gobject')
> +@@ -2340,7 +2325,6 @@ subdir('gobject')
>    subdir('gthread')
>    subdir('gmodule')
>    subdir('gio')
> @@ -76,7 +76,7 @@ index 4bbf4c2..ac59f4e 100644
>      subdir('tests')
>    endif
>   diff --git a/tests/meson.build b/tests/meson.build
> -index e4ea226..7fd974c 100644
> +index 6741f8f52..316cf2527 100644
>   --- a/tests/meson.build
>   +++ b/tests/meson.build
>   @@ -55,11 +55,6 @@ tests = {
> @@ -92,5 +92,5 @@ index e4ea226..7fd974c 100644
>    
>    test_extra_programs = {
>   --
> -2.23.0
> +2.25.1
>   
> diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash
> index 15e0085f78..b045a74a46 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.69/glib-2.69.3.sha256sum
> +sha256  47af2c6e06becee44d447ae7d1212dbab255b002b5141d9b62a4357c0ecc058f  glib-2.69.3.tar.xz
>   # License files, locally calculated
>   sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
> diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> index 4f13622e36..4315ceca52 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).2
> +LIBGLIB2_VERSION_MAJOR = 2.69
> +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
>   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+
> 
_______________________________________________
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 1/1] package/libglib2: bump to version 2.69.3
  2021-09-19 12:27 ` Arnout Vandecappelle
@ 2021-09-19 12:35   ` James Hilliard
  0 siblings, 0 replies; 3+ messages in thread
From: James Hilliard @ 2021-09-19 12:35 UTC (permalink / raw)
  To: Arnout Vandecappelle; +Cc: Fabrice Fontaine, buildroot

On Sun, Sep 19, 2021 at 6:27 AM Arnout Vandecappelle <arnout@mind.be> wrote:
>
>   Hi James,
>
> On 07/09/2021 13:45, James Hilliard wrote:
> > Rebase remove cpp requirement patch.
> >
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
>
>   AFAIK, glib2's odd releases, like 2.69, are experimental, and the even
> releases, i.e. 2.68, are the stable ones. Normally we'd track only the stable
> releases. Any reason to switch to the experimental one now?

I think there was a bug this contained a fix for but I recall the patch was
backported already so this probably isn't needed.

>
>   Regards,
>   Arnout
>
> > ---
> >   .../libglib2/0002-remove-cpp-requirement.patch   | 16 ++++++++--------
> >   package/libglib2/libglib2.hash                   |  4 ++--
> >   package/libglib2/libglib2.mk                     |  4 ++--
> >   3 files changed, 12 insertions(+), 12 deletions(-)
> >
> > diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch
> > index 9393bd258a..691f3147ef 100644
> > --- a/package/libglib2/0002-remove-cpp-requirement.patch
> > +++ b/package/libglib2/0002-remove-cpp-requirement.patch
> > @@ -1,4 +1,4 @@
> > -From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001
> > +From 36f4c37fb2a27d93cd58460fa9cc54a0c1cd957e Mon Sep 17 00:00:00 2001
> >   From: Adam Duskett <Aduskett@gmail.com>
> >   Date: Mon, 16 Sep 2019 10:12:38 -0700
> >   Subject: [PATCH] remove cpp requirement
> > @@ -17,7 +17,7 @@ https://gitlab.gnome.org/GNOME/glib/issues/1748
> >    3 files changed, 1 insertion(+), 23 deletions(-)
> >
> >   diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
> > -index 7ef8c48..128e65d 100644
> > +index 873cb0314..5ada525f7 100644
> >   --- a/glib/glibconfig.h.in
> >   +++ b/glib/glibconfig.h.in
> >   @@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
> > @@ -29,13 +29,13 @@ index 7ef8c48..128e65d 100644
> >    /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
> >     * is passed ISO vararg support is turned off, and there is no work
> >   diff --git a/meson.build b/meson.build
> > -index 4bbf4c2..ac59f4e 100644
> > +index 4f1178aa4..a087d6e27 100644
> >   --- a/meson.build
> >   +++ b/meson.build
> >   @@ -1,4 +1,4 @@
> >   -project('glib', 'c', 'cpp',
> >   +project('glib', 'c',
> > -   version : '2.68.2',
> > +   version : '2.69.3',
> >      # 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',
> > @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644
> >
> >    cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper()
> >
> > -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs
> > +@@ -1697,20 +1696,6 @@ if g_have_iso_c_varargs
> >    #endif''')
> >    endif
> >
> > @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644
> >    g_have_gnuc_varargs = cc.compiles('''
> >      void some_func (void) {
> >        int a(int p1, int p2, int p3);
> > -@@ -2330,7 +2315,6 @@ subdir('gobject')
> > +@@ -2340,7 +2325,6 @@ subdir('gobject')
> >    subdir('gthread')
> >    subdir('gmodule')
> >    subdir('gio')
> > @@ -76,7 +76,7 @@ index 4bbf4c2..ac59f4e 100644
> >      subdir('tests')
> >    endif
> >   diff --git a/tests/meson.build b/tests/meson.build
> > -index e4ea226..7fd974c 100644
> > +index 6741f8f52..316cf2527 100644
> >   --- a/tests/meson.build
> >   +++ b/tests/meson.build
> >   @@ -55,11 +55,6 @@ tests = {
> > @@ -92,5 +92,5 @@ index e4ea226..7fd974c 100644
> >
> >    test_extra_programs = {
> >   --
> > -2.23.0
> > +2.25.1
> >
> > diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash
> > index 15e0085f78..b045a74a46 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.69/glib-2.69.3.sha256sum
> > +sha256  47af2c6e06becee44d447ae7d1212dbab255b002b5141d9b62a4357c0ecc058f  glib-2.69.3.tar.xz
> >   # License files, locally calculated
> >   sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
> > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> > index 4f13622e36..4315ceca52 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).2
> > +LIBGLIB2_VERSION_MAJOR = 2.69
> > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
> >   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+
> >
_______________________________________________
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-19 12:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-07 11:45 [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.69.3 James Hilliard
2021-09-19 12:27 ` Arnout Vandecappelle
2021-09-19 12:35   ` James Hilliard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.