* [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.1
@ 2023-11-07 16:18 Adam Duskett
2023-11-07 16:18 ` [Buildroot] [PATCH 2/3] package/glibmm: bump version to 2.78.0 Adam Duskett
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Adam Duskett @ 2023-11-07 16:18 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett
- refactor 0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
- Drop upstream patches 0002 and 0003
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
...girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 32 +++----
...rmat-in-gio-gunixconnection.c-part-2.patch | 93 ------------------
...documentation-generation-with-gtk_do.patch | 96 -------------------
package/libglib2/libglib2.hash | 4 +-
package/libglib2/libglib2.mk | 2 +-
5 files changed, 19 insertions(+), 208 deletions(-)
delete mode 100644 package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch
delete mode 100644 package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch
diff --git a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
index fb99057242..fa9c1754d2 100644
--- a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
+++ b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
@@ -24,26 +24,26 @@ diff --git a/gio/meson.build b/gio/meson.build
index 29473d26b..112d4ada9 100644
--- a/gio/meson.build
+++ b/gio/meson.build
-@@ -841,6 +841,7 @@ pkg.generate(libgio,
- variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
- 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
- 'bindir=' + join_paths('${prefix}', get_option('bindir')),
-+ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
- 'giomoduledir=' + pkgconfig_giomodulesdir,
- 'gio=' + join_paths('${bindir}', 'gio'),
- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
+@@ -883,6 +883,7 @@ pkg.generate(libgio,
+ 'schemasdir=' + '${datadir}' / schemas_subdir,
+ 'dtdsdir=' + '${datadir}' / dtds_subdir,
+ 'bindir=' + '${prefix}' / get_option('bindir'),
++ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
+ 'giomoduledir=' + pkgconfig_giomodulesdir,
+ 'gio=' + '${bindir}' / 'gio',
+ 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
diff --git a/glib/meson.build b/glib/meson.build
index f78f32969..6c5486699 100644
--- a/glib/meson.build
+++ b/glib/meson.build
-@@ -384,6 +384,7 @@ pkg.generate(libglib,
- subdirs : ['glib-2.0'],
- extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
- variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
-+ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
+@@ -447,6 +447,7 @@ pkg.generate(libglib,
+ variables : [
+ 'bindir=' + '${prefix}' / get_option('bindir'),
+ 'datadir=' + '${prefix}' / get_option('datadir'),
++ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
+ 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal',
+ 'gobject_query=' + '${bindir}' / 'gobject-query',
+ 'glib_mkenums=' + '${bindir}' / 'glib-mkenums',
--
2.33.0
diff --git a/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch b/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch
deleted file mode 100644
index 6075bacb06..0000000000
--- a/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 4ae8606b6f80f9764e1f0a82cea7e23c8af487ae Mon Sep 17 00:00:00 2001
-From: James Knight <james.d.knight@live.com>
-Date: Thu, 20 Apr 2023 23:41:32 -0400
-Subject: [PATCH] Fix error format in gio/gunixconnection.c (part 2)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Update a series of error messages to use `g_set_error_literal` instead
-of `g_set_error`. This should prevent `format-nonliteral` compiler
-issues when `-Werror` is configured:
-
- ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_fd’:
- ../gio/gunixconnection.c:183:9: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
- 183 | nscm);
- | ^~~~
- ../gio/gunixconnection.c:217:20: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
- 217 | nfd);
- | ^~~
- ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_credentials’:
- ../gio/gunixconnection.c:601:24: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
- 601 | nscm);
- | ^~~~
-
-This is similar to a previous change [1] made to `gunixconnection.c`.
-
-[1]: 44b3d5d80445234041f6c59feb89645f7102c3a4
-
-Signed-off-by: James Knight <james.d.knight@live.com>
-Upstream: backport from upstream https://gitlab.gnome.org/GNOME/glib/-/commit/4ae8606b6f80f9764e1f0a82cea7e23c8af487ae
----
- gio/gunixconnection.c | 31 ++++++++++++++-----------------
- 1 file changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c
-index b3f2b1c04b0abdf7136918585ae4cea8970a88bb..c012fcbfe00b69e9da609c7b626229db98e931ac 100644
---- a/gio/gunixconnection.c
-+++ b/gio/gunixconnection.c
-@@ -176,11 +176,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection,
- {
- gint i;
-
-- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- ngettext("Expecting 1 control message, got %d",
-- "Expecting 1 control message, got %d",
-- nscm),
-- nscm);
-+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+ ngettext ("Expecting 1 control message, got %d",
-+ "Expecting 1 control message, got %d",
-+ nscm));
-
- for (i = 0; i < nscm; i++)
- g_object_unref (scms[i]);
-@@ -210,11 +209,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection,
- {
- gint i;
-
-- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-- ngettext("Expecting one fd, but got %d\n",
-- "Expecting one fd, but got %d\n",
-- nfd),
-- nfd);
-+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+ ngettext ("Expecting one fd, but got %d\n",
-+ "Expecting one fd, but got %d\n",
-+ nfd));
-
- for (i = 0; i < nfd; i++)
- close (fds[i]);
-@@ -592,13 +590,12 @@ g_unix_connection_receive_credentials (GUnixConnection *connection,
- {
- if (nscm != 1)
- {
-- g_set_error (error,
-- G_IO_ERROR,
-- G_IO_ERROR_FAILED,
-- ngettext("Expecting 1 control message, got %d",
-- "Expecting 1 control message, got %d",
-- nscm),
-- nscm);
-+ g_set_error_literal (error,
-+ G_IO_ERROR,
-+ G_IO_ERROR_FAILED,
-+ ngettext ("Expecting 1 control message, got %d",
-+ "Expecting 1 control message, got %d",
-+ nscm));
- goto out;
- }
-
---
-2.39.1.windows.1
-
diff --git a/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch b/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch
deleted file mode 100644
index 0fa15ad164..0000000000
--- a/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0fa17ec3c7152cf0e1cbf965acf1426ac203bb1d Mon Sep 17 00:00:00 2001
-From: James Knight <james.d.knight@live.com>
-Date: Thu, 27 Apr 2023 20:23:30 -0400
-Subject: [PATCH] meson: wrap html documentation generation with gtk_doc option
-
-By default, if a host environment has the `rst2html5` application
-available, builds will automatically perform some HTML documentation
-generation from the documentation's glib reference content (e.g.
-creating `gvariant-specification-1.0.html`). The creation of this
-documentation is not required for all use cases.
-
-This commit tweaks the building of the HTML-based GLIB specification
-document to be guarded by `gtk_doc`.
-
-Signed-off-by: James Knight <james.d.knight@live.com>
-Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/0fa17ec3c7152cf0e1cbf965acf1426ac203bb1d
-[yann.morin.1998@free.fr: backport from upstream]
-Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
----
- docs/reference/glib/meson.build | 58 +++++++++++++++++----------------
- 1 file changed, 30 insertions(+), 28 deletions(-)
-
-diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build
-index 114de49da..3cfff2f0b 100644
---- a/docs/reference/glib/meson.build
-+++ b/docs/reference/glib/meson.build
-@@ -113,35 +113,37 @@ if get_option('man')
- endforeach
- endif
-
--# GVariant specification is currently standalone
--rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false)
-+if get_option('gtk_doc')
-+ # GVariant specification is currently standalone
-+ rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false)
-
--if rst2html5.found()
-- spec_path = glib_datadir / 'doc' / 'glib-2.0'
-+ if rst2html5.found()
-+ spec_path = glib_datadir / 'doc' / 'glib-2.0'
-
-- figures = files(
-- 'gvariant-byte-boundaries.svg',
-- 'gvariant-integer-and-string-structure.svg',
-- 'gvariant-integer-array.svg',
-- 'gvariant-string-array.svg',
-- )
-+ figures = files(
-+ 'gvariant-byte-boundaries.svg',
-+ 'gvariant-integer-and-string-structure.svg',
-+ 'gvariant-integer-array.svg',
-+ 'gvariant-string-array.svg',
-+ )
-
-- custom_target('gvariant-specification-1.0',
-- input: 'gvariant-specification-1.0.rst',
-- output: 'gvariant-specification-1.0.html',
-- command: [
-- rst2html5,
-- '@INPUT@',
-- ],
-- capture: true,
-- install: true,
-- install_dir: spec_path,
-- install_tag: 'doc',
-- depend_files: figures,
-- )
-+ custom_target('gvariant-specification-1.0',
-+ input: 'gvariant-specification-1.0.rst',
-+ output: 'gvariant-specification-1.0.html',
-+ command: [
-+ rst2html5,
-+ '@INPUT@',
-+ ],
-+ capture: true,
-+ install: true,
-+ install_dir: spec_path,
-+ install_tag: 'doc',
-+ depend_files: figures,
-+ )
-
-- install_data(figures,
-- install_dir : spec_path,
-- install_tag : 'doc',
-- )
--endif
-\ No newline at end of file
-+ install_data(figures,
-+ install_dir : spec_path,
-+ install_tag : 'doc',
-+ )
-+ endif
-+endif
---
-2.25.1
-
diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash
index 07ed7635a6..77528856cc 100644
--- a/package/libglib2/libglib2.hash
+++ b/package/libglib2/libglib2.hash
@@ -1,4 +1,4 @@
-# https://download.gnome.org/sources/glib/2.76/glib-2.76.1.sha256sum
-sha256 43dc0f6a126958f5b454136c4398eab420249c16171a769784486e25f2fda19f glib-2.76.1.tar.xz
+# https://download.gnome.org/sources/glib/2.78/glib-2.78.1.sha256sum
+sha256 915bc3d0f8507d650ead3832e2f8fb670fce59aac4d7754a7dab6f1e6fed78b2 glib-2.78.1.tar.xz
# License files, locally calculated
sha256 fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb COPYING
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index c06ded2a5b..de2214d397 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBGLIB2_VERSION_MAJOR = 2.76
+LIBGLIB2_VERSION_MAJOR = 2.78
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
LIBGLIB2_SITE = https://download.gnome.org/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
--
2.41.0
_______________________________________________
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/3] package/glibmm: bump version to 2.78.0
2023-11-07 16:18 [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.1 Adam Duskett
@ 2023-11-07 16:18 ` Adam Duskett
2023-11-07 16:18 ` [Buildroot] [PATCH 3/3] package/gobject-introspection: bump version to 1.78.1 Adam Duskett
2023-12-24 22:13 ` [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.1 Adam Duskett
2 siblings, 0 replies; 6+ messages in thread
From: Adam Duskett @ 2023-11-07 16:18 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett, Daniel Lang, Adam Duskett
From: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Adam Duskett <aduskett@gmail.com>
Reviewed-by: Daniel Lang <dalang@gmx.at>
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/glibmm/glibmm.hash | 4 ++--
package/glibmm/glibmm.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash
index ee50ccdb01..8536b20a93 100644
--- a/package/glibmm/glibmm.hash
+++ b/package/glibmm/glibmm.hash
@@ -1,5 +1,5 @@
-# From https://download.gnome.org/sources/glibmm/2.76/glibmm-2.76.0.sha256sum
-sha256 8637d80ceabd94fddd6e48970a082a264558d4ab82684e15ffc87e7ef3462ab2 glibmm-2.76.0.tar.xz
+# From https://download.gnome.org/sources/glibmm/2.78/glibmm-2.78.0.sha256sum
+sha256 5d2e872564996f02a06d8bbac3677e7c394af8b00dd1526aebd47af842a3ef50 glibmm-2.78.0.tar.xz
# License files, locally calculated
sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
index da95329a3d..c2238e2f30 100644
--- a/package/glibmm/glibmm.mk
+++ b/package/glibmm/glibmm.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GLIBMM_VERSION_MAJOR = 2.76
+GLIBMM_VERSION_MAJOR = 2.78
GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0
GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
GLIBMM_LICENSE_FILES = COPYING COPYING.tools
--
2.41.0
_______________________________________________
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 3/3] package/gobject-introspection: bump version to 1.78.1
2023-11-07 16:18 [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.1 Adam Duskett
2023-11-07 16:18 ` [Buildroot] [PATCH 2/3] package/glibmm: bump version to 2.78.0 Adam Duskett
@ 2023-11-07 16:18 ` Adam Duskett
2023-12-24 22:13 ` [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.1 Adam Duskett
2 siblings, 0 replies; 6+ messages in thread
From: Adam Duskett @ 2023-11-07 16:18 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett, Adam Duskett
From: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.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 063b96275d..d6fd8a9d72 100644
--- a/package/gobject-introspection/gobject-introspection.hash
+++ b/package/gobject-introspection/gobject-introspection.hash
@@ -1,5 +1,5 @@
-# From https://download.gnome.org/sources/gobject-introspection/1.76/gobject-introspection-1.76.1.sha256sum
-sha256 196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf gobject-introspection-1.76.1.tar.xz
+# From https://download.gnome.org/sources/gobject-introspection/1.78/gobject-introspection-1.78.1.sha256sum
+sha256 bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4 gobject-introspection-1.78.1.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 f0c7fcd2ca..2c0253fae3 100644
--- a/package/gobject-introspection/gobject-introspection.mk
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.76
+GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.78
GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).1
GOBJECT_INTROSPECTION_SITE = https://download.gnome.org/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
--
2.41.0
_______________________________________________
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/3] package/libglib2: bump version to 2.78.1
2023-11-07 16:18 [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.1 Adam Duskett
2023-11-07 16:18 ` [Buildroot] [PATCH 2/3] package/glibmm: bump version to 2.78.0 Adam Duskett
2023-11-07 16:18 ` [Buildroot] [PATCH 3/3] package/gobject-introspection: bump version to 1.78.1 Adam Duskett
@ 2023-12-24 22:13 ` Adam Duskett
2 siblings, 0 replies; 6+ messages in thread
From: Adam Duskett @ 2023-12-24 22:13 UTC (permalink / raw)
To: Adam Duskett; +Cc: buildroot
Marked as rejected as Amarula has not asked for a patch series that
bumps the versions of libglib/goi/glibmm.
Anyone else is more than welcome to take these patches and update them
as they see fit.
On Tue, Nov 7, 2023 at 9:18 AM Adam Duskett
<adam.duskett@amarulasolutions.com> wrote:
>
> - refactor 0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
> - Drop upstream patches 0002 and 0003
>
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
> ...girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 32 +++----
> ...rmat-in-gio-gunixconnection.c-part-2.patch | 93 ------------------
> ...documentation-generation-with-gtk_do.patch | 96 -------------------
> package/libglib2/libglib2.hash | 4 +-
> package/libglib2/libglib2.mk | 2 +-
> 5 files changed, 19 insertions(+), 208 deletions(-)
> delete mode 100644 package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch
> delete mode 100644 package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch
>
> diff --git a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
> index fb99057242..fa9c1754d2 100644
> --- a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
> +++ b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
> @@ -24,26 +24,26 @@ diff --git a/gio/meson.build b/gio/meson.build
> index 29473d26b..112d4ada9 100644
> --- a/gio/meson.build
> +++ b/gio/meson.build
> -@@ -841,6 +841,7 @@ pkg.generate(libgio,
> - variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
> - 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
> - 'bindir=' + join_paths('${prefix}', get_option('bindir')),
> -+ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
> - 'giomoduledir=' + pkgconfig_giomodulesdir,
> - 'gio=' + join_paths('${bindir}', 'gio'),
> - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
> +@@ -883,6 +883,7 @@ pkg.generate(libgio,
> + 'schemasdir=' + '${datadir}' / schemas_subdir,
> + 'dtdsdir=' + '${datadir}' / dtds_subdir,
> + 'bindir=' + '${prefix}' / get_option('bindir'),
> ++ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
> + 'giomoduledir=' + pkgconfig_giomodulesdir,
> + 'gio=' + '${bindir}' / 'gio',
> + 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
> diff --git a/glib/meson.build b/glib/meson.build
> index f78f32969..6c5486699 100644
> --- a/glib/meson.build
> +++ b/glib/meson.build
> -@@ -384,6 +384,7 @@ pkg.generate(libglib,
> - subdirs : ['glib-2.0'],
> - extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
> - variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
> -+ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
> - 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
> - 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
> - 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
> +@@ -447,6 +447,7 @@ pkg.generate(libglib,
> + variables : [
> + 'bindir=' + '${prefix}' / get_option('bindir'),
> + 'datadir=' + '${prefix}' / get_option('datadir'),
> ++ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
> + 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal',
> + 'gobject_query=' + '${bindir}' / 'gobject-query',
> + 'glib_mkenums=' + '${bindir}' / 'glib-mkenums',
> --
> 2.33.0
>
> diff --git a/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch b/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch
> deleted file mode 100644
> index 6075bacb06..0000000000
> --- a/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch
> +++ /dev/null
> @@ -1,93 +0,0 @@
> -From 4ae8606b6f80f9764e1f0a82cea7e23c8af487ae Mon Sep 17 00:00:00 2001
> -From: James Knight <james.d.knight@live.com>
> -Date: Thu, 20 Apr 2023 23:41:32 -0400
> -Subject: [PATCH] Fix error format in gio/gunixconnection.c (part 2)
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Update a series of error messages to use `g_set_error_literal` instead
> -of `g_set_error`. This should prevent `format-nonliteral` compiler
> -issues when `-Werror` is configured:
> -
> - ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_fd’:
> - ../gio/gunixconnection.c:183:9: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
> - 183 | nscm);
> - | ^~~~
> - ../gio/gunixconnection.c:217:20: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
> - 217 | nfd);
> - | ^~~
> - ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_credentials’:
> - ../gio/gunixconnection.c:601:24: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
> - 601 | nscm);
> - | ^~~~
> -
> -This is similar to a previous change [1] made to `gunixconnection.c`.
> -
> -[1]: 44b3d5d80445234041f6c59feb89645f7102c3a4
> -
> -Signed-off-by: James Knight <james.d.knight@live.com>
> -Upstream: backport from upstream https://gitlab.gnome.org/GNOME/glib/-/commit/4ae8606b6f80f9764e1f0a82cea7e23c8af487ae
> ----
> - gio/gunixconnection.c | 31 ++++++++++++++-----------------
> - 1 file changed, 14 insertions(+), 17 deletions(-)
> -
> -diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c
> -index b3f2b1c04b0abdf7136918585ae4cea8970a88bb..c012fcbfe00b69e9da609c7b626229db98e931ac 100644
> ---- a/gio/gunixconnection.c
> -+++ b/gio/gunixconnection.c
> -@@ -176,11 +176,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection,
> - {
> - gint i;
> -
> -- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
> -- ngettext("Expecting 1 control message, got %d",
> -- "Expecting 1 control message, got %d",
> -- nscm),
> -- nscm);
> -+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
> -+ ngettext ("Expecting 1 control message, got %d",
> -+ "Expecting 1 control message, got %d",
> -+ nscm));
> -
> - for (i = 0; i < nscm; i++)
> - g_object_unref (scms[i]);
> -@@ -210,11 +209,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection,
> - {
> - gint i;
> -
> -- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
> -- ngettext("Expecting one fd, but got %d\n",
> -- "Expecting one fd, but got %d\n",
> -- nfd),
> -- nfd);
> -+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
> -+ ngettext ("Expecting one fd, but got %d\n",
> -+ "Expecting one fd, but got %d\n",
> -+ nfd));
> -
> - for (i = 0; i < nfd; i++)
> - close (fds[i]);
> -@@ -592,13 +590,12 @@ g_unix_connection_receive_credentials (GUnixConnection *connection,
> - {
> - if (nscm != 1)
> - {
> -- g_set_error (error,
> -- G_IO_ERROR,
> -- G_IO_ERROR_FAILED,
> -- ngettext("Expecting 1 control message, got %d",
> -- "Expecting 1 control message, got %d",
> -- nscm),
> -- nscm);
> -+ g_set_error_literal (error,
> -+ G_IO_ERROR,
> -+ G_IO_ERROR_FAILED,
> -+ ngettext ("Expecting 1 control message, got %d",
> -+ "Expecting 1 control message, got %d",
> -+ nscm));
> - goto out;
> - }
> -
> ---
> -2.39.1.windows.1
> -
> diff --git a/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch b/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch
> deleted file mode 100644
> index 0fa15ad164..0000000000
> --- a/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch
> +++ /dev/null
> @@ -1,96 +0,0 @@
> -From 0fa17ec3c7152cf0e1cbf965acf1426ac203bb1d Mon Sep 17 00:00:00 2001
> -From: James Knight <james.d.knight@live.com>
> -Date: Thu, 27 Apr 2023 20:23:30 -0400
> -Subject: [PATCH] meson: wrap html documentation generation with gtk_doc option
> -
> -By default, if a host environment has the `rst2html5` application
> -available, builds will automatically perform some HTML documentation
> -generation from the documentation's glib reference content (e.g.
> -creating `gvariant-specification-1.0.html`). The creation of this
> -documentation is not required for all use cases.
> -
> -This commit tweaks the building of the HTML-based GLIB specification
> -document to be guarded by `gtk_doc`.
> -
> -Signed-off-by: James Knight <james.d.knight@live.com>
> -Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/0fa17ec3c7152cf0e1cbf965acf1426ac203bb1d
> -[yann.morin.1998@free.fr: backport from upstream]
> -Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ----
> - docs/reference/glib/meson.build | 58 +++++++++++++++++----------------
> - 1 file changed, 30 insertions(+), 28 deletions(-)
> -
> -diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build
> -index 114de49da..3cfff2f0b 100644
> ---- a/docs/reference/glib/meson.build
> -+++ b/docs/reference/glib/meson.build
> -@@ -113,35 +113,37 @@ if get_option('man')
> - endforeach
> - endif
> -
> --# GVariant specification is currently standalone
> --rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false)
> -+if get_option('gtk_doc')
> -+ # GVariant specification is currently standalone
> -+ rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false)
> -
> --if rst2html5.found()
> -- spec_path = glib_datadir / 'doc' / 'glib-2.0'
> -+ if rst2html5.found()
> -+ spec_path = glib_datadir / 'doc' / 'glib-2.0'
> -
> -- figures = files(
> -- 'gvariant-byte-boundaries.svg',
> -- 'gvariant-integer-and-string-structure.svg',
> -- 'gvariant-integer-array.svg',
> -- 'gvariant-string-array.svg',
> -- )
> -+ figures = files(
> -+ 'gvariant-byte-boundaries.svg',
> -+ 'gvariant-integer-and-string-structure.svg',
> -+ 'gvariant-integer-array.svg',
> -+ 'gvariant-string-array.svg',
> -+ )
> -
> -- custom_target('gvariant-specification-1.0',
> -- input: 'gvariant-specification-1.0.rst',
> -- output: 'gvariant-specification-1.0.html',
> -- command: [
> -- rst2html5,
> -- '@INPUT@',
> -- ],
> -- capture: true,
> -- install: true,
> -- install_dir: spec_path,
> -- install_tag: 'doc',
> -- depend_files: figures,
> -- )
> -+ custom_target('gvariant-specification-1.0',
> -+ input: 'gvariant-specification-1.0.rst',
> -+ output: 'gvariant-specification-1.0.html',
> -+ command: [
> -+ rst2html5,
> -+ '@INPUT@',
> -+ ],
> -+ capture: true,
> -+ install: true,
> -+ install_dir: spec_path,
> -+ install_tag: 'doc',
> -+ depend_files: figures,
> -+ )
> -
> -- install_data(figures,
> -- install_dir : spec_path,
> -- install_tag : 'doc',
> -- )
> --endif
> -\ No newline at end of file
> -+ install_data(figures,
> -+ install_dir : spec_path,
> -+ install_tag : 'doc',
> -+ )
> -+ endif
> -+endif
> ---
> -2.25.1
> -
> diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash
> index 07ed7635a6..77528856cc 100644
> --- a/package/libglib2/libglib2.hash
> +++ b/package/libglib2/libglib2.hash
> @@ -1,4 +1,4 @@
> -# https://download.gnome.org/sources/glib/2.76/glib-2.76.1.sha256sum
> -sha256 43dc0f6a126958f5b454136c4398eab420249c16171a769784486e25f2fda19f glib-2.76.1.tar.xz
> +# https://download.gnome.org/sources/glib/2.78/glib-2.78.1.sha256sum
> +sha256 915bc3d0f8507d650ead3832e2f8fb670fce59aac4d7754a7dab6f1e6fed78b2 glib-2.78.1.tar.xz
> # License files, locally calculated
> sha256 fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb COPYING
> diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> index c06ded2a5b..de2214d397 100644
> --- a/package/libglib2/libglib2.mk
> +++ b/package/libglib2/libglib2.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -LIBGLIB2_VERSION_MAJOR = 2.76
> +LIBGLIB2_VERSION_MAJOR = 2.78
> LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1
> LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
> LIBGLIB2_SITE = https://download.gnome.org/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
> --
> 2.41.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
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/3] package/glibmm: bump version to 2.78.0
2023-09-21 18:19 ` [Buildroot] [PATCH 2/3] package/glibmm: " Adam Duskett
@ 2023-09-28 18:18 ` Daniel Lang
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Lang @ 2023-09-28 18:18 UTC (permalink / raw)
To: Adam Duskett, buildroot; +Cc: Fabrice Fontaine, James Knight
Hey Adam,
thanks for the patch!
On 21.09.23 20:19, Adam Duskett wrote:
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
Reviewed-by: Daniel Lang <dalang@gmx.at>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3] package/glibmm: bump version to 2.78.0
2023-09-21 18:19 [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.0 Adam Duskett
@ 2023-09-21 18:19 ` Adam Duskett
2023-09-28 18:18 ` Daniel Lang
0 siblings, 1 reply; 6+ messages in thread
From: Adam Duskett @ 2023-09-21 18:19 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett, Daniel Lang, Fabrice Fontaine, James Knight
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/glibmm/glibmm.hash | 4 ++--
package/glibmm/glibmm.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash
index ee50ccdb01..8536b20a93 100644
--- a/package/glibmm/glibmm.hash
+++ b/package/glibmm/glibmm.hash
@@ -1,5 +1,5 @@
-# From https://download.gnome.org/sources/glibmm/2.76/glibmm-2.76.0.sha256sum
-sha256 8637d80ceabd94fddd6e48970a082a264558d4ab82684e15ffc87e7ef3462ab2 glibmm-2.76.0.tar.xz
+# From https://download.gnome.org/sources/glibmm/2.78/glibmm-2.78.0.sha256sum
+sha256 5d2e872564996f02a06d8bbac3677e7c394af8b00dd1526aebd47af842a3ef50 glibmm-2.78.0.tar.xz
# License files, locally calculated
sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
index da95329a3d..c2238e2f30 100644
--- a/package/glibmm/glibmm.mk
+++ b/package/glibmm/glibmm.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GLIBMM_VERSION_MAJOR = 2.76
+GLIBMM_VERSION_MAJOR = 2.78
GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0
GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
GLIBMM_LICENSE_FILES = COPYING COPYING.tools
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-24 22:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-07 16:18 [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.1 Adam Duskett
2023-11-07 16:18 ` [Buildroot] [PATCH 2/3] package/glibmm: bump version to 2.78.0 Adam Duskett
2023-11-07 16:18 ` [Buildroot] [PATCH 3/3] package/gobject-introspection: bump version to 1.78.1 Adam Duskett
2023-12-24 22:13 ` [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.1 Adam Duskett
-- strict thread matches above, loose matches on Subject: below --
2023-09-21 18:19 [Buildroot] [PATCH 1/3] package/libglib2: bump version to 2.78.0 Adam Duskett
2023-09-21 18:19 ` [Buildroot] [PATCH 2/3] package/glibmm: " Adam Duskett
2023-09-28 18:18 ` Daniel Lang
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.