* Re: glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
@ 2021-03-22 23:11 ` ericonr
2021-03-22 23:19 ` ericonr
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-03-22 23:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29689#issuecomment-804455614
Comment:
This one introduces some relevant new APIs, so I would increase the `common/shlibs` requirement.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
2021-03-22 23:11 ` ericonr
@ 2021-03-22 23:19 ` ericonr
2021-03-22 23:26 ` paper42
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-03-22 23:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29689#issuecomment-804458437
Comment:
If you want to make a separate PR for 2.66.8, we can merge that first. 2.68.0 is a bigger release.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
2021-03-22 23:11 ` ericonr
2021-03-22 23:19 ` ericonr
@ 2021-03-22 23:26 ` paper42
2021-03-23 8:55 ` [PR PATCH] [Updated] " paper42
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-03-22 23:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/29689#issuecomment-804461472
Comment:
I would prefer to work on this PR, but if someone else updates the package to 2.66.8, I can just rebase this. This update will be neccesary for Gnome 40.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (2 preceding siblings ...)
2021-03-22 23:26 ` paper42
@ 2021-03-23 8:55 ` paper42
2021-03-23 22:33 ` paper42
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-03-23 8:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages 0001-glib-update-to-2.68.0.patch
https://github.com/void-linux/void-packages/pull/29689
glib: update to 2.68.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29689.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-glib-update-to-2.68.0.patch-29689.patch --]
[-- Type: text/x-diff, Size: 4070 bytes --]
From 802018d4d631147860b0ebd8dab620058ca6d029 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Tue, 23 Mar 2021 09:45:33 +0100
Subject: [PATCH] glib: update to 2.68.0
---
common/shlibs | 10 +++++-----
.../glib/patches/disable-broken-tests.patch | 18 ++++++++++++------
srcpkgs/glib/template | 4 ++--
srcpkgs/glib/update | 1 +
4 files changed, 20 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/glib/update
diff --git a/common/shlibs b/common/shlibs
index 4b82c3ced654..96765d0a15b6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
libbluetooth.so.3 libbluetooth-4.58_1
libwmf-0.2.so.7 libwmf-0.2.8.4_1
libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
libatk-1.0.so.0 atk-1.26.0_1
libpangocairo-1.0.so.0 pango-1.24.0_1
libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..20be50efde34 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae0..6424b5c 100644
--- gio/tests/meson.build
+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
'cancellable' : {},
'contexts' : {},
'contenttype' : {},
@@ -10,7 +10,7 @@ index d8ebd56..be72f5c 100644
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -567,7 +566,7 @@ if installed_tests_enabled
endforeach
endif
@@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644
plugin_resources_c = custom_target('plugin-resources.c',
input : 'test4.gresource.xml',
diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
+index c77ccdd..7bf01bb 100644
--- glib/tests/meson.build
+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
- 'collate' : {},
'cond' : {},
- 'convert' : {},
+ 'cxx' : {
+ 'source' : ['cxx.cpp'],
+ },
'dataset' : {},
- 'date' : {},
'dir' : {},
@@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644
'guuid' : {},
'gvariant' : {
'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +50,6 @@ glib_tests = {
'mutex' : {},
'node' : {},
'once' : {},
@@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644
'option-argv0' : {},
'overflow' : {},
'overflow-fallback' : {
+--
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 942720feaa43..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
# Template file for 'glib'
pkgname=glib
-version=2.66.7
+version=2.68.0
revision=1
build_style=meson
# static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=09f158769f6f26b31074e15b1ac80ec39b13b53102dfae66cfe826fb2cc65502
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (3 preceding siblings ...)
2021-03-23 8:55 ` [PR PATCH] [Updated] " paper42
@ 2021-03-23 22:33 ` paper42
2021-03-28 20:46 ` paper42
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-03-23 22:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages 0001-glib-update-to-2.68.0.patch
https://github.com/void-linux/void-packages/pull/29689
glib: update to 2.68.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29689.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-glib-update-to-2.68.0.patch-29689.patch --]
[-- Type: text/x-diff, Size: 4717 bytes --]
From 65de1e831b5e0d4cbacaf518d55d3697f4cff466 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Tue, 23 Mar 2021 09:45:33 +0100
Subject: [PATCH] glib: update to 2.68.0
---
common/shlibs | 10 +++---
.../glib/patches/disable-broken-tests.patch | 36 +++++++++++++++----
srcpkgs/glib/template | 4 +--
srcpkgs/glib/update | 1 +
4 files changed, 37 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/glib/update
diff --git a/common/shlibs b/common/shlibs
index 4b82c3ced654..96765d0a15b6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
libbluetooth.so.3 libbluetooth-4.58_1
libwmf-0.2.so.7 libwmf-0.2.8.4_1
libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
libatk-1.0.so.0 atk-1.26.0_1
libpangocairo-1.0.so.0 pango-1.24.0_1
libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..43cf11d6b9ee 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae0..682611d 100644
--- gio/tests/meson.build
+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
'cancellable' : {},
'contexts' : {},
'contenttype' : {},
@@ -10,7 +10,23 @@ index d8ebd56..be72f5c 100644
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+ 'network-monitor' : {},
+ 'network-monitor-race' : {},
+ 'permission' : {},
+- 'pollable' : {'dependencies' : [libdl_dep]},
+ 'proxy-test' : {},
+ 'readwrite' : {},
+ 'simple-async-result' : {},
+@@ -150,7 +148,6 @@ endif
+ # Test programs buildable on UNIX only
+ if host_machine.system() != 'windows'
+ gio_tests += {
+- 'file' : {},
+ 'gdbus-peer' : {
+ 'dependencies' : [libgdbus_example_objectmanager_dep],
+ 'install_rpath' : installed_tests_execdir
+@@ -567,7 +564,7 @@ if installed_tests_enabled
endforeach
endif
@@ -20,21 +36,24 @@ index d8ebd56..be72f5c 100644
plugin_resources_c = custom_target('plugin-resources.c',
input : 'test4.gresource.xml',
diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
+index c77ccdd..b0dab69 100644
--- glib/tests/meson.build
+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
- 'collate' : {},
'cond' : {},
- 'convert' : {},
+ 'cxx' : {
+ 'source' : ['cxx.cpp'],
+ },
'dataset' : {},
- 'date' : {},
'dir' : {},
'environment' : {},
- 'error' : {},
+- 'error' : {},
- 'fileutils' : {},
- 'gdatetime' : {
- 'suite' : ['slow'],
@@ -42,7 +61,7 @@ index 6eb23e8..d7aacfa 100644
'guuid' : {},
'gvariant' : {
'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
'mutex' : {},
'node' : {},
'once' : {},
@@ -50,3 +69,6 @@ index 6eb23e8..d7aacfa 100644
'option-argv0' : {},
'overflow' : {},
'overflow-fallback' : {
+--
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 942720feaa43..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
# Template file for 'glib'
pkgname=glib
-version=2.66.7
+version=2.68.0
revision=1
build_style=meson
# static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=09f158769f6f26b31074e15b1ac80ec39b13b53102dfae66cfe826fb2cc65502
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (4 preceding siblings ...)
2021-03-23 22:33 ` paper42
@ 2021-03-28 20:46 ` paper42
2021-03-28 20:48 ` paper42
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-03-28 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages 0001-glib-update-to-2.68.0.patch
https://github.com/void-linux/void-packages/pull/29689
glib: update to 2.68.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29689.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-glib-update-to-2.68.0.patch-29689.patch --]
[-- Type: text/x-diff, Size: 4718 bytes --]
From 7ae990bdeed2c2d4c564fb9bafb25127d7516ef4 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 28 Mar 2021 22:35:26 +0200
Subject: [PATCH] glib: update to 2.68.0.
---
common/shlibs | 10 +++---
.../glib/patches/disable-broken-tests.patch | 36 +++++++++++++++----
srcpkgs/glib/template | 4 +--
srcpkgs/glib/update | 1 +
4 files changed, 37 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/glib/update
diff --git a/common/shlibs b/common/shlibs
index 7319cc8d20cb..c1caa4261970 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
libbluetooth.so.3 libbluetooth-4.58_1
libwmf-0.2.so.7 libwmf-0.2.8.4_1
libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
libatk-1.0.so.0 atk-1.26.0_1
libpangocairo-1.0.so.0 pango-1.24.0_1
libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..43cf11d6b9ee 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae0..682611d 100644
--- gio/tests/meson.build
+++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
'cancellable' : {},
'contexts' : {},
'contenttype' : {},
@@ -10,7 +10,23 @@ index d8ebd56..be72f5c 100644
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+ 'network-monitor' : {},
+ 'network-monitor-race' : {},
+ 'permission' : {},
+- 'pollable' : {'dependencies' : [libdl_dep]},
+ 'proxy-test' : {},
+ 'readwrite' : {},
+ 'simple-async-result' : {},
+@@ -150,7 +148,6 @@ endif
+ # Test programs buildable on UNIX only
+ if host_machine.system() != 'windows'
+ gio_tests += {
+- 'file' : {},
+ 'gdbus-peer' : {
+ 'dependencies' : [libgdbus_example_objectmanager_dep],
+ 'install_rpath' : installed_tests_execdir
+@@ -567,7 +564,7 @@ if installed_tests_enabled
endforeach
endif
@@ -20,21 +36,24 @@ index d8ebd56..be72f5c 100644
plugin_resources_c = custom_target('plugin-resources.c',
input : 'test4.gresource.xml',
diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
+index c77ccdd..b0dab69 100644
--- glib/tests/meson.build
+++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
- 'collate' : {},
'cond' : {},
- 'convert' : {},
+ 'cxx' : {
+ 'source' : ['cxx.cpp'],
+ },
'dataset' : {},
- 'date' : {},
'dir' : {},
'environment' : {},
- 'error' : {},
+- 'error' : {},
- 'fileutils' : {},
- 'gdatetime' : {
- 'suite' : ['slow'],
@@ -42,7 +61,7 @@ index 6eb23e8..d7aacfa 100644
'guuid' : {},
'gvariant' : {
'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
'mutex' : {},
'node' : {},
'once' : {},
@@ -50,3 +69,6 @@ index 6eb23e8..d7aacfa 100644
'option-argv0' : {},
'overflow' : {},
'overflow-fallback' : {
+--
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..dba02a0e1b77 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
# Template file for 'glib'
pkgname=glib
-version=2.66.8
+version=2.68.0
revision=1
build_style=meson
# static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (5 preceding siblings ...)
2021-03-28 20:46 ` paper42
@ 2021-03-28 20:48 ` paper42
2021-04-04 9:24 ` [PR REVIEW] " Gottox
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-03-28 20:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/29689#issuecomment-808957101
Comment:
I ran tests on my computer without patching them out and they all passed in a glibc and musl masterdir. I think I might be doing something wrong, because some of the tests are known to fail on musl.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (6 preceding siblings ...)
2021-03-28 20:48 ` paper42
@ 2021-04-04 9:24 ` Gottox
2021-04-04 20:46 ` ericonr
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-04-04 9:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New review comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/29689#discussion_r606773919
Comment:
A few of this tests can be fixed by adding `python3-pytest` to checkdepends.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (7 preceding siblings ...)
2021-04-04 9:24 ` [PR REVIEW] " Gottox
@ 2021-04-04 20:46 ` ericonr
2021-04-04 20:53 ` ericonr
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-04-04 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29689#issuecomment-813096915
Comment:
> I ran tests on my computer without patching them out and they all passed in a glibc and musl masterdir. I think I might be doing something wrong, because some of the tests are known to fail on musl.
I think so; how are you running them? I usually do `xbulk -Q glib`.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (8 preceding siblings ...)
2021-04-04 20:46 ` ericonr
@ 2021-04-04 20:53 ` ericonr
2021-04-04 22:19 ` paper42
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-04-04 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29689#issuecomment-813097703
Comment:
I think we should include this patch: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2010 , it was a 2.68 regression.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (9 preceding siblings ...)
2021-04-04 20:53 ` ericonr
@ 2021-04-04 22:19 ` paper42
2021-04-05 9:24 ` Gottox
2021-04-05 9:24 ` [PR PATCH] [Closed]: " Gottox
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-04-04 22:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/29689#issuecomment-813107806
Comment:
@Gottox do you want to take over this PR?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (10 preceding siblings ...)
2021-04-04 22:19 ` paper42
@ 2021-04-05 9:24 ` Gottox
2021-04-05 9:24 ` [PR PATCH] [Closed]: " Gottox
12 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-04-05 9:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/29689#issuecomment-813298753
Comment:
@paper42 Thanks, I cherry picked this commit. :+1:
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Closed]: glib: update to 2.68.0
2021-03-22 22:36 [PR PATCH] glib: update to 2.68.0 paper42
` (11 preceding siblings ...)
2021-04-05 9:24 ` Gottox
@ 2021-04-05 9:24 ` Gottox
12 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-04-05 9:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1433 bytes --]
There's a closed pull request on the void-packages repository
glib: update to 2.68.0
https://github.com/void-linux/void-packages/pull/29689
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 14+ messages in thread