diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 14032e4bfe..fd30be288b 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 -PKG_VERSION:=2.80.3 +PKG_VERSION:=2.82.0 PKG_RELEASE:=1 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION)) -PKG_HASH:=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417 +PKG_HASH:=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3 PKG_MAINTAINER:=Peter Wagner PKG_LICENSE:=LGPL-2.1-or-later @@ -68,8 +68,8 @@ COMP_ARGS+=-Dintrospection=disabled # set runtime dir to /var/run COMP_ARGS+=-Druntime_dir=/var/run -MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled -MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Ddefault_library=both -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled +MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Dnls=disabled +MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled define Build/InstallDev $(INSTALL_DIR) $(1)/usr/bin diff --git a/libs/glib2/patches/006-c99.patch b/libs/glib2/patches/006-c99.patch index 9cfcc33086..98c17db0f2 100644 --- a/libs/glib2/patches/006-c99.patch +++ b/libs/glib2/patches/006-c99.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -1160,7 +1160,7 @@ if host_system == 'windows' and (cc.get_ +@@ -1189,7 +1189,7 @@ if host_system == 'windows' and (cc.get_ glib_conf.set('HAVE_C99_SNPRINTF', false) glib_conf.set('HAVE_C99_VSNPRINTF', false) glib_conf.set('HAVE_UNIX98_PRINTF', false) diff --git a/libs/glib2/patches/021-Remove-packaging-module-dependency.patch b/libs/glib2/patches/021-Remove-packaging-module-dependency.patch deleted file mode 100644 index 914798098e..0000000000 --- a/libs/glib2/patches/021-Remove-packaging-module-dependency.patch +++ /dev/null @@ -1,691 +0,0 @@ -From 24d85ff767c43235d9a9bc90f66203b5a0791479 Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Sun, 30 Jun 2024 21:54:14 +0200 -Subject: [PATCH] Remove packaging module dependency - -codegen requires only Version class functionality. Hence, it is -sufficient to include version.py and _structures.py files from -the packaging module. - -Signed-off-by: Yegor Yefremov ---- - gio/gdbus-2.0/codegen/_structures.py | 61 +++ - gio/gdbus-2.0/codegen/meson.build | 2 + - gio/gdbus-2.0/codegen/utils.py | 4 +- - gio/gdbus-2.0/codegen/version.py | 563 +++++++++++++++++++++++++++ - meson.build | 2 +- - 5 files changed, 629 insertions(+), 3 deletions(-) - create mode 100644 gio/gdbus-2.0/codegen/_structures.py - create mode 100644 gio/gdbus-2.0/codegen/version.py - ---- /dev/null -+++ b/gio/gdbus-2.0/codegen/_structures.py -@@ -0,0 +1,61 @@ -+# This file is dual licensed under the terms of the Apache License, Version -+# 2.0, and the BSD License. See the LICENSE file in the root of this repository -+# for complete details. -+ -+ -+class InfinityType: -+ def __repr__(self) -> str: -+ return "Infinity" -+ -+ def __hash__(self) -> int: -+ return hash(repr(self)) -+ -+ def __lt__(self, other: object) -> bool: -+ return False -+ -+ def __le__(self, other: object) -> bool: -+ return False -+ -+ def __eq__(self, other: object) -> bool: -+ return isinstance(other, self.__class__) -+ -+ def __gt__(self, other: object) -> bool: -+ return True -+ -+ def __ge__(self, other: object) -> bool: -+ return True -+ -+ def __neg__(self: object) -> "NegativeInfinityType": -+ return NegativeInfinity -+ -+ -+Infinity = InfinityType() -+ -+ -+class NegativeInfinityType: -+ def __repr__(self) -> str: -+ return "-Infinity" -+ -+ def __hash__(self) -> int: -+ return hash(repr(self)) -+ -+ def __lt__(self, other: object) -> bool: -+ return True -+ -+ def __le__(self, other: object) -> bool: -+ return True -+ -+ def __eq__(self, other: object) -> bool: -+ return isinstance(other, self.__class__) -+ -+ def __gt__(self, other: object) -> bool: -+ return False -+ -+ def __ge__(self, other: object) -> bool: -+ return False -+ -+ def __neg__(self: object) -> InfinityType: -+ return Infinity -+ -+ -+NegativeInfinity = NegativeInfinityType() ---- a/gio/gdbus-2.0/codegen/meson.build -+++ b/gio/gdbus-2.0/codegen/meson.build -@@ -8,6 +8,8 @@ gdbus_codegen_files = [ - 'dbustypes.py', - 'parser.py', - 'utils.py', -+ 'version.py', -+ '_structures.py', - ] - - gdbus_codegen_conf = configuration_data() ---- a/gio/gdbus-2.0/codegen/utils.py -+++ b/gio/gdbus-2.0/codegen/utils.py -@@ -19,9 +19,9 @@ - # - # Author: David Zeuthen - --import packaging.version - import os - import sys -+from .version import Version - - - # pylint: disable=too-few-public-methods -@@ -166,4 +166,4 @@ def version_cmp_key(key): - v = str(key[0]) - else: - v = "0" -- return (packaging.version.Version(v), key[1]) -+ return (Version(v), key[1]) ---- /dev/null -+++ b/gio/gdbus-2.0/codegen/version.py -@@ -0,0 +1,563 @@ -+# This file is dual licensed under the terms of the Apache License, Version -+# 2.0, and the BSD License. See the LICENSE file in the root of this repository -+# for complete details. -+""" -+.. testsetup:: -+ -+ from packaging.version import parse, Version -+""" -+ -+from __future__ import annotations -+ -+import itertools -+import re -+from typing import Any, Callable, NamedTuple, SupportsInt, Tuple, Union -+ -+from ._structures import Infinity, InfinityType, NegativeInfinity, NegativeInfinityType -+ -+__all__ = ["VERSION_PATTERN", "parse", "Version", "InvalidVersion"] -+ -+LocalType = Tuple[Union[int, str], ...] -+ -+CmpPrePostDevType = Union[InfinityType, NegativeInfinityType, Tuple[str, int]] -+CmpLocalType = Union[ -+ NegativeInfinityType, -+ Tuple[Union[Tuple[int, str], Tuple[NegativeInfinityType, Union[int, str]]], ...], -+] -+CmpKey = Tuple[ -+ int, -+ Tuple[int, ...], -+ CmpPrePostDevType, -+ CmpPrePostDevType, -+ CmpPrePostDevType, -+ CmpLocalType, -+] -+VersionComparisonMethod = Callable[[CmpKey, CmpKey], bool] -+ -+ -+class _Version(NamedTuple): -+ epoch: int -+ release: tuple[int, ...] -+ dev: tuple[str, int] | None -+ pre: tuple[str, int] | None -+ post: tuple[str, int] | None -+ local: LocalType | None -+ -+ -+def parse(version: str) -> Version: -+ """Parse the given version string. -+ -+ >>> parse('1.0.dev1') -+ -+ -+ :param version: The version string to parse. -+ :raises InvalidVersion: When the version string is not a valid version. -+ """ -+ return Version(version) -+ -+ -+class InvalidVersion(ValueError): -+ """Raised when a version string is not a valid version. -+ -+ >>> Version("invalid") -+ Traceback (most recent call last): -+ ... -+ packaging.version.InvalidVersion: Invalid version: 'invalid' -+ """ -+ -+ -+class _BaseVersion: -+ _key: tuple[Any, ...] -+ -+ def __hash__(self) -> int: -+ return hash(self._key) -+ -+ # Please keep the duplicated `isinstance` check -+ # in the six comparisons hereunder -+ # unless you find a way to avoid adding overhead function calls. -+ def __lt__(self, other: _BaseVersion) -> bool: -+ if not isinstance(other, _BaseVersion): -+ return NotImplemented -+ -+ return self._key < other._key -+ -+ def __le__(self, other: _BaseVersion) -> bool: -+ if not isinstance(other, _BaseVersion): -+ return NotImplemented -+ -+ return self._key <= other._key -+ -+ def __eq__(self, other: object) -> bool: -+ if not isinstance(other, _BaseVersion): -+ return NotImplemented -+ -+ return self._key == other._key -+ -+ def __ge__(self, other: _BaseVersion) -> bool: -+ if not isinstance(other, _BaseVersion): -+ return NotImplemented -+ -+ return self._key >= other._key -+ -+ def __gt__(self, other: _BaseVersion) -> bool: -+ if not isinstance(other, _BaseVersion): -+ return NotImplemented -+ -+ return self._key > other._key -+ -+ def __ne__(self, other: object) -> bool: -+ if not isinstance(other, _BaseVersion): -+ return NotImplemented -+ -+ return self._key != other._key -+ -+ -+# Deliberately not anchored to the start and end of the string, to make it -+# easier for 3rd party code to reuse -+_VERSION_PATTERN = r""" -+ v? -+ (?: -+ (?:(?P[0-9]+)!)? # epoch -+ (?P[0-9]+(?:\.[0-9]+)*) # release segment -+ (?P
                                          # pre-release
