Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] glib: update to 2.74.0.
@ 2022-09-18 12:04 paper42
  2022-09-18 12:16 ` [PR PATCH] [Updated] " paper42
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: paper42 @ 2022-09-18 12:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages glib-2.74
https://github.com/void-linux/void-packages/pull/39341

glib: update to 2.74.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39341.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.74-39341.patch --]
[-- Type: text/x-diff, Size: 4577 bytes --]

From 8b8429d58bd25884b5280e5b1ece2734a584d0e2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 12 Sep 2022 20:58:10 +0200
Subject: [PATCH] glib: update to 2.74.0.

---
 .../glib/patches/disable-broken-tests.patch   | 77 -------------------
 srcpkgs/glib/template                         | 16 ++--
 2 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index 2a5263007503..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
-     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
-     'should_fail' : host_system == 'darwin',
-   },
--  'converter-stream' : {},
-   'credentials' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-@@ -91,7 +90,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -174,7 +172,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,
-@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--      'should_fail' : host_system == 'darwin',
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,25 +11,17 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'completion' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {
--    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--    'should_fail' : host_system == 'darwin',
--  },
-   'dir' : {},
-   'environment' : {
-     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-     'should_fail' : host_system == 'darwin',
-   },
--  'error' : {},
--  'fileutils' : {},
-   'gdatetime' : {
-     'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 8583a6616511..5d9693a8933d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,23 +1,23 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.72.2
-revision=2
+version=2.74.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
-configure_args="-Dfam=false -Dman=true -Dselinux=disabled
+configure_args="-Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
-makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
+makedepends="zlib-devel pcre2-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
 checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
 short_desc="GNU library of C routines"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
+checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] glib: update to 2.74.0.
  2022-09-18 12:04 [PR PATCH] glib: update to 2.74.0 paper42
@ 2022-09-18 12:16 ` paper42
  2022-09-18 13:04 ` paper42
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-09-18 12:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages glib-2.74
https://github.com/void-linux/void-packages/pull/39341

glib: update to 2.74.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39341.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.74-39341.patch --]
[-- Type: text/x-diff, Size: 4125 bytes --]

From 6aee220fa4ed3eb2e64d95020ba34fab19bdfece Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 12 Sep 2022 20:58:10 +0200
Subject: [PATCH] glib: update to 2.74.0.

---
 .../glib/patches/disable-broken-tests.patch   | 34 ++++---------------
 srcpkgs/glib/template                         | 16 ++++-----
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 2a5263007503..86443f1c8aba 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -6,25 +6,9 @@
    },
 -  'converter-stream' : {},
    'credentials' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-@@ -91,7 +90,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -174,7 +172,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,
-@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+   'data-input-stream' : {},
+   'data-output-stream' : {},
+@@ -814,14 +813,6 @@ if meson.can_run_host_binaries()
        test_resources_binary2,
      ]
    endif
@@ -41,7 +25,7 @@
  foreach test_name, extra_args : gio_tests
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,25 +11,17 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -49,9 +33,6 @@
    'completion' : {},
    'cond' : {},
 -  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
@@ -63,14 +44,13 @@
      'should_fail' : host_system == 'darwin',
    },
 -  'error' : {},
--  'fileutils' : {},
+   'fileutils' : {},
    'gdatetime' : {
      'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
-   'mutex' : {},
+@@ -65,7 +58,6 @@ glib_tests = {
    'node' : {},
    'once' : {},
+   'onceinit' : {},
 -  'option-context' : {},
    'option-argv0' : {},
    'overflow' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 8583a6616511..5d9693a8933d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,23 +1,23 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.72.2
-revision=2
+version=2.74.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
-configure_args="-Dfam=false -Dman=true -Dselinux=disabled
+configure_args="-Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
-makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
+makedepends="zlib-devel pcre2-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
 checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
 short_desc="GNU library of C routines"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
+checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] glib: update to 2.74.0.
  2022-09-18 12:04 [PR PATCH] glib: update to 2.74.0 paper42
  2022-09-18 12:16 ` [PR PATCH] [Updated] " paper42
