Github messages for voidlinux
 help / color / mirror / Atom feed
* [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
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).