-+            [-_\.]?
-+            (?Palpha|a|beta|b|preview|pre|c|rc)
-+            [-_\.]?
-+            (?P[0-9]+)?
-+        )?
-+        (?P                                         # post release
-+            (?:-(?P[0-9]+))
-+            |
-+            (?:
-+                [-_\.]?
-+                (?Ppost|rev|r)
-+                [-_\.]?
-+                (?P[0-9]+)?
-+            )
-+        )?
-+        (?P                                          # dev release
-+            [-_\.]?
-+            (?Pdev)
-+            [-_\.]?
-+            (?P[0-9]+)?
-+        )?
-+    )
-+    (?:\+(?P[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
-+"""
-+
-+VERSION_PATTERN = _VERSION_PATTERN
-+"""
-+A string containing the regular expression used to match a valid version.
-+
-+The pattern is not anchored at either end, and is intended for embedding in larger
-+expressions (for example, matching a version number as part of a file name). The
-+regular expression should be compiled with the ``re.VERBOSE`` and ``re.IGNORECASE``
-+flags set.
-+
-+:meta hide-value:
-+"""
-+
-+
-+class Version(_BaseVersion):
-+    """This class abstracts handling of a project's versions.
-+
-+    A :class:`Version` instance is comparison aware and can be compared and
-+    sorted using the standard Python interfaces.
-+
-+    >>> v1 = Version("1.0a5")
-+    >>> v2 = Version("1.0")
-+    >>> v1
-+    
-+    >>> v2
-+    
-+    >>> v1 < v2
-+    True
-+    >>> v1 == v2
-+    False
-+    >>> v1 > v2
-+    False
-+    >>> v1 >= v2
-+    False
-+    >>> v1 <= v2
-+    True
-+    """
-+
-+    _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
-+    _key: CmpKey
-+
-+    def __init__(self, version: str) -> None:
-+        """Initialize a Version object.
-+
-+        :param version:
-+            The string representation of a version which will be parsed and normalized
-+            before use.
-+        :raises InvalidVersion:
-+            If the ``version`` does not conform to PEP 440 in any way then this
-+            exception will be raised.
-+        """
-+
-+        # Validate the version and parse it into pieces
-+        match = self._regex.search(version)
-+        if not match:
-+            raise InvalidVersion(f"Invalid version: '{version}'")
-+
-+        # Store the parsed out pieces of the version
-+        self._version = _Version(
-+            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
-+            release=tuple(int(i) for i in match.group("release").split(".")),
-+            pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
-+            post=_parse_letter_version(
-+                match.group("post_l"), match.group("post_n1") or match.group("post_n2")
-+            ),
-+            dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
-+            local=_parse_local_version(match.group("local")),
-+        )
-+
-+        # Generate a key which will be used for sorting
-+        self._key = _cmpkey(
-+            self._version.epoch,
-+            self._version.release,
-+            self._version.pre,
-+            self._version.post,
-+            self._version.dev,
-+            self._version.local,
-+        )
-+
-+    def __repr__(self) -> str:
-+        """A representation of the Version that shows all internal state.
-+
-+        >>> Version('1.0.0')
-+        
-+        """
-+        return f""
-+
-+    def __str__(self) -> str:
-+        """A string representation of the version that can be rounded-tripped.
-+
-+        >>> str(Version("1.0a5"))
-+        '1.0a5'
-+        """
-+        parts = []
-+
-+        # Epoch
-+        if self.epoch != 0:
-+            parts.append(f"{self.epoch}!")
-+
-+        # Release segment
-+        parts.append(".".join(str(x) for x in self.release))
-+
-+        # Pre-release
-+        if self.pre is not None:
-+            parts.append("".join(str(x) for x in self.pre))
-+
-+        # Post-release
-+        if self.post is not None:
-+            parts.append(f".post{self.post}")
-+
-+        # Development release
-+        if self.dev is not None:
-+            parts.append(f".dev{self.dev}")
-+
-+        # Local version segment
-+        if self.local is not None:
-+            parts.append(f"+{self.local}")
-+
-+        return "".join(parts)
-+
-+    @property
-+    def epoch(self) -> int:
-+        """The epoch of the version.
-+
-+        >>> Version("2.0.0").epoch
-+        0
-+        >>> Version("1!2.0.0").epoch
-+        1
-+        """
-+        return self._version.epoch
-+
-+    @property
-+    def release(self) -> tuple[int, ...]:
-+        """The components of the "release" segment of the version.
-+
-+        >>> Version("1.2.3").release
-+        (1, 2, 3)
-+        >>> Version("2.0.0").release
-+        (2, 0, 0)
-+        >>> Version("1!2.0.0.post0").release
-+        (2, 0, 0)
-+
-+        Includes trailing zeroes but not the epoch or any pre-release / development /
-+        post-release suffixes.
-+        """
-+        return self._version.release
-+
-+    @property
-+    def pre(self) -> tuple[str, int] | None:
-+        """The pre-release segment of the version.
-+
-+        >>> print(Version("1.2.3").pre)
-+        None
-+        >>> Version("1.2.3a1").pre
-+        ('a', 1)
-+        >>> Version("1.2.3b1").pre
-+        ('b', 1)
-+        >>> Version("1.2.3rc1").pre
-+        ('rc', 1)
-+        """
-+        return self._version.pre
-+
-+    @property
-+    def post(self) -> int | None:
-+        """The post-release number of the version.
-+
-+        >>> print(Version("1.2.3").post)
-+        None
-+        >>> Version("1.2.3.post1").post
-+        1
-+        """
-+        return self._version.post[1] if self._version.post else None
-+
-+    @property
-+    def dev(self) -> int | None:
-+        """The development number of the version.
-+
-+        >>> print(Version("1.2.3").dev)
-+        None
-+        >>> Version("1.2.3.dev1").dev
-+        1
-+        """
-+        return self._version.dev[1] if self._version.dev else None
-+
-+    @property
-+    def local(self) -> str | None:
-+        """The local version segment of the version.
-+
-+        >>> print(Version("1.2.3").local)
-+        None
-+        >>> Version("1.2.3+abc").local
-+        'abc'
-+        """
-+        if self._version.local:
-+            return ".".join(str(x) for x in self._version.local)
-+        else:
-+            return None
-+
-+    @property
-+    def public(self) -> str:
-+        """The public portion of the version.
-+
-+        >>> Version("1.2.3").public
-+        '1.2.3'
-+        >>> Version("1.2.3+abc").public
-+        '1.2.3'
-+        >>> Version("1.2.3+abc.dev1").public
-+        '1.2.3'
-+        """
-+        return str(self).split("+", 1)[0]
-+
-+    @property
-+    def base_version(self) -> str:
-+        """The "base version" of the version.
-+
-+        >>> Version("1.2.3").base_version
-+        '1.2.3'
-+        >>> Version("1.2.3+abc").base_version
-+        '1.2.3'
-+        >>> Version("1!1.2.3+abc.dev1").base_version
-+        '1!1.2.3'
-+
-+        The "base version" is the public version of the project without any pre or post
-+        release markers.
-+        """
-+        parts = []
-+
-+        # Epoch
-+        if self.epoch != 0:
-+            parts.append(f"{self.epoch}!")
-+
-+        # Release segment
-+        parts.append(".".join(str(x) for x in self.release))
-+
-+        return "".join(parts)
-+
-+    @property
-+    def is_prerelease(self) -> bool:
-+        """Whether this version is a pre-release.
-+
-+        >>> Version("1.2.3").is_prerelease
-+        False
-+        >>> Version("1.2.3a1").is_prerelease
-+        True
-+        >>> Version("1.2.3b1").is_prerelease
-+        True
-+        >>> Version("1.2.3rc1").is_prerelease
-+        True
-+        >>> Version("1.2.3dev1").is_prerelease
-+        True
-+        """
-+        return self.dev is not None or self.pre is not None
-+
-+    @property
-+    def is_postrelease(self) -> bool:
-+        """Whether this version is a post-release.
-+
-+        >>> Version("1.2.3").is_postrelease
-+        False
-+        >>> Version("1.2.3.post1").is_postrelease
-+        True
-+        """
-+        return self.post is not None
-+
-+    @property
-+    def is_devrelease(self) -> bool:
-+        """Whether this version is a development release.
-+
-+        >>> Version("1.2.3").is_devrelease
-+        False
-+        >>> Version("1.2.3.dev1").is_devrelease
-+        True
-+        """
-+        return self.dev is not None
-+
-+    @property
-+    def major(self) -> int:
-+        """The first item of :attr:`release` or ``0`` if unavailable.
-+
-+        >>> Version("1.2.3").major
-+        1
-+        """
-+        return self.release[0] if len(self.release) >= 1 else 0
-+
-+    @property
-+    def minor(self) -> int:
-+        """The second item of :attr:`release` or ``0`` if unavailable.
-+
-+        >>> Version("1.2.3").minor
-+        2
-+        >>> Version("1").minor
-+        0
-+        """
-+        return self.release[1] if len(self.release) >= 2 else 0
-+
-+    @property
-+    def micro(self) -> int:
-+        """The third item of :attr:`release` or ``0`` if unavailable.
-+
-+        >>> Version("1.2.3").micro
-+        3
-+        >>> Version("1").micro
-+        0
-+        """
-+        return self.release[2] if len(self.release) >= 3 else 0
-+
-+
-+def _parse_letter_version(
-+    letter: str | None, number: str | bytes | SupportsInt | None
-+) -> tuple[str, int] | None:
-+    if letter:
-+        # We consider there to be an implicit 0 in a pre-release if there is
-+        # not a numeral associated with it.
-+        if number is None:
-+            number = 0
-+
-+        # We normalize any letters to their lower case form
-+        letter = letter.lower()
-+
-+        # We consider some words to be alternate spellings of other words and
-+        # in those cases we want to normalize the spellings to our preferred
-+        # spelling.
-+        if letter == "alpha":
-+            letter = "a"
-+        elif letter == "beta":
-+            letter = "b"
-+        elif letter in ["c", "pre", "preview"]:
-+            letter = "rc"
-+        elif letter in ["rev", "r"]:
-+            letter = "post"
-+
-+        return letter, int(number)
-+    if not letter and number:
-+        # We assume if we are given a number, but we are not given a letter
-+        # then this is using the implicit post release syntax (e.g. 1.0-1)
-+        letter = "post"
-+
-+        return letter, int(number)
-+
-+    return None
-+
-+
-+_local_version_separators = re.compile(r"[\._-]")
-+
-+
-+def _parse_local_version(local: str | None) -> LocalType | None:
-+    """
-+    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
-+    """
-+    if local is not None:
-+        return tuple(
-+            part.lower() if not part.isdigit() else int(part)
-+            for part in _local_version_separators.split(local)
-+        )
-+    return None
-+
-+
-+def _cmpkey(
-+    epoch: int,
-+    release: tuple[int, ...],
-+    pre: tuple[str, int] | None,
-+    post: tuple[str, int] | None,
-+    dev: tuple[str, int] | None,
-+    local: LocalType | None,
-+) -> CmpKey:
-+    # When we compare a release version, we want to compare it with all of the
-+    # trailing zeros removed. So we'll use a reverse the list, drop all the now
-+    # leading zeros until we come to something non zero, then take the rest
-+    # re-reverse it back into the correct order and make it a tuple and use
-+    # that for our sorting key.
-+    _release = tuple(
-+        reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
-+    )
-+
-+    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
-+    # We'll do this by abusing the pre segment, but we _only_ want to do this
-+    # if there is not a pre or a post segment. If we have one of those then
-+    # the normal sorting rules will handle this case correctly.
-+    if pre is None and post is None and dev is not None:
-+        _pre: CmpPrePostDevType = NegativeInfinity
-+    # Versions without a pre-release (except as noted above) should sort after
-+    # those with one.
-+    elif pre is None:
-+        _pre = Infinity
-+    else:
-+        _pre = pre
-+
-+    # Versions without a post segment should sort before those with one.
-+    if post is None:
-+        _post: CmpPrePostDevType = NegativeInfinity
-+
-+    else:
-+        _post = post
-+
-+    # Versions without a development segment should sort after those with one.
-+    if dev is None:
-+        _dev: CmpPrePostDevType = Infinity
-+
-+    else:
-+        _dev = dev
-+
-+    if local is None:
-+        # Versions without a local segment should sort before those with one.
-+        _local: CmpLocalType = NegativeInfinity
-+    else:
-+        # Versions with a local segment need that segment parsed to implement
-+        # the sorting rules in PEP440.
-+        # - Alpha numeric segments sort before numeric segments
-+        # - Alpha numeric segments sort lexicographically
-+        # - Numeric segments sort numerically
-+        # - Shorter versions sort before longer versions when the prefixes
-+        #   match exactly
-+        _local = tuple(
-+            (i, "") if isinstance(i, int) else (NegativeInfinity, i) for i in local
-+        )
-+
-+    return epoch, _release, _pre, _post, _dev, _local
---- a/meson.build
-+++ b/meson.build
-@@ -2419,7 +2419,7 @@ endif
- 
- glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
- 
--python = import('python').find_installation(modules: ['packaging'])
-+python = import('python').find_installation(modules: [])
- # used for '#!/usr/bin/env '
- python_name = 'python3'
-