@ 2022-09-18 13:04 ` paper42
  2022-09-18 13:27 ` paper42
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-09-18 13:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages glib-2.74
https://github.com/void-linux/void-packages/pull/39341

glib: update to 2.74.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39341.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.74-39341.patch --]
[-- Type: text/x-diff, Size: 4390 bytes --]

From 3fc2f48cdcaa7223f10e47315ee05a82335be97a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 12 Sep 2022 20:58:10 +0200
Subject: [PATCH] glib: update to 2.74.0.

---
 .../glib/patches/disable-broken-tests.patch   | 29 ++++++-------------
 srcpkgs/glib/template                         | 21 ++++++--------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 2a5263007503..865ab1f0449a 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -6,25 +6,17 @@
    },
 -  'converter-stream' : {},
    'credentials' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-@@ -91,7 +90,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -174,7 +172,6 @@ endif
+   'data-input-stream' : {},
+   'data-output-stream' : {},
+@@ -198,7 +197,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,
-@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+     'gdbus-peer-object-manager' : {},
+     'gdbus-sasl' : {},
+     'live-g-file' : {},
+@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
        test_resources_binary2,
      ]
    endif
@@ -41,7 +33,7 @@
  foreach test_name, extra_args : gio_tests
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,25 +11,17 @@ glib_tests = {
+@@ -11,22 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -49,9 +41,6 @@
    'completion' : {},
    'cond' : {},
 -  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
@@ -68,9 +57,9 @@
      'suite' : ['slow'],
    },
 @@ -65,7 +57,6 @@ glib_tests = {
-   'mutex' : {},
    'node' : {},
    'once' : {},
+   'onceinit' : {},
 -  'option-context' : {},
    'option-argv0' : {},
    'overflow' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 8583a6616511..7665dba5bd3e 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,23 +1,24 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.72.2
-revision=2
+version=2.74.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
-configure_args="-Dfam=false -Dman=true -Dselinux=disabled
+configure_args="-Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
-makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
+makedepends="zlib-devel pcre2-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
 checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
 short_desc="GNU library of C routines"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
+checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
@@ -26,10 +27,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
-do_check() {
-	dbus-run-session ninja -C build test
-}
-
 libglib-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] glib: update to 2.74.0.
  2022-09-18 12:04 [PR PATCH] glib: update to 2.74.0 paper42
  2022-09-18 12:16 ` [PR PATCH] [Updated] " paper42
  2022-09-18 13:04 ` paper42
@ 2022-09-18 13:27 ` paper42
  2022-09-18 17:07 ` paper42
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-09-18 13:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages glib-2.74
https://github.com/void-linux/void-packages/pull/39341

glib: update to 2.74.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39341.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.74-39341.patch --]
[-- Type: text/x-diff, Size: 5106 bytes --]

From 6319d50ea8cfb0f703642b10f0029884dcc00445 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 12 Sep 2022 20:58:10 +0200
Subject: [PATCH] glib: update to 2.74.0.

---
 .../glib/patches/disable-broken-tests.patch   | 52 ++++++++++++-------
 srcpkgs/glib/template                         | 21 ++++----
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 2a5263007503..f4a46c4ae19c 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -6,25 +6,40 @@
    },
 -  'converter-stream' : {},
    'credentials' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-@@ -91,7 +90,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -174,7 +172,6 @@ endif
