Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[glib] Update to 2.80.0 #37473

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions ports/glib/0005-pr-4133-4143-avoid-package-packaging.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
index 08f1ba9..af803c0 100644
--- a/gio/gdbus-2.0/codegen/utils.py
+++ b/gio/gdbus-2.0/codegen/utils.py
@@ -19,10 +19,9 @@
#
# Author: David Zeuthen <davidz@redhat.com>

-import packaging.version
import os
import sys
-
+import re

# pylint: disable=too-few-public-methods
class Color:
@@ -166,4 +165,28 @@ def version_cmp_key(key):
v = str(key[0])
else:
v = "0"
- return (packaging.version.Version(v), key[1])
+ return (_parse_version(v), key[1])
+
+
+def _parse_version(version):
+ """
+ Parse a version string into a list of integers and strings.
+
+ This function takes a version string and breaks it down into its component parts.
+ It separates numeric and non-numeric segments, converting numeric segments to integers.
+
+ Args:
+ version (str): The version string to parse.
+
+ Returns:
+ list: A list where each element is either an integer (for numeric parts)
+ or a string (for non-numeric parts).
+
+ Example:
+ >>> parseversion("1.2.3a")
+ [1, 2, 3, 'a']
+ >>> parseversion("2.0.0-rc1")
+ [2, 0, 0, 'rc1']
+ """
+ blocks = re.findall(r"(\d+|\w+)", version)
+ return [int(b) if b.isdigit() else b for b in blocks]
diff --git a/meson.build b/meson.build
index a400965..576a939 100644
--- a/meson.build
+++ b/meson.build
@@ -2420,7 +2420,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()
# used for '#!/usr/bin/env <name>'
python_name = 'python3'

10 changes: 7 additions & 3 deletions ports/glib/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}")
vcpkg_download_distfile(GLIB_ARCHIVE
URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz"
FILENAME "glib-${VERSION}.tar.xz"
SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
SHA512 1514d62aeb4c4a1a1048ae0f84f7db7f0dbf355772b2dadf6a34ec547045b163a5e28331b096e7616fe3c9c19bed98025a0202b05073f5d7ee901d0efaffe143
)

vcpkg_extract_source_archive(SOURCE_PATH
ARCHIVE "${GLIB_ARCHIVE}"
PATCHES
use-libiconv-on-windows.patch
libintl.patch
0005-pr-4133-4143-avoid-package-packaging.patch # Backport from 2.81.1
)

set(LANGUAGES C CXX)
Expand Down Expand Up @@ -47,10 +48,10 @@ vcpkg_configure_meson(
${ADDITIONAL_BINARIES}
OPTIONS
${OPTIONS}
-Dgtk_doc=false
-Ddocumentation=false
-Dinstalled_tests=false
-Dlibelf=disabled
-Dman=false
-Dman-pages=disabled
-Dtests=false
-Dxattr=false
)
Expand All @@ -73,6 +74,9 @@ endforeach()
set(GLIB_TOOLS
gapplication
gdbus
gi-compile-repository
gi-decompile-typelib
gi-inspect-typelib
gio
gio-querymodules
glib-compile-resources
Expand Down
3 changes: 1 addition & 2 deletions ports/glib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "glib",
"version": "2.78.4",
"port-version": 4,
"version": "2.80.0",
"description": "Portable, general-purpose utility library.",
"homepage": "https://developer.gnome.org/glib/",
"license": "LGPL-2.1-or-later",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,8 +3129,8 @@
"port-version": 2
},
"glib": {
"baseline": "2.78.4",
"port-version": 4
"baseline": "2.80.0",
"port-version": 0
},
"glib-networking": {
"baseline": "2.78.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/glib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "98c1acbee23caa1307827ce7d8e4f6e38954e560",
"version": "2.80.0",
"port-version": 0
},
{
"git-tree": "ee1411dc98162edf7c0e77780050dc8ddc7b3aae",
"version": "2.78.4",
Expand Down