* [PR PATCH] glib: update to 2.82.0.
@ 2024-09-15 10:37 oreo639
2024-09-15 11:46 ` [PR PATCH] [Updated] " oreo639
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: oreo639 @ 2024-09-15 10:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 9579 bytes --]
From d1aa158f524bf17551dc260729e0bc581d0fa020 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..a10c5a650c7d0d 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -22,7 +22,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
From a753f02700600842943c9deedb8fa4fa5b89d328 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..764dc643f4a4ae 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
+version=1.82.0
revision=2
build_style=meson
configure_args="-Dbuild_introspection_data=false"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
From 764f7590ded54c3226371e9ed232265efb82bb5a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..a6f15373f5077b 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper=qemu
@@ -20,7 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
From d73d20072250eea45dfa57af2496325e625c8497 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 4 +-
2 files changed, 2 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..8ad00acb09fa8e 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,7 +1,7 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
+version=1.82.0
revision=2
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
@ 2024-09-15 11:46 ` oreo639
2024-09-15 12:00 ` oreo639
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-15 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 10432 bytes --]
From d1aa158f524bf17551dc260729e0bc581d0fa020 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..a10c5a650c7d0d 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -22,7 +22,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
From b087743d779d3ea8a6cb2d9ed8511ffde60c14dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..5ef0897b775c2a 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -59,7 +59,7 @@ post_install() {
for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
scanner/regress.? scanner/utility.? scanner/warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From 84035e8e788f20e9225d08487916140ba85ff053 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..a6f15373f5077b 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper=qemu
@@ -20,7 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
From 5579fb7b423e094106c97ce881c9469b677e9709 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 8 +-
2 files changed, 4 insertions(+), 105 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..54994003c92704 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -52,7 +52,7 @@ post_install() {
for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
scanner/regress.? scanner/utility.? scanner/warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
2024-09-15 11:46 ` [PR PATCH] [Updated] " oreo639
@ 2024-09-15 12:00 ` oreo639
2024-09-15 12:11 ` oreo639
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-15 12:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 10876 bytes --]
From d1aa158f524bf17551dc260729e0bc581d0fa020 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..a10c5a650c7d0d 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -22,7 +22,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
From 60ddb91e9c9bec4679214a50e26661f489d1b717 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..bdd957a6bbdb1d 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -56,10 +56,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From cc3cbf4b3ff147e9ed53244b901af91a61a1df23 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..a6f15373f5077b 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper=qemu
@@ -20,7 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
From e29981dbefaa81c5a484842ab76d2cc78562ce6d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..96d1c4ba97c422 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -49,10 +49,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
2024-09-15 11:46 ` [PR PATCH] [Updated] " oreo639
2024-09-15 12:00 ` oreo639
@ 2024-09-15 12:11 ` oreo639
2024-09-17 1:57 ` [PR PATCH] [Updated] " oreo639
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-15 12:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/52228#issuecomment-2351565903
Comment:
utils-isolated test works locally, I will look into it more later.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (2 preceding siblings ...)
2024-09-15 12:11 ` oreo639
@ 2024-09-17 1:57 ` oreo639
2024-09-17 2:07 ` oreo639
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-17 1:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 10986 bytes --]
From 1aaae6ad75796a8179de110e310fd060b8eb0338 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..976227e417a89d 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -22,7 +22,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
@@ -43,4 +43,5 @@ pre_check() {
post_check() {
rm /etc/machine-id
+ cat build/meson-logs/testlog.txt
}
From b905515ebe2cab2c80c7d78b0afe9e9b42895314 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..bdd957a6bbdb1d 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -56,10 +56,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From fb55033d8dc80fae308b37af45268accd77c0c7e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..a6f15373f5077b 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper=qemu
@@ -20,7 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
From f4a432a6e744f456391d4959847a2b6c2938a57c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..96d1c4ba97c422 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -49,10 +49,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (3 preceding siblings ...)
2024-09-17 1:57 ` [PR PATCH] [Updated] " oreo639
@ 2024-09-17 2:07 ` oreo639
2024-09-17 2:15 ` oreo639
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-17 2:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 11309 bytes --]
From 963e0280d552b3f7036e63080ad021118f703d63 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..15859f59263490 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -22,7 +22,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
@@ -34,6 +34,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ vsed -e '/test_cleanup_doesnt_follow_symlinks)/d' -i glib/tests/utils-isolated.c
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
@@ -43,4 +45,5 @@ pre_check() {
post_check() {
rm /etc/machine-id
+ cat build/meson-logs/testlog.txt
}
From ca128c6bc864e7ec279094acfb6eb52fa9c9303a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..bdd957a6bbdb1d 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -56,10 +56,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From b99919f34608f4b0ec9b363c6d352c5519d3af42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..a6f15373f5077b 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper=qemu
@@ -20,7 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
From b60a7f222170bef9c00b15a08879ed20156a843e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..96d1c4ba97c422 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -49,10 +49,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (4 preceding siblings ...)
2024-09-17 2:07 ` oreo639
@ 2024-09-17 2:15 ` oreo639
2024-09-17 2:22 ` oreo639
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-17 2:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 11123 bytes --]
From 84b0b7f5245baafc9dd1bf4a91dac577ebdfaccc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..ba8474db1dc779 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -22,7 +22,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
@@ -34,6 +34,7 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ vsed -e '/test_cleanup_doesnt_follow_symlinks)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
From 487a3c273a367ce173511b05a9a593c57c1f3e90 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..bdd957a6bbdb1d 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -56,10 +56,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From c8d41be77dc7beed95b56e79501b2982bc102b59 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..a6f15373f5077b 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper=qemu
@@ -20,7 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
From 822385acc7d835b32f1a1211df72bb2b193a8635 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..96d1c4ba97c422 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -49,10 +49,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (5 preceding siblings ...)
2024-09-17 2:15 ` oreo639
@ 2024-09-17 2:22 ` oreo639
2024-09-17 2:28 ` oreo639
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-17 2:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 11115 bytes --]
From 36b80b4aae60f5d266bd7bce67763d3240e5e6e9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..3dec632af7ef74 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -22,7 +22,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
@@ -34,6 +34,7 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
From 3774f83bf178fe83759e725c4809e0270f8ec4bd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..bdd957a6bbdb1d 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -56,10 +56,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From 229231f91ee79aedd00f3bc910833f0af9e2fd58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..a6f15373f5077b 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper=qemu
@@ -20,7 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
From 4e842175fdd35bff52b501693b430e58afce991b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..96d1c4ba97c422 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -49,10 +49,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (6 preceding siblings ...)
2024-09-17 2:22 ` oreo639
@ 2024-09-17 2:28 ` oreo639
2024-09-17 2:29 ` oreo639
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-17 2:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 10681 bytes --]
From f33a8a37d2a39e281c50ba8fa2609dcc6d760762 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..a801199fb078be 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -22,7 +22,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
@@ -34,6 +34,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
From 7bd0a79faacb742b212af98e461ee92e0ce2635f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..bdd957a6bbdb1d 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -56,10 +56,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From 89b4400259a9950b6bf37c12570efe5bc6b9d07a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..d6827f9e93efda 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -38,6 +38,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
post_install() {
From 7d4ee7fa52aab8755e658ce47a72d66654854511 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..96d1c4ba97c422 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -49,10 +49,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (7 preceding siblings ...)
2024-09-17 2:28 ` oreo639
@ 2024-09-17 2:29 ` oreo639
2024-09-17 2:31 ` oreo639
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-17 2:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 11401 bytes --]
From f33a8a37d2a39e281c50ba8fa2609dcc6d760762 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..a801199fb078be 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -22,7 +22,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
@@ -34,6 +34,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
From 7bd0a79faacb742b212af98e461ee92e0ce2635f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..bdd957a6bbdb1d 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -56,10 +56,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From 531899411971e585836dc1ab47ff53719198d4f8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..54a9c400e3a72c 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper=qemu
@@ -20,7 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
@@ -38,6 +38,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
post_install() {
From ed60a9c0bdbb63ede3c9e51454608b18e10d85d2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..96d1c4ba97c422 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -49,10 +49,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (8 preceding siblings ...)
2024-09-17 2:29 ` oreo639
@ 2024-09-17 2:31 ` oreo639
2024-09-17 2:35 ` [PR PATCH] [Updated] " oreo639
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-17 2:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/52228#issuecomment-2354383335
Comment:
Here is the offending test: https://gitlab.gnome.org/GNOME/glib/-/blob/2.82.0/glib/tests/utils-isolated.c#L99-132
Works locally, fails in CI.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (9 preceding siblings ...)
2024-09-17 2:31 ` oreo639
@ 2024-09-17 2:35 ` oreo639
2024-09-29 0:43 ` oreo639
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-17 2:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 11775 bytes --]
From e186af64954e33e6431eaa68c6bae30f6ec7424d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..b8af4d87a9600c 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -19,10 +19,10 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
repository=bootstrap
@@ -34,6 +34,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
From 0513702b7f6bc97e1b47119c19c5ee2801f7ec02 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 1ac8bd90001ae3..bdd957a6bbdb1d 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
configure_args="-Dbuild_introspection_data=false"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -19,7 +19,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -56,10 +56,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From dffae019a9773b27c41ea71ca9455c03fd41b16a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 548dc0f3d17557..769d9a4702c727 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper=qemu
@@ -17,10 +17,10 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
@@ -38,6 +38,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
post_install() {
From bb990683100f2d1633e12e83f0a2b7d93089d77c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 4a8810a95238fa..96d1c4ba97c422 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
hostmakedepends="flex pkg-config"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -49,10 +49,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (10 preceding siblings ...)
2024-09-17 2:35 ` [PR PATCH] [Updated] " oreo639
@ 2024-09-29 0:43 ` oreo639
2024-09-29 1:00 ` oreo639
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-29 0:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 11800 bytes --]
From e78046c24caa59a5a728385a58eaf16416e83242 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..76340f75c3f2c5 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -19,11 +19,12 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
+make_check_args="--verbose"
repository=bootstrap
conflicts="glib libglib-devel glib-devel"
@@ -34,6 +35,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ #vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
From e6b8a7a2c6602ec402b1e9c3e8518f72cc53e938 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 86801942e3af72..5920810d93b1cc 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
@@ -20,7 +20,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -57,10 +57,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From b1354c1033765d8d16036d92a9defee807a654f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index bbcf1e94915281..d0497b3c8eed2d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper="qemu"
@@ -17,10 +17,10 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
@@ -38,6 +38,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
post_install() {
From 55e94c7b13501846ddd4db52dd7abc1c2c2f8814 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index d39c7710cd4e69..ee2d0b59978584 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -50,10 +50,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (11 preceding siblings ...)
2024-09-29 0:43 ` oreo639
@ 2024-09-29 1:00 ` oreo639
2024-09-29 1:07 ` oreo639
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-29 1:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 11968 bytes --]
From 40d243fed28aedb292b31f84f310dda089a248fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..4e81083c72cc08 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -19,11 +19,12 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
+make_check_args="--verbose"
repository=bootstrap
conflicts="glib libglib-devel glib-devel"
@@ -34,11 +35,14 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ #vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
+ export XDG_RUNTIME_DIR=/tmp/glib-test
}
post_check() {
From 240c3f9fd0681d6cd3034e97c0d3cb6c94205e2d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 86801942e3af72..5920810d93b1cc 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
@@ -20,7 +20,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -57,10 +57,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From 0bbde262c43532f3708199f23d1a1e15da52441d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index bbcf1e94915281..d0497b3c8eed2d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper="qemu"
@@ -17,10 +17,10 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
@@ -38,6 +38,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
post_install() {
From 280739888baadb59051b708584b7dcc155730607 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index d39c7710cd4e69..ee2d0b59978584 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -50,10 +50,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (12 preceding siblings ...)
2024-09-29 1:00 ` oreo639
@ 2024-09-29 1:07 ` oreo639
2024-09-29 2:31 ` oreo639
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-29 1:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 12021 bytes --]
From d8dd8fe953a76e93fc4132354dccff62f488e057 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..9d504d15620ff1 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -19,11 +19,12 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
+make_check_args="--verbose"
repository=bootstrap
conflicts="glib libglib-devel glib-devel"
@@ -34,11 +35,16 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ #vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
+ mkdir /tmp/glib-test
+ touch /tmp/glib-test/file
+ export XDG_RUNTIME_DIR=/tmp/glib-test
}
post_check() {
From 479c5166ab07f389ebffbc8eb6d9bce3672e463d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 86801942e3af72..5920810d93b1cc 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
@@ -20,7 +20,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -57,10 +57,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From 37e1a9da68196f6071fe90d2953f5527cc0a2834 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index bbcf1e94915281..d0497b3c8eed2d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper="qemu"
@@ -17,10 +17,10 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
@@ -38,6 +38,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
post_install() {
From ff9d7f22f4ad36122d9f11abeaf9dd54860fe9de Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index d39c7710cd4e69..ee2d0b59978584 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -50,10 +50,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (13 preceding siblings ...)
2024-09-29 1:07 ` oreo639
@ 2024-09-29 2:31 ` oreo639
2024-09-29 3:26 ` oreo639
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-29 2:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 11949 bytes --]
From 94756f8013e654490cd37eb17a24796bed8d99e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..6b6f31a9a9dbcc 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -19,11 +19,12 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
+make_check_args="--verbose"
repository=bootstrap
conflicts="glib libglib-devel glib-devel"
@@ -34,11 +35,14 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ #vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
+ export HOME="$PWD"
}
post_check() {
From 31a075824f72e39fc9290592c6691d99dc9ca358 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 86801942e3af72..5920810d93b1cc 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
@@ -20,7 +20,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -57,10 +57,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From acc8c09f67da1b1e7140789eb8d1763f5ad75df5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index bbcf1e94915281..d0497b3c8eed2d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper="qemu"
@@ -17,10 +17,10 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
@@ -38,6 +38,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
post_install() {
From 28fe822864f15c4544a455d0cbaed35daa1f1235 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index d39c7710cd4e69..ee2d0b59978584 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -50,10 +50,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (14 preceding siblings ...)
2024-09-29 2:31 ` oreo639
@ 2024-09-29 3:26 ` oreo639
2024-09-29 3:41 ` oreo639
2024-09-29 12:01 ` [PR PATCH] [Merged]: " oreo639
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-29 3:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 12135 bytes --]
From 2b2f7eddf043c2429f1133a3eafc3e38525a8b1a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.0.
---
srcpkgs/glib-bootstrap/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..ba508dc06bbf14 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -19,11 +19,12 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
make_check_pre="dbus-run-session"
+make_check_args="--verbose"
repository=bootstrap
conflicts="glib libglib-devel glib-devel"
@@ -34,11 +35,15 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ #vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
+ vsed -e 's/g_assert_no_errno (g_chmod (runtime_dir, 0755));/g_printerr(\"Dir: %s\\n\", runtime_dir);g_assert_no_errno (g_chmod (runtime_dir, 0755));/g' -i glib/tests/utils-isolated.c
}
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
+ export HOME="$PWD"
}
post_check() {
From e28fb05a3b8586216b6090108ce086f3a1fae78d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 86801942e3af72..5920810d93b1cc 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
@@ -20,7 +20,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -57,10 +57,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From fba99b6f279e023ee5f203d5b71021be4f9ccd4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.0.
---
srcpkgs/glib/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index bbcf1e94915281..d0497b3c8eed2d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.0
revision=1
build_style=meson
build_helper="qemu"
@@ -17,10 +17,10 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
@@ -38,6 +38,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
post_install() {
From efb096f14568fc1bc78bf2f60ee8555c34666c24 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index d39c7710cd4e69..ee2d0b59978584 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -50,10 +50,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (15 preceding siblings ...)
2024-09-29 3:26 ` oreo639
@ 2024-09-29 3:41 ` oreo639
2024-09-29 12:01 ` [PR PATCH] [Merged]: " oreo639
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-29 3:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glib
https://github.com/void-linux/void-packages/pull/52228
glib: update to 2.82.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/52228.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-52228.patch --]
[-- Type: text/x-diff, Size: 11726 bytes --]
From 4308961dc595b678f42c7ffe207d3048f28b5e10 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:12 -0700
Subject: [PATCH 1/4] glib-bootstrap: update to 2.82.1.
---
srcpkgs/glib-bootstrap/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template
index 62db4db27924f2..021dfb24a2fd5d 100644
--- a/srcpkgs/glib-bootstrap/template
+++ b/srcpkgs/glib-bootstrap/template
@@ -4,7 +4,7 @@
# This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=glib-bootstrap
-version=2.80.3
+version=2.82.1
revision=1
build_style=meson
# static version is necessary for qemu-user
@@ -19,10 +19,10 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=478634440bf52ee4ec4428d558787398c0be6b043c521beb308334b3db4489a6
make_check_pre="dbus-run-session"
repository=bootstrap
@@ -34,6 +34,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
pre_check() {
From fade0c1250a5dbcd8487b74c2c66677142d30334 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:34:43 -0700
Subject: [PATCH 2/4] gobject-introspection-bootstrap: update to 1.82.0.
---
srcpkgs/gobject-introspection-bootstrap/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template
index 86801942e3af72..5920810d93b1cc 100644
--- a/srcpkgs/gobject-introspection-bootstrap/template
+++ b/srcpkgs/gobject-introspection-bootstrap/template
@@ -4,8 +4,8 @@
# This aloing with glib-bootstrap is unfortunately necessary as a part of the
# libgirepository-1.0 to libgirepository-2.0 migration.
pkgname=gobject-introspection-bootstrap
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
configure_args="-Dbuild_introspection_data=false"
@@ -20,7 +20,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
repository=bootstrap
@@ -57,10 +57,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
From 30c59a73b765e02a96db0dd9899dd35b33ad9735 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:05 -0700
Subject: [PATCH 3/4] glib: update to 2.82.1.
---
srcpkgs/glib/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index bbcf1e94915281..26071b0ef66164 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
# keep in sync with glib-bootstrap
pkgname=glib
-version=2.80.3
+version=2.82.1
revision=1
build_style=meson
build_helper="qemu"
@@ -17,10 +17,10 @@ short_desc="GNU library of C routines"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-80/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+checksum=478634440bf52ee4ec4428d558787398c0be6b043c521beb308334b3db4489a6
conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib
make_check_pre="dbus-run-session"
@@ -38,6 +38,8 @@ post_patch() {
if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
fi
+ # Test fails in CI
+ vsed -e '/test_cleanup_handles_errors)/d' -i glib/tests/utils-isolated.c
}
post_install() {
From a4850ab6351ac167a8f74343be3f5958dbdae936 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 15 Sep 2024 03:35:40 -0700
Subject: [PATCH 4/4] gobject-introspection: update to 1.82.0.
---
...rscanner-avoid-distutil-msvccompiler.patch | 101 ------------------
srcpkgs/gobject-introspection/template | 11 +-
2 files changed, 5 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
diff --git a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch b/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
deleted file mode 100644
index 498c8e0e69ac59..00000000000000
--- a/srcpkgs/gobject-introspection/patches/1000-girscanner-avoid-distutil-msvccompiler.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From fcf79ca8d068d2e30a6aefdc42dcc6aeab4655e2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 28 Aug 2024 21:26:02 +0200
-Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
-
-It was removed with setuptools 74.0.0. Since we still depend on the
-MSVCCompiler class use new_compiler() to get it some other way.
-
-Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
-which we no longer support anyway.
-
-Fixes #515
----
- giscanner/ccompiler.py | 7 +++----
- giscanner/msvccompiler.py | 14 +++++++-------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c..9a732cd5e 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
- # Now, create the distutils ccompiler instance based on the info we have.
- if compiler_name == 'msvc':
- # For MSVC, we need to create a instance of a subclass of distutil's
-- # MSVC9Compiler class, as it does not provide a preprocess()
-+ # MSVCCompiler class, as it does not provide a preprocess()
- # implementation
- from . import msvccompiler
- self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
- return self.compiler.linker_exe
-
- def check_is_msvc(self):
-- return isinstance(self.compiler, MSVCCompiler)
-+ return self.compiler.compiler_type == "msvc"
-
- # Private APIs
- def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
- # macros for compiling using distutils
- # get dropped for MSVC builds, so
- # escape the escape character.
-- if isinstance(self.compiler, MSVCCompiler):
-+ if self.check_is_msvc():
- macro_value = macro_value.replace('\"', '\\\"')
- macros.append((macro_name, macro_value))
- elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a5439820..e333a80f5 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
- return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
- def __init__(self, verbose=0, dry_run=0, force=0):
-- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+ super(DistutilsMSVCCompiler, self).__init__()
- CCompiler.__init__(self, verbose, dry_run, force)
- self.__paths = []
- self.__arch = None # deprecated name
-- if os.name == 'nt':
-- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
-- self.__version = distutils.msvc9compiler.VERSION
- self.initialized = False
- self.preprocess_options = None
- if self.check_is_clang_cl():
---
-GitLab
-
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index d39c7710cd4e69..ee2d0b59978584 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,8 +1,8 @@
# Template file for 'gobject-introspection'
# keep in sync with gobject-introspection-bootstrap
pkgname=gobject-introspection
-version=1.80.1
-revision=2
+version=1.82.0
+revision=1
build_style=meson
build_helper="qemu"
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
-checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
+checksum=0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -50,10 +50,9 @@ post_install() {
# For cross builds copy the not installed tests subdirectory
if [ "$CROSS_BUILD" ]; then
vmkdir usr/share/gobject-introspection-1.0/tests
- for f in scanner/annotation.? scanner/drawable.? scanner/foo.? \
- scanner/regress.? scanner/utility.? scanner/warnlib.? \
+ for f in annotation.? drawable.? foo.? regress.? utility.? warnlib.? \
gimarshallingtests.? gitestmacros.h; do
- vcopy tests/$f usr/share/gobject-introspection-1.0/tests
+ vcopy gobject-introspection-tests/$f usr/share/gobject-introspection-1.0/tests
done
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Merged]: glib: update to 2.82.0.
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
` (16 preceding siblings ...)
2024-09-29 3:41 ` oreo639
@ 2024-09-29 12:01 ` oreo639
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-09-29 12:01 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.82.0.
https://github.com/void-linux/void-packages/pull/52228
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] 19+ messages in thread
end of thread, other threads:[~2024-09-29 12:01 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-15 10:37 [PR PATCH] glib: update to 2.82.0 oreo639
2024-09-15 11:46 ` [PR PATCH] [Updated] " oreo639
2024-09-15 12:00 ` oreo639
2024-09-15 12:11 ` oreo639
2024-09-17 1:57 ` [PR PATCH] [Updated] " oreo639
2024-09-17 2:07 ` oreo639
2024-09-17 2:15 ` oreo639
2024-09-17 2:22 ` oreo639
2024-09-17 2:28 ` oreo639
2024-09-17 2:29 ` oreo639
2024-09-17 2:31 ` oreo639
2024-09-17 2:35 ` [PR PATCH] [Updated] " oreo639
2024-09-29 0:43 ` oreo639
2024-09-29 1:00 ` oreo639
2024-09-29 1:07 ` oreo639
2024-09-29 2:31 ` oreo639
2024-09-29 3:26 ` oreo639
2024-09-29 3:41 ` oreo639
2024-09-29 12:01 ` [PR PATCH] [Merged]: " oreo639
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).