+   'data-input-stream' : {},
+   'data-output-stream' : {},
+@@ -76,12 +75,6 @@ gio_tests = {
+   'g-icon' : {},
+   'gdbus-addresses' : {},
+   'gdbus-message' : {},
+-  'gdbus-peer' : {
+-    'dependencies' : [libgdbus_example_objectmanager_dep],
+-    'install_rpath' : installed_tests_execdir,
+-    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+-    'should_fail' : host_system == 'darwin',
+-  },
+   'inet-address' : {},
+   'io-stream' : {},
+   'memory-input-stream' : {},
+@@ -198,7 +191,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,
-@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+     'gdbus-peer-object-manager' : {},
+     'gdbus-sasl' : {},
+     'live-g-file' : {},
+@@ -239,9 +231,6 @@ if host_machine.system() != 'windows'
+   # unable to find the installed executable
+   if not glib_have_cocoa
+     gio_tests += {
+-      'appinfo' : {
+-        'install' : false,
+-      },
+       'desktop-app-info' : {
+         'install' : false,
+       },
+@@ -814,14 +803,6 @@ if meson.can_run_host_binaries()
        test_resources_binary2,
      ]
    endif
@@ -41,7 +56,7 @@
  foreach test_name, extra_args : gio_tests
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,25 +11,17 @@ glib_tests = {
+@@ -11,22 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -49,9 +64,6 @@
    'completion' : {},
    'cond' : {},
 -  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
@@ -68,9 +80,9 @@
      'suite' : ['slow'],
    },
 @@ -65,7 +57,6 @@ glib_tests = {
-   'mutex' : {},
    'node' : {},
    'once' : {},
+   'onceinit' : {},
 -  'option-context' : {},
    'option-argv0' : {},
    'overflow' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 8583a6616511..7665dba5bd3e 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,23 +1,24 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.72.2
-revision=2
+version=2.74.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
-configure_args="-Dfam=false -Dman=true -Dselinux=disabled
+configure_args="-Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
-makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
+makedepends="zlib-devel pcre2-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
 checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
 short_desc="GNU library of C routines"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
+checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
@@ -26,10 +27,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
-do_check() {
-	dbus-run-session ninja -C build test
-}
-
 libglib-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] glib: update to 2.74.0.
  2022-09-18 12:04 [PR PATCH] glib: update to 2.74.0 paper42
                   ` (2 preceding siblings ...)
  2022-09-18 13:27 ` paper42
@ 2022-09-18 17:07 ` paper42
  2022-09-18 20:31 ` paper42
  2022-09-18 21:08 ` [PR PATCH] [Merged]: " paper42
  5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-09-18 17:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages glib-2.74
https://github.com/void-linux/void-packages/pull/39341

glib: update to 2.74.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39341.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.74-39341.patch --]
[-- Type: text/x-diff, Size: 6834 bytes --]

From a6b0725b661540c1dd5d78d74c3b97a66c4df8cf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 12 Sep 2022 20:58:10 +0200
Subject: [PATCH] glib: update to 2.74.0.

---
 .../glib/patches/disable-broken-tests.patch   | 34 +++----------
 srcpkgs/glib/patches/test-error-musl.patch    | 50 +++++++++++++++++++
 srcpkgs/glib/template                         | 26 ++++++----
 3 files changed, 73 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/glib/patches/test-error-musl.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 2a5263007503..86443f1c8aba 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -6,25 +6,9 @@
    },
 -  'converter-stream' : {},
    'credentials' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-@@ -91,7 +90,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -174,7 +172,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,
-@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+   'data-input-stream' : {},
+   'data-output-stream' : {},
+@@ -814,14 +813,6 @@ if meson.can_run_host_binaries()
        test_resources_binary2,
      ]
    endif
@@ -41,7 +25,7 @@
  foreach test_name, extra_args : gio_tests
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,25 +11,17 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -49,9 +33,6 @@
    'completion' : {},
    'cond' : {},
 -  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
@@ -63,14 +44,13 @@
      'should_fail' : host_system == 'darwin',
    },
 -  'error' : {},
--  'fileutils' : {},
+   'fileutils' : {},
    'gdatetime' : {
      'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
-   'mutex' : {},
+@@ -65,7 +58,6 @@ glib_tests = {
    'node' : {},
    'once' : {},
+   'onceinit' : {},
 -  'option-context' : {},
    'option-argv0' : {},
    'overflow' : {},
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
new file mode 100644
index 000000000000..427df3de13c7
--- /dev/null
+++ b/srcpkgs/glib/patches/test-error-musl.patch
@@ -0,0 +1,50 @@
+From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 18 Sep 2022 17:30:41 +0200
+Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
+ glibc
+
+The musl implementation of vasprintf segfaults with NULL
+---
+ glib/tests/error.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/glib/tests/error.c b/glib/tests/error.c
+index 7ea04ea3ce..fa3a25969d 100644
+--- a/glib/tests/error.c
++++ b/glib/tests/error.c
+@@ -123,12 +123,12 @@ static void
+ test_new_valist_invalid_va (gpointer dummy,
+                          ...)
+ {
+-#ifdef __linux__
+-  /* Only worth testing this on Linux; if other platforms regress on this legacy
+-   * behaviour, we don’t care. In particular, calling g_error_new_valist() with
+-   * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
+-   * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
+-   * either case. */
++#if defined(__linux__) && defined(__GLIBC__)
++  /* Only worth testing this on Linux with glibc; if other platforms regress on
++   * this legacy behaviour, we don’t care. In particular, calling
++   * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
++   * implementation of vasprintf() is less forgiving than Linux’s. That’s
++   * fine: it’s a programmer error in either case. */
+   const struct
+     {
+       GQuark domain;
+@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
+ 
+       va_end (ap);
+     }
+-#else  /* if !__linux__ */
+-  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
+-#endif  /* !__linux__ */
++#else  /* if !__linux__ || !__GLIBC__ */
++  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
++#endif /* !__linux__ || ! __GLIBC__ */
+ }
+ 
+ static void
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 8583a6616511..33c1d9e0cd7d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,23 +1,24 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.72.2
-revision=2
+version=2.74.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
-configure_args="-Dfam=false -Dman=true -Dselinux=disabled
+configure_args="-Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
-makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
+makedepends="zlib-devel pcre2-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
 checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
 short_desc="GNU library of C routines"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
+checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
@@ -26,8 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
-do_check() {
-	dbus-run-session ninja -C build test
+pre_check() {
+	# machine-id is a random, non-zero value
+	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
+}
+
+post_check() {
+	rm /etc/machine-id
 }
 
 libglib-devel_package() {

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] glib: update to 2.74.0.
  2022-09-18 12:04 [PR PATCH] glib: update to 2.74.0 paper42
                   ` (3 preceding siblings ...)
  2022-09-18 17:07 ` paper42
@ 2022-09-18 20:31 ` paper42
  2022-09-18 21:08 ` [PR PATCH] [Merged]: " paper42
  5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-09-18 20:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages glib-2.74
https://github.com/void-linux/void-packages/pull/39341

glib: update to 2.74.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39341.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.74-39341.patch --]
[-- Type: text/x-diff, Size: 6889 bytes --]

From 65e05a0f60d6e073b50367ef46978877fe4ff0ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 12 Sep 2022 20:58:10 +0200
Subject: [PATCH] glib: update to 2.74.0.

---
 .../glib/patches/disable-broken-tests.patch   | 31 ++++--------
 srcpkgs/glib/patches/test-error-musl.patch    | 50 +++++++++++++++++++
 srcpkgs/glib/template                         | 26 ++++++----
 3 files changed, 77 insertions(+), 30 deletions(-)
 create mode 100644 srcpkgs/glib/patches/test-error-musl.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 2a5263007503..91345d2b1d26 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -6,25 +6,17 @@
    },
 -  'converter-stream' : {},
    'credentials' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-@@ -91,7 +90,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -174,7 +172,6 @@ endif
+   'data-input-stream' : {},
+   'data-output-stream' : {},
+@@ -198,7 +197,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,
-@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+     'gdbus-peer-object-manager' : {},
+     'gdbus-sasl' : {},
+     'live-g-file' : {},
+@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
        test_resources_binary2,
      ]
    endif
@@ -39,9 +31,11 @@
  endif
  
  foreach test_name, extra_args : gio_tests
+diff --git a/glib/tests/meson.build b/glib/tests/meson.build
+index d74617823..1de81a825 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,25 +11,17 @@ glib_tests = {
+@@ -11,22 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -49,9 +43,6 @@
    'completion' : {},
    'cond' : {},
 -  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
@@ -68,9 +59,9 @@
      'suite' : ['slow'],
    },
 @@ -65,7 +57,6 @@ glib_tests = {
-   'mutex' : {},
    'node' : {},
    'once' : {},
+   'onceinit' : {},
 -  'option-context' : {},
    'option-argv0' : {},
    'overflow' : {},
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
new file mode 100644
index 000000000000..427df3de13c7
--- /dev/null
+++ b/srcpkgs/glib/patches/test-error-musl.patch
@@ -0,0 +1,50 @@
+From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 18 Sep 2022 17:30:41 +0200
+Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
+ glibc
+
+The musl implementation of vasprintf segfaults with NULL
+---
+ glib/tests/error.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/glib/tests/error.c b/glib/tests/error.c
+index 7ea04ea3ce..fa3a25969d 100644
+--- a/glib/tests/error.c
++++ b/glib/tests/error.c
+@@ -123,12 +123,12 @@ static void
+ test_new_valist_invalid_va (gpointer dummy,
+                          ...)
+ {
+-#ifdef __linux__
+-  /* Only worth testing this on Linux; if other platforms regress on this legacy
+-   * behaviour, we don’t care. In particular, calling g_error_new_valist() with
+-   * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
+-   * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
+-   * either case. */
++#if defined(__linux__) && defined(__GLIBC__)
++  /* Only worth testing this on Linux with glibc; if other platforms regress on
++   * this legacy behaviour, we don’t care. In particular, calling
++   * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
++   * implementation of vasprintf() is less forgiving than Linux’s. That’s
++   * fine: it’s a programmer error in either case. */
+   const struct
+     {
+       GQuark domain;
+@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
+ 
+       va_end (ap);
+     }
+-#else  /* if !__linux__ */
+-  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
+-#endif  /* !__linux__ */
++#else  /* if !__linux__ || !__GLIBC__ */
++  g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
++#endif /* !__linux__ || ! __GLIBC__ */
+ }
+ 
+ static void
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 8583a6616511..33c1d9e0cd7d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,23 +1,24 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.72.2
-revision=2
+version=2.74.0
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
-configure_args="-Dfam=false -Dman=true -Dselinux=disabled
+configure_args="-Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
-makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
+makedepends="zlib-devel pcre2-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
 checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
 short_desc="GNU library of C routines"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
+checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
@@ -26,8 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
-do_check() {
-	dbus-run-session ninja -C build test
+pre_check() {
+	# machine-id is a random, non-zero value
+	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
+}
+
+post_check() {
+	rm /etc/machine-id
 }
 
 libglib-devel_package() {

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Merged]: glib: update to 2.74.0.
  2022-09-18 12:04 [PR PATCH] glib: update to 2.74.0 paper42
                   ` (4 preceding siblings ...)
  2022-09-18 20:31 ` paper42
@ 2022-09-18 21:08 ` paper42
  5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-09-18 21:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

There's a merged pull request on the void-packages repository

glib: update to 2.74.0.
https://github.com/void-linux/void-packages/pull/39341

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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] 7+ messages in thread

end of thread, other threads:[~2022-09-18 21:08 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-18 12:04 [PR PATCH] glib: update to 2.74.0 paper42
2022-09-18 12:16 ` [PR PATCH] [Updated] " paper42
2022-09-18 13:04 ` paper42
2022-09-18 13:27 ` paper42
2022-09-18 17:07 ` paper42
2022-09-18 20:31 ` paper42
2022-09-18 21:08 ` [PR PATCH] [Merged]: " paper42

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).