* [Buildroot] [PATCH 1/2] package/libglib2: bump to version 2.74.0
@ 2022-10-07 13:39 James Hilliard
2022-10-07 13:39 ` [Buildroot] [PATCH 2/2] package/gobject-introspection: bump to version 1.74.0 James Hilliard
2023-05-13 11:53 ` [Buildroot] [PATCH 1/2] package/libglib2: bump to version 2.74.0 Yann E. MORIN
0 siblings, 2 replies; 6+ messages in thread
From: James Hilliard @ 2022-10-07 13:39 UTC (permalink / raw)
To: buildroot; +Cc: James Hilliard, Fabrice Fontaine
Drop patch which is now upstream.
Replace pcre with pcre2 dependency.
Drop no longer supported fam option.
COPYING hash changed due to formatting changes.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
.../0002-remove-cpp-requirement.patch | 87 -------------------
package/libglib2/libglib2.hash | 6 +-
package/libglib2/libglib2.mk | 9 +-
3 files changed, 7 insertions(+), 95 deletions(-)
delete mode 100644 package/libglib2/0002-remove-cpp-requirement.patch
diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch
deleted file mode 100644
index 84511dea32..0000000000
--- a/package/libglib2/0002-remove-cpp-requirement.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From dd65a8cfdeafeb18b72d8d1eb676c7ca43ae505f 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
-
-The c++ test is necessary to ensure libglib doesn't accidentally use C++
-reserved keywords in public headers. Because this is just a test, it isn't
-necessary to have a C++ compiler to build libglib2.
-
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
-Upstream status: Denied (Buildroot specific)
-https://gitlab.gnome.org/GNOME/glib/issues/1748
----
- glib/glibconfig.h.in | 1 -
- meson.build | 19 +------------------
- 2 files changed, 1 insertion(+), 19 deletions(-)
-
-diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
-index e66748d95..2173d8be6 100644
---- a/glib/glibconfig.h.in
-+++ b/glib/glibconfig.h.in
-@@ -119,7 +119,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
- @glib_vacopy@
-
- @g_have_iso_c_varargs@
--@g_have_iso_cxx_varargs@
-
- /* 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 48fdfe864..5df242e39 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,4 +1,4 @@
--project('glib', 'c', 'cpp',
-+project('glib', 'c',
- version : '2.72.3',
- # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships
- meson_version : '>= 0.52.0',
-@@ -10,7 +10,6 @@ project('glib', 'c', 'cpp',
- )
-
- cc = meson.get_compiler('c')
--cxx = meson.get_compiler('cpp')
-
- cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper()
-
-@@ -495,7 +494,6 @@ else
- endif
-
- add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c')
--add_project_arguments(cxx.get_supported_arguments(warning_cxx_args), language: 'cpp')
-
- # FIXME: We cannot build some of the GResource tests with -z nodelete, which
- # means we cannot use that flag in add_project_link_arguments(), and must add
-@@ -1734,20 +1732,6 @@ if g_have_iso_c_varargs
- #endif''')
- endif
-
--g_have_iso_cxx_varargs = cxx.compiles('''
-- void some_func (void) {
-- int a(int p1, int p2, int p3);
-- #define call_a(...) a(1,__VA_ARGS__)
-- call_a(2,3);
-- }''', name : 'ISO C99 varargs macros in C++')
--
--if g_have_iso_cxx_varargs
-- glibconfig_conf.set('g_have_iso_cxx_varargs', '''
--#ifdef __cplusplus
--# define G_HAVE_ISO_VARARGS 1
--#endif''')
--endif
--
- g_have_gnuc_varargs = cc.compiles('''
- void some_func (void) {
- int a(int p1, int p2, int p3);
-@@ -2381,7 +2365,6 @@ subdir('gobject')
- subdir('gthread')
- subdir('gmodule')
- subdir('gio')
--subdir('fuzzing')
- if build_tests
- subdir('tests')
- endif
---
-2.34.1
-
diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash
index 0395ff234a..ccda94f7c1 100644
--- a/package/libglib2/libglib2.hash
+++ b/package/libglib2/libglib2.hash
@@ -1,4 +1,4 @@
-# https://download.gnome.org/sources/glib/2.72/glib-2.72.3.sha256sum
-sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 glib-2.72.3.tar.xz
+# https://download.gnome.org/sources/glib/2.74/glib-2.74.0.sha256sum
+sha256 3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30 glib-2.74.0.tar.xz
# License files, locally calculated
-sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
+sha256 fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb COPYING
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 2970d5a7a9..a0dea81c3f 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -4,8 +4,8 @@
#
################################################################################
-LIBGLIB2_VERSION_MAJOR = 2.72
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
+LIBGLIB2_VERSION_MAJOR = 2.74
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0
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+
@@ -24,7 +24,6 @@ endif
HOST_LIBGLIB2_CONF_OPTS = \
-Ddtrace=false \
- -Dfam=false \
-Dglib_debug=disabled \
-Dlibelf=disabled \
-Dselinux=disabled \
@@ -35,12 +34,12 @@ HOST_LIBGLIB2_CONF_OPTS = \
LIBGLIB2_DEPENDENCIES = \
host-pkgconf host-libglib2 \
- libffi pcre zlib $(TARGET_NLS_DEPENDENCIES)
+ libffi pcre2 zlib $(TARGET_NLS_DEPENDENCIES)
HOST_LIBGLIB2_DEPENDENCIES = \
host-gettext \
host-libffi \
- host-pcre \
+ host-pcre2 \
host-pkgconf \
host-util-linux \
host-zlib
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/gobject-introspection: bump to version 1.74.0
2022-10-07 13:39 [Buildroot] [PATCH 1/2] package/libglib2: bump to version 2.74.0 James Hilliard
@ 2022-10-07 13:39 ` James Hilliard
2023-05-13 11:59 ` Yann E. MORIN
2023-05-13 11:53 ` [Buildroot] [PATCH 1/2] package/libglib2: bump to version 2.74.0 Yann E. MORIN
1 sibling, 1 reply; 6+ messages in thread
From: James Hilliard @ 2022-10-07 13:39 UTC (permalink / raw)
To: buildroot; +Cc: James Hilliard, Fabrice Fontaine
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
package/gobject-introspection/gobject-introspection.hash | 4 ++--
package/gobject-introspection/gobject-introspection.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash
index 8f9d323d9a..c1a1363ddb 100644
--- a/package/gobject-introspection/gobject-introspection.hash
+++ b/package/gobject-introspection/gobject-introspection.hash
@@ -1,5 +1,5 @@
-#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.72.0.sha256sum
-sha256 02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc gobject-introspection-1.72.0.tar.xz
+#From https://download.gnome.org/sources/gobject-introspection/1.74/gobject-introspection-1.74.0.sha256sum
+sha256 347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653 gobject-introspection-1.74.0.tar.xz
sha256 faa2e414bd5f91d2d2c39e85c7cc3f2ccde05c3306f96b404f8ed8cf0266c279 COPYING.LGPL
sha256 4c1cedcbb4a12ea964f1160dbbf36099e5a59b96129a99a1a1a61f2cb09271fb COPYING.GPL
sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l
diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
index c8ad9b3c72..436c12aa48 100644
--- a/package/gobject-introspection/gobject-introspection.mk
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.72
+GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.74
GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0
GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/libglib2: bump to version 2.74.0
2022-10-07 13:39 [Buildroot] [PATCH 1/2] package/libglib2: bump to version 2.74.0 James Hilliard
2022-10-07 13:39 ` [Buildroot] [PATCH 2/2] package/gobject-introspection: bump to version 1.74.0 James Hilliard
@ 2023-05-13 11:53 ` Yann E. MORIN
1 sibling, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2023-05-13 11:53 UTC (permalink / raw)
To: James Hilliard; +Cc: Fabrice Fontaine, buildroot
James, All,
On 2022-10-07 07:39 -0600, James Hilliard spake thusly:
> Drop patch which is now upstream.
>
> Replace pcre with pcre2 dependency.
>
> Drop no longer supported fam option.
>
> COPYING hash changed due to formatting changes.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
[--SNIP--]
> diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> index 2970d5a7a9..a0dea81c3f 100644
> --- a/package/libglib2/libglib2.mk
> +++ b/package/libglib2/libglib2.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -LIBGLIB2_VERSION_MAJOR = 2.72
> -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
> +LIBGLIB2_VERSION_MAJOR = 2.74
> +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0
We now have 2.76.1 (with a patch pending for 2.76.2), so I've marked
this bump as superseded, thansk!
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+
> @@ -24,7 +24,6 @@ endif
>
> HOST_LIBGLIB2_CONF_OPTS = \
> -Ddtrace=false \
> - -Dfam=false \
> -Dglib_debug=disabled \
> -Dlibelf=disabled \
> -Dselinux=disabled \
> @@ -35,12 +34,12 @@ HOST_LIBGLIB2_CONF_OPTS = \
>
> LIBGLIB2_DEPENDENCIES = \
> host-pkgconf host-libglib2 \
> - libffi pcre zlib $(TARGET_NLS_DEPENDENCIES)
> + libffi pcre2 zlib $(TARGET_NLS_DEPENDENCIES)
>
> HOST_LIBGLIB2_DEPENDENCIES = \
> host-gettext \
> host-libffi \
> - host-pcre \
> + host-pcre2 \
> host-pkgconf \
> host-util-linux \
> host-zlib
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@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@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/gobject-introspection: bump to version 1.74.0
2022-10-07 13:39 ` [Buildroot] [PATCH 2/2] package/gobject-introspection: bump to version 1.74.0 James Hilliard
@ 2023-05-13 11:59 ` Yann E. MORIN
2023-05-20 19:56 ` James Knight
0 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2023-05-13 11:59 UTC (permalink / raw)
To: James Hilliard, James Knight; +Cc: Fabrice Fontaine, buildroot
James H., All,
+James K. for having bumped libglib2 to 1.76.x:
On 2022-10-07 07:39 -0600, James Hilliard spake thusly:
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
> package/gobject-introspection/gobject-introspection.hash | 4 ++--
> package/gobject-introspection/gobject-introspection.mk | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash
> index 8f9d323d9a..c1a1363ddb 100644
> --- a/package/gobject-introspection/gobject-introspection.hash
> +++ b/package/gobject-introspection/gobject-introspection.hash
> @@ -1,5 +1,5 @@
> -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.72.0.sha256sum
> -sha256 02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc gobject-introspection-1.72.0.tar.xz
> +#From https://download.gnome.org/sources/gobject-introspection/1.74/gobject-introspection-1.74.0.sha256sum
> +sha256 347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653 gobject-introspection-1.74.0.tar.xz
> sha256 faa2e414bd5f91d2d2c39e85c7cc3f2ccde05c3306f96b404f8ed8cf0266c279 COPYING.LGPL
> sha256 4c1cedcbb4a12ea964f1160dbbf36099e5a59b96129a99a1a1a61f2cb09271fb COPYING.GPL
> sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l
> diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
> index c8ad9b3c72..436c12aa48 100644
> --- a/package/gobject-introspection/gobject-introspection.mk
> +++ b/package/gobject-introspection/gobject-introspection.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.72
> +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.74
Do we have to make sure that the "major" version of the GNOME packages
be aligned, or is it possible tix-n-match versions?
I.e. can we keep goi 1.74.x with libglib2 1.76.x, or should both be
1.76.x ?
Regards,
Yann E. MORIN.
> GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0
> GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
> GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@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@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/gobject-introspection: bump to version 1.74.0
2023-05-13 11:59 ` Yann E. MORIN
@ 2023-05-20 19:56 ` James Knight
2023-05-21 15:29 ` Yann E. MORIN
0 siblings, 1 reply; 6+ messages in thread
From: James Knight @ 2023-05-20 19:56 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: James Knight, James Hilliard, Fabrice Fontaine, buildroot
Yann,
On Sat, May 13, 2023 at 7:59 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Do we have to make sure that the "major" version of the GNOME packages
> be aligned, or is it possible tix-n-match versions?
It is my understanding (now) that keeping the minor version in
lockstep is almost always preferred (at least, when considering the
packages glib2, glib-networking, gobject-introspection and glibmm; I'd
be curious to know if I missed any). Micro versions for sure do not
require a match and may be older or newer than glib2's micro version.
When I submitted the patch for libglib2 to 1.76.x, I should have taken
the time to include updates for gobject-introspection and glibmm as
well. My focus at the time was to just use the more recent version of
glib-networking, which was the sole reason for libglib2 being bumped.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/gobject-introspection: bump to version 1.74.0
2023-05-20 19:56 ` James Knight
@ 2023-05-21 15:29 ` Yann E. MORIN
0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2023-05-21 15:29 UTC (permalink / raw)
To: James Knight; +Cc: James Hilliard, Fabrice Fontaine, Adam Duskett, buildroot
James, All,
On 2023-05-20 15:56 -0400, James Knight spake thusly:
> On Sat, May 13, 2023 at 7:59 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > Do we have to make sure that the "major" version of the GNOME packages
> > be aligned, or is it possible tix-n-match versions?
> It is my understanding (now) that keeping the minor version in
> lockstep is almost always preferred (at least, when considering the
> packages glib2, glib-networking, gobject-introspection and glibmm; I'd
> be curious to know if I missed any). Micro versions for sure do not
> require a match and may be older or newer than glib2's micro version.
What would be the actual drawbacks (build failures, runtime failures) of
keeping gobject-introspection to 1.74, when we have 2.76.x for libglib2
(note: *1*.74 vs *2*.76) ?
IOW, should we take [0] in master, which is feature-frozen for the
upcoming 2023.05 release, or can it wait for the next cycle?
[0] https://patchwork.ozlabs.org/project/buildroot/patch/20230515203002.346534-1-aduskett@gmail.com/
> When I submitted the patch for libglib2 to 1.76.x, I should have taken
> the time to include updates for gobject-introspection and glibmm as
> well. My focus at the time was to just use the more recent version of
> glib-networking, which was the sole reason for libglib2 being bumped.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-21 15:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-07 13:39 [Buildroot] [PATCH 1/2] package/libglib2: bump to version 2.74.0 James Hilliard
2022-10-07 13:39 ` [Buildroot] [PATCH 2/2] package/gobject-introspection: bump to version 1.74.0 James Hilliard
2023-05-13 11:59 ` Yann E. MORIN
2023-05-20 19:56 ` James Knight
2023-05-21 15:29 ` Yann E. MORIN
2023-05-13 11:53 ` [Buildroot] [PATCH 1/2] package/libglib2: bump to version 2.74.0 Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).