* [Buildroot] [PATCH v2 1/1] package/libglib2: bump version to 2.68.4
@ 2021-09-20 17:30 Adam Duskett
2021-09-20 17:31 ` Adam Duskett
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Adam Duskett @ 2021-09-20 17:30 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Adam Duskett
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
Changes V1 -> V2:
- Refactor against master branch instead of next.
.../0002-remove-cpp-requirement.patch | 2 +-
...tly-use-3-parameters-for-close_range.patch | 33 -------------------
package/libglib2/libglib2.hash | 4 +--
package/libglib2/libglib2.mk | 2 +-
4 files changed, 4 insertions(+), 37 deletions(-)
delete mode 100644 package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch
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/0004-correctly-use-3-parameters-for-close_range.patch b/package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch
deleted file mode 100644
index bfca4b14ef..0000000000
--- a/package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 8 Jul 2021 17:26:43 -0700
-Subject: [PATCH] correctly use 3 parameters for close_range
-
-libc implementation has 3 parameter e.g.
-https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-[Retrieved from:
-https://gitlab.gnome.org/GNOME/glib/-/commit/b71117d89434db83d34bc1b981ca03d4be299576]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- glib/gspawn.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/glib/gspawn.c b/glib/gspawn.c
-index 899647c2f..3073a10a4 100644
---- a/glib/gspawn.c
-+++ b/glib/gspawn.c
-@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd)
- *
- * Handle ENOSYS in case it’s supported in libc but not the kernel; if so,
- * fall back to safe_fdwalk(). */
-- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS)
-+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS)
- #endif /* HAVE_CLOSE_RANGE */
- (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd));
- #endif
---
-GitLab
-
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] 4+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/libglib2: bump version to 2.68.4
2021-09-20 17:30 [Buildroot] [PATCH v2 1/1] package/libglib2: bump version to 2.68.4 Adam Duskett
@ 2021-09-20 17:31 ` Adam Duskett
2021-09-26 21:43 ` Arnout Vandecappelle
2021-10-06 12:49 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Adam Duskett @ 2021-09-20 17:31 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
This time with 100% less next branch and 100% more master branch.
On Mon, Sep 20, 2021 at 10:30 AM Adam Duskett <aduskett@gmail.com> wrote:
>
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> Changes V1 -> V2:
> - Refactor against master branch instead of next.
>
> .../0002-remove-cpp-requirement.patch | 2 +-
> ...tly-use-3-parameters-for-close_range.patch | 33 -------------------
> package/libglib2/libglib2.hash | 4 +--
> package/libglib2/libglib2.mk | 2 +-
> 4 files changed, 4 insertions(+), 37 deletions(-)
> delete mode 100644 package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch
>
> 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/0004-correctly-use-3-parameters-for-close_range.patch b/package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch
> deleted file mode 100644
> index bfca4b14ef..0000000000
> --- a/package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Thu, 8 Jul 2021 17:26:43 -0700
> -Subject: [PATCH] correctly use 3 parameters for close_range
> -
> -libc implementation has 3 parameter e.g.
> -https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -[Retrieved from:
> -https://gitlab.gnome.org/GNOME/glib/-/commit/b71117d89434db83d34bc1b981ca03d4be299576]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - glib/gspawn.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/glib/gspawn.c b/glib/gspawn.c
> -index 899647c2f..3073a10a4 100644
> ---- a/glib/gspawn.c
> -+++ b/glib/gspawn.c
> -@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd)
> - *
> - * Handle ENOSYS in case it’s supported in libc but not the kernel; if so,
> - * fall back to safe_fdwalk(). */
> -- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS)
> -+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS)
> - #endif /* HAVE_CLOSE_RANGE */
> - (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd));
> - #endif
> ---
> -GitLab
> -
> 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 [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/libglib2: bump version to 2.68.4
2021-09-20 17:30 [Buildroot] [PATCH v2 1/1] package/libglib2: bump version to 2.68.4 Adam Duskett
2021-09-20 17:31 ` Adam Duskett
@ 2021-09-26 21:43 ` Arnout Vandecappelle
2021-10-06 12:49 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2021-09-26 21:43 UTC (permalink / raw)
To: Adam Duskett, buildroot; +Cc: Fabrice Fontaine
On 20/09/2021 19:30, Adam Duskett wrote:
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> Changes V1 -> V2:
> - Refactor against master branch instead of next.
>
> .../0002-remove-cpp-requirement.patch | 2 +-
> ...tly-use-3-parameters-for-close_range.patch | 33 -------------------
> package/libglib2/libglib2.hash | 4 +--
> package/libglib2/libglib2.mk | 2 +-
> 4 files changed, 4 insertions(+), 37 deletions(-)
> delete mode 100644 package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch
>
> 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/0004-correctly-use-3-parameters-for-close_range.patch b/package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch
> deleted file mode 100644
> index bfca4b14ef..0000000000
> --- a/package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Thu, 8 Jul 2021 17:26:43 -0700
> -Subject: [PATCH] correctly use 3 parameters for close_range
> -
> -libc implementation has 3 parameter e.g.
> -https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -[Retrieved from:
> -https://gitlab.gnome.org/GNOME/glib/-/commit/b71117d89434db83d34bc1b981ca03d4be299576]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - glib/gspawn.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/glib/gspawn.c b/glib/gspawn.c
> -index 899647c2f..3073a10a4 100644
> ---- a/glib/gspawn.c
> -+++ b/glib/gspawn.c
> -@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd)
> - *
> - * Handle ENOSYS in case it’s supported in libc but not the kernel; if so,
> - * fall back to safe_fdwalk(). */
> -- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS)
> -+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS)
> - #endif /* HAVE_CLOSE_RANGE */
> - (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd));
> - #endif
> ---
> -GitLab
> -
> 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+
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/libglib2: bump version to 2.68.4
2021-09-20 17:30 [Buildroot] [PATCH v2 1/1] package/libglib2: bump version to 2.68.4 Adam Duskett
2021-09-20 17:31 ` Adam Duskett
2021-09-26 21:43 ` Arnout Vandecappelle
@ 2021-10-06 12:49 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2021-10-06 12:49 UTC (permalink / raw)
To: Adam Duskett; +Cc: Fabrice Fontaine, buildroot
>>>>> "Adam" == Adam Duskett <aduskett@gmail.com> writes:
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> Changes V1 -> V2:
> - Refactor against master branch instead of next.
Committed to 2021.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-06 12:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-20 17:30 [Buildroot] [PATCH v2 1/1] package/libglib2: bump version to 2.68.4 Adam Duskett
2021-09-20 17:31 ` Adam Duskett
2021-09-26 21:43 ` Arnout Vandecappelle
2021-10-06 12:49 ` Peter Korsgaard
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.