From acd93bf2f19282caaa3379047206409db9766b10 Mon Sep 17 00:00:00 2001 From: Jayson Reis Date: Wed, 5 Jul 2023 07:01:00 +0200 Subject: [PATCH 01/80] Rewrite pixman to use meson for the builds --- gvsbuild/projects/pixman.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/gvsbuild/projects/pixman.py b/gvsbuild/projects/pixman.py index fa02366d7..dcbfa4e92 100644 --- a/gvsbuild/projects/pixman.py +++ b/gvsbuild/projects/pixman.py @@ -15,14 +15,14 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . -import os +from gvsbuild.utils.base_builders import Meson from gvsbuild.utils.base_expanders import Tarball from gvsbuild.utils.base_project import Project, project_add @project_add -class Pixman(Tarball, Project): +class Pixman(Tarball, Meson): def __init__(self): Project.__init__( self, @@ -32,23 +32,14 @@ def __init__(self): lastversion_even=True, archive_url="http://cairographics.org/releases/pixman-{version}.tar.gz", hash="ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e", + dependencies=["ninja", "meson"], ) def build(self): - optimizations = "SSE2=on SSSE3=on" + ( - " MMX=off" if self.builder.x64 else " MMX=on" - ) - - add_path = os.path.join(self.builder.opts.msys_dir, "usr", "bin") - - self.exec_vs( - f"make -f Makefile.win32 pixman CFG=%(configuration)s {optimizations}", - add_path=add_path, + enable_mmx = "disabled" if self.builder.x64 else "enabled" + Meson.build( + self, + meson_params=f"-Dsse2=enabled -Dssse3=enabled -Dmmx={enable_mmx} -Dtests=disabled", ) - self.install(r".\pixman\%(configuration)s\pixman-1.lib lib") - - self.install(r".\pixman\pixman.h include\pixman-1") - self.install(r".\pixman\pixman-version.h include\pixman-1") - self.install(r".\COPYING share\doc\pixman") From f20a3233ccb1469a34ea286cb25130ab32ebde5e Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sun, 2 Jul 2023 22:24:58 -0400 Subject: [PATCH 02/80] Test with Python 3.12 --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37710ea6c..a1e1689ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: name: Test with Python ${{ matrix.python-version }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] runs-on: windows-latest timeout-minutes: 60 if: "!contains(github.event.head_commit.message, 'skip ci')" @@ -46,6 +46,7 @@ jobs: uses: actions/setup-python@v4.6.1 with: python-version: ${{ matrix.python-version }} + allow-prereleases: true - name: Use Python Dependency Cache uses: actions/cache@v3.3.1 with: From e97f90a95490bf280a1068fcd0b3051d82bdecbd Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Mon, 3 Jul 2023 15:56:19 -0400 Subject: [PATCH 03/80] Add Python 3.12 to tox --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3fea775f9..a4107a5fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ skip = ".venv" legacy_tox_ini = """ [tox] isolated_build = true -envlist = py38, py39, py310, py311 +envlist = py{38,39,310,311,312} [gh-actions] python = @@ -50,6 +50,7 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [testenv] commands = pytest From 1b3c28a3aa2312e7796f5f91b0a897a7a38b9292 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Mon, 3 Jul 2023 15:57:41 -0400 Subject: [PATCH 04/80] Bump gvsbuild version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a4107a5fa..f0ff84f4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gvsbuild" -version = "2023.6.0" +version = "2023.7.0" description = "GTK stack for Windows" authors = ["Ignacio Casal Quinteiro ", "Dan Yeaw "] license = "GPL-2.0-only" From 167d191f6caa8a1014b463a3eb2493c619db3108 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:27:36 -0400 Subject: [PATCH 05/80] build(deps-dev): bump tox from 4.6.3 to 4.6.4 (#1009) Bumps [tox](https://github.com/tox-dev/tox) from 4.6.3 to 4.6.4. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/4.6.3...4.6.4) --- updated-dependencies: - dependency-name: tox dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- poetry.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/poetry.lock b/poetry.lock index 325350871..2cfc6c2d8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -480,13 +480,13 @@ files = [ [[package]] name = "platformdirs" -version = "3.5.3" +version = "3.8.1" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." optional = false python-versions = ">=3.7" files = [ - {file = "platformdirs-3.5.3-py3-none-any.whl", hash = "sha256:0ade98a4895e87dc51d47151f7d2ec290365a585151d97b4d8d6312ed6132fed"}, - {file = "platformdirs-3.5.3.tar.gz", hash = "sha256:e48fabd87db8f3a7df7150a4a5ea22c546ee8bc39bc2473244730d4b56d2cc4e"}, + {file = "platformdirs-3.8.1-py3-none-any.whl", hash = "sha256:cec7b889196b9144d088e4c57d9ceef7374f6c39694ad1577a0aab50d27ea28c"}, + {file = "platformdirs-3.8.1.tar.gz", hash = "sha256:f87ca4fcff7d2b0f81c6a748a77973d7af0f4d526f98f308477c3c436c74d528"}, ] [package.extras] @@ -495,13 +495,13 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest- [[package]] name = "pluggy" -version = "1.0.0" +version = "1.2.0" description = "plugin and hook calling mechanisms for python" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" files = [ - {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, - {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, + {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"}, + {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"}, ] [package.extras] @@ -770,13 +770,13 @@ files = [ [[package]] name = "tox" -version = "4.6.3" +version = "4.6.4" description = "tox is a generic virtualenv management and test command line tool" optional = false python-versions = ">=3.7" files = [ - {file = "tox-4.6.3-py3-none-any.whl", hash = "sha256:2946a0bb38924c3a9f9575c7fb4ca1f4c11a7c69c61592f176778892155cb50c"}, - {file = "tox-4.6.3.tar.gz", hash = "sha256:9e2c5091a117d03b583c57c4c40aecd068099c17d40520e7b165e85c19334534"}, + {file = "tox-4.6.4-py3-none-any.whl", hash = "sha256:1b8f8ae08d6a5475cad9d508236c51ea060620126fd7c3c513d0f5c7f29cc776"}, + {file = "tox-4.6.4.tar.gz", hash = "sha256:5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda"}, ] [package.dependencies] @@ -785,15 +785,15 @@ chardet = ">=5.1" colorama = ">=0.4.6" filelock = ">=3.12.2" packaging = ">=23.1" -platformdirs = ">=3.5.3" -pluggy = ">=1" +platformdirs = ">=3.8" +pluggy = ">=1.2" pyproject-api = ">=1.5.2" tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""} virtualenv = ">=20.23.1" [package.extras] -docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.23.2,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] -testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.6)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.3.2)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"] +docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.23.3,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.6)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"] [[package]] name = "tqdm" From e312a1a3d91a4cd418271c39ffd8d130effd5eee Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 13 Jul 2023 21:05:13 -0400 Subject: [PATCH 06/80] Update adwaita-icon-theme to version 45.beta --- .../Adwaita/64x64/ui/.empty | 0 .../Adwaita/96x96/ui/.empty | 0 .../adwaita-icon-theme/add_meson_build.patch | 160 ------------------ gvsbuild/projects/adwaita_icon_theme.py | 5 +- 4 files changed, 2 insertions(+), 163 deletions(-) delete mode 100644 gvsbuild/patches/adwaita-icon-theme/Adwaita/64x64/ui/.empty delete mode 100644 gvsbuild/patches/adwaita-icon-theme/Adwaita/96x96/ui/.empty delete mode 100644 gvsbuild/patches/adwaita-icon-theme/add_meson_build.patch diff --git a/gvsbuild/patches/adwaita-icon-theme/Adwaita/64x64/ui/.empty b/gvsbuild/patches/adwaita-icon-theme/Adwaita/64x64/ui/.empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/gvsbuild/patches/adwaita-icon-theme/Adwaita/96x96/ui/.empty b/gvsbuild/patches/adwaita-icon-theme/Adwaita/96x96/ui/.empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/gvsbuild/patches/adwaita-icon-theme/add_meson_build.patch b/gvsbuild/patches/adwaita-icon-theme/add_meson_build.patch deleted file mode 100644 index e7d1f6e87..000000000 --- a/gvsbuild/patches/adwaita-icon-theme/add_meson_build.patch +++ /dev/null @@ -1,160 +0,0 @@ -Subject: [PATCH] Add meson build ---- -Index: Adwaita/meson.build -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/Adwaita/meson.build b/Adwaita/meson.build -new file mode 100644 ---- /dev/null (date 1684704313520) -+++ b/Adwaita/meson.build (date 1684704313520) -@@ -0,0 +1,24 @@ -+command_output = run_command('../tools/find_svg_png_files.py', check: true) -+svg_png_files = command_output.stdout().strip().split('\n') -+install_data(svg_png_files, install_dir: get_option('datadir') / 'icons/Adwaita', preserve_path: true) -+ -+if host_machine.system() == 'windows' -+ command_output = run_command('../tools/find_cursors_win32.py', check: true) -+else -+ command_output = run_command('../tools/find_cursors.py', check: true) -+endif -+cursors = command_output.stdout().strip().split('\n') -+install_data(cursors, install_dir: get_option('datadir') / 'icons/Adwaita', preserve_path: true) -+ -+if host_machine.system() != 'windows' -+ command_output = run_command('../tools/find_symlinks.py', check: true) -+ symlinks = command_output.stdout().strip().split('\n') -+ foreach symlink : symlinks -+ name_dir_pointing = symlink.split() -+ install_symlink( -+ name_dir_pointing[0], -+ install_dir: get_option('datadir') / 'icons/Adwaita' / name_dir_pointing[1], -+ pointing_to: name_dir_pointing[2], -+ ) -+ endforeach -+endif -Index: meson.build -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/meson.build b/meson.build -new file mode 100644 ---- /dev/null (date 1684703023721) -+++ b/meson.build (date 1684703023721) -@@ -0,0 +1,28 @@ -+project('adwaita-icon-theme', 'c', version : '44.0') -+cc = meson.get_compiler('c') -+ -+gnome = import('gnome') -+ -+pkg = import('pkgconfig') -+pkg.generate( -+ name : 'adwaita-icon-theme', -+ description : 'A collection of icons used as the basis for GNOME themes', -+ dataonly : true, -+) -+ -+licenses_dir = get_option('datadir') / 'licenses' / 'adwaita-icon-theme' -+install_data('COPYING', install_dir: licenses_dir, install_tag: 'license') -+install_data('COPYING_CCBYSA3', install_dir: licenses_dir, install_tag: 'license') -+install_data('COPYING_LGPL', install_dir: licenses_dir, install_tag: 'license') -+ -+index_conf = configuration_data() -+index_conf.set_quoted('THEME_DIRS', 'symbolic/actions') -+configure_file( -+ input : 'index.theme.in', -+ output : 'index.theme', -+ configuration : index_conf, -+) -+ -+subdir('Adwaita') -+ -+gnome.post_install(gtk_update_icon_cache: true) -Index: tools/find_cursors.py -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/tools/find_cursors.py b/tools/find_cursors.py -new file mode 100644 ---- /dev/null (date 1684703061836) -+++ b/tools/find_cursors.py (date 1684703061836) -@@ -0,0 +1,11 @@ -+#!/usr/bin/env python3 -+ -+from pathlib import Path -+ -+ -+src_dir = Path(__file__).resolve().parents[1] -+adwaita_dir = src_dir / "Adwaita" -+cursors_dir = adwaita_dir / "cursors" -+for f in cursors_dir.glob("*"): -+ if f.suffix != ".cur" and not f.is_symlink(): -+ print(f.relative_to(adwaita_dir)) -Index: tools/find_cursors_win32.py -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/tools/find_cursors_win32.py b/tools/find_cursors_win32.py -new file mode 100644 ---- /dev/null (date 1684703093953) -+++ b/tools/find_cursors_win32.py (date 1684703093953) -@@ -0,0 +1,11 @@ -+#!/usr/bin/env python3 -+ -+from pathlib import Path -+ -+ -+src_dir = Path(__file__).resolve().parents[1] -+adwaita_dir = src_dir / "Adwaita" -+cursors_dir = adwaita_dir / "cursors" -+for f in cursors_dir.glob("*.cur"): -+ if not f.is_symlink(): -+ print(f.relative_to(adwaita_dir)) -Index: tools/find_svg_png_files.py -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/tools/find_svg_png_files.py b/tools/find_svg_png_files.py -new file mode 100644 ---- /dev/null (date 1684703117318) -+++ b/tools/find_svg_png_files.py (date 1684703117318) -@@ -0,0 +1,10 @@ -+#!/usr/bin/env python3 -+ -+from pathlib import Path -+ -+ -+src_dir = Path(__file__).resolve().parents[1] -+adwaita_dir = src_dir / "Adwaita" -+for f in adwaita_dir.rglob("*.svg") or adwaita_dir.rglob("*.png"): -+ if not f.is_symlink(): -+ print(f.relative_to(adwaita_dir)) -Index: tools/find_symlinks.py -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/tools/find_symlinks.py b/tools/find_symlinks.py -new file mode 100644 ---- /dev/null (date 1684703996626) -+++ b/tools/find_symlinks.py (date 1684703996626) -@@ -0,0 +1,14 @@ -+#!/usr/bin/env python3 -+ -+from pathlib import Path -+ -+ -+src_dir = Path(__file__).resolve().parents[1] -+adwaita_dir = src_dir / "Adwaita" -+for f in adwaita_dir.rglob("*.svg") or adwaita_dir.rglob("*.png"): -+ if f.is_symlink(): -+ print(f.name, f.relative_to(adwaita_dir).parent, f.readlink()) -+cursors_dir = adwaita_dir / "cursors" -+for f in cursors_dir.glob("*"): -+ if f.suffix != ".cur" and f.is_symlink(): -+ print(f.name, f.relative_to(adwaita_dir).parent, f.readlink()) diff --git a/gvsbuild/projects/adwaita_icon_theme.py b/gvsbuild/projects/adwaita_icon_theme.py index 8ee1fcbbb..9201e6c12 100644 --- a/gvsbuild/projects/adwaita_icon_theme.py +++ b/gvsbuild/projects/adwaita_icon_theme.py @@ -27,15 +27,14 @@ def __init__(self): Meson.__init__( self, "adwaita-icon-theme", - version="44.0", + version="45.beta", repository="https://gitlab.gnome.org/GNOME/adwaita-icon-theme", archive_url="https://download.gnome.org/sources/adwaita-icon-theme/{major}/adwaita-icon-theme-{version}.tar.xz", - hash="4889c5601bbfecd25d80ba342209d0a936dcf691ee56bd6eca4cde361f1a664c", + hash="8eb9fbe426cf77593154bb759e690ddc404292d4983f272ecf4d9ef9bedba312", dependencies=[ "hicolor-icon-theme", "librsvg", ], - patches=["add_meson_build.patch"], ) def build(self): From 38b0702399642e926a3c1fc217ef4f9af02e2d83 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 13 Jul 2023 21:11:13 -0400 Subject: [PATCH 07/80] Update cargo to version 1.71.0 --- gvsbuild/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index 113894b77..cacf93e2a 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -30,7 +30,7 @@ def __init__(self): Tool.__init__( self, "cargo", - version="1.70.0", + version="1.71.0", repository="rust-lang/rust", archive_url="https://win.rustup.rs/x86_64", archive_file_name="rustup-init.exe", From 9bd6f5c3970fd934df80193df6c9155e8b2a3da9 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 13 Jul 2023 21:15:07 -0400 Subject: [PATCH 08/80] Update go to version 1.20.6 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index cacf93e2a..4474c8e55 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -211,9 +211,9 @@ def __init__(self): Tool.__init__( self, "go", - version="1.20.5", + version="1.20.6", archive_url="https://go.dev/dl/go{version}.windows-amd64.zip", - hash="c04a4ed73c3624d5b4c4f62e44a141549cc0bfd83a7492c31ca8b86b3752f077", + hash="b67dd7f2b4589701e53c98e348e1b4d9a7c3536dc316941172b2f0b60ae4ce5f", dir_part="go-{version}", ) From 7fdf02ac7f661ca49fac676f57500a307bdbbc31 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 13 Jul 2023 22:02:20 -0400 Subject: [PATCH 09/80] Remove downloaded archives during from-scratch --- gvsbuild/utils/builder.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gvsbuild/utils/builder.py b/gvsbuild/utils/builder.py index 54af9f371..e825ada42 100644 --- a/gvsbuild/utils/builder.py +++ b/gvsbuild/utils/builder.py @@ -80,6 +80,10 @@ def __init__(self, opts): f"Removing git expand dir ({self.opts.git_expand_dir})" ): rmtree_full(self.opts.git_expand_dir, retry=True) + with log.simple_oper( + f"Removing archives download dir ({opts.archives_download_dir})" + ): + rmtree_full(opts.archives_download_dir) if not opts.keep_tools: with log.simple_oper(f"Removing tools dir ({opts.tools_root_dir})"): rmtree_full(opts.tools_root_dir, retry=True) From 063782c4e2c2a2453c2ed0c170b5210c6a314999 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 12:13:25 -0400 Subject: [PATCH 10/80] build(deps): bump actions/setup-python from 4.6.1 to 4.7.0 (#1013) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.6.1 to 4.7.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4.6.1...v4.7.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1e1689ad..d8bfcabcd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python - uses: actions/setup-python@v4.6.1 + uses: actions/setup-python@v4.7.0 with: python-version: ${{ env.python_version }} - name: Lint with Pre-commit @@ -43,7 +43,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python - uses: actions/setup-python@v4.6.1 + uses: actions/setup-python@v4.7.0 with: python-version: ${{ matrix.python-version }} allow-prereleases: true @@ -90,7 +90,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python - uses: actions/setup-python@v4.6.1 + uses: actions/setup-python@v4.7.0 with: python-version: ${{ env.python_version }} - name: Use Python Dependency Cache From aa821c552c635e21cf6315eaf5e657efa32fac75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 06:41:25 +0000 Subject: [PATCH 11/80] build(deps): bump lastversion from 3.0.0 to 3.0.1 Bumps [lastversion](https://github.com/dvershinin/lastversion) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/dvershinin/lastversion/releases) - [Changelog](https://github.com/dvershinin/lastversion/blob/master/CHANGELOG.md) - [Commits](https://github.com/dvershinin/lastversion/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: lastversion dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2cfc6c2d8..42a4b1540 100644 --- a/poetry.lock +++ b/poetry.lock @@ -341,19 +341,19 @@ files = [ [[package]] name = "lastversion" -version = "3.0.0" +version = "3.0.1" description = "A CLI tool to find the latest stable version of an arbitrary project" optional = true python-versions = "*" files = [ - {file = "lastversion-3.0.0-py3-none-any.whl", hash = "sha256:5b0e9ddd0347ad875a08eddb868e219eb373e2a6ec50d401dd3fcff2c5517d82"}, - {file = "lastversion-3.0.0.tar.gz", hash = "sha256:393dcc3fe207dec866610223a817a79b4e197b6f35398c05335d7dc8893d227f"}, + {file = "lastversion-3.0.1-py3-none-any.whl", hash = "sha256:3eb8bb62cd5c3dc52561a8f0ee0fcd3174a9e3c26711233b1fda31a849880ae4"}, + {file = "lastversion-3.0.1.tar.gz", hash = "sha256:02fc2cde88aaf9773f777e55aa690335a7d5d409bd10b71b57ff3ee5a071e99d"}, ] [package.dependencies] appdirs = "*" beautifulsoup4 = "*" -cachecontrol = "0.12.6" +cachecontrol = "<=0.12.11" distro = "*" feedparser = {version = "*", markers = "python_version >= \"3.0.0\""} lockfile = "*" @@ -366,9 +366,9 @@ tqdm = "*" urllib3 = "<2" [package.extras] -build = ["PyYAML", "appdirs", "beautifulsoup4", "cachecontrol (==0.12.6)", "distro", "feedparser", "feedparser (<=5.2.1)", "flake8", "lockfile", "markdown-include", "mkdocs (==1.3.1)", "mkdocs-material", "mkdocstrings", "packaging", "pytest (>=4.4.0)", "pytest-cov", "pytest-xdist (==1.29.0)", "python-dateutil", "requests (>=2.6.1)", "six", "tqdm", "urllib3 (<2)"] +build = ["PyYAML", "appdirs", "beautifulsoup4", "cachecontrol (<=0.12.11)", "distro", "feedparser", "feedparser (<=5.2.1)", "flake8", "lockfile", "markdown-include", "mkdocs (==1.3.1)", "mkdocs-material", "mkdocstrings", "packaging", "pytest (>=4.4.0)", "pytest-cov", "pytest-xdist (==1.29.0)", "python-dateutil", "requests (>=2.6.1)", "six", "tqdm", "urllib3 (<2)"] docs = ["markdown-include", "mkdocs (==1.3.1)", "mkdocs-material", "mkdocstrings"] -tests = ["PyYAML", "appdirs", "beautifulsoup4", "cachecontrol (==0.12.6)", "distro", "feedparser", "feedparser (<=5.2.1)", "flake8", "lockfile", "packaging", "pytest (>=4.4.0)", "pytest-cov", "pytest-xdist (==1.29.0)", "python-dateutil", "requests (>=2.6.1)", "six", "tqdm", "urllib3 (<2)"] +tests = ["PyYAML", "appdirs", "beautifulsoup4", "cachecontrol (<=0.12.11)", "distro", "feedparser", "feedparser (<=5.2.1)", "flake8", "lockfile", "packaging", "pytest (>=4.4.0)", "pytest-cov", "pytest-xdist (==1.29.0)", "python-dateutil", "requests (>=2.6.1)", "six", "tqdm", "urllib3 (<2)"] [[package]] name = "lockfile" From 9a5e1575a9d57b030ae79fed922a707a64e58cf3 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 8 Jul 2023 07:55:36 -0400 Subject: [PATCH 12/80] Update libpng to version 1.6.40 --- gvsbuild/projects/libpng.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libpng.py b/gvsbuild/projects/libpng.py index cfa05c3e0..649a330c8 100644 --- a/gvsbuild/projects/libpng.py +++ b/gvsbuild/projects/libpng.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "libpng", - version="1.6.39", + version="1.6.40", archive_url="http://prdownloads.sourceforge.net/libpng/libpng-{version}.tar.xz", - hash="1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937", + hash="535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1", dependencies=["cmake", "ninja", "zlib"], ) From 5974b0ef3e1d33972a6c2f17ec49560fd19968cc Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 8 Jul 2023 07:59:00 -0400 Subject: [PATCH 13/80] Update glib to version 2.76.4 --- gvsbuild/projects/glib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/glib.py b/gvsbuild/projects/glib.py index 30a8c3a7e..0901ffdd2 100644 --- a/gvsbuild/projects/glib.py +++ b/gvsbuild/projects/glib.py @@ -26,11 +26,11 @@ def __init__(self): Project.__init__( self, "glib", - version="2.76.3", + version="2.76.4", lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/glib", archive_url="https://download.gnome.org/sources/glib/{major}.{minor}/glib-{version}.tar.xz", - hash="c0be444e403d7c3184d1f394f89f0b644710b5e9331b54fa4e8b5037813ad32a", + hash="5a5a191c96836e166a7771f7ea6ca2b0069c603c7da3cba1cd38d1694a395dda", dependencies=[ "ninja", "meson", From e79781457973cfc1b16ed7638edc3d8348886600 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 8 Jul 2023 08:00:12 -0400 Subject: [PATCH 14/80] Update libjpeg-turbo to version 3.0.0 --- gvsbuild/projects/libjpeg_turbo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libjpeg_turbo.py b/gvsbuild/projects/libjpeg_turbo.py index 0660f45ea..f7aed6392 100644 --- a/gvsbuild/projects/libjpeg_turbo.py +++ b/gvsbuild/projects/libjpeg_turbo.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "libjpeg-turbo", - version="2.1.5.1", + version="3.0.0", archive_url="https://sourceforge.net/projects/libjpeg-turbo/files/{version}/libjpeg-turbo-{version}.tar.gz", - hash="2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf", + hash="c77c65fcce3d33417b2e90432e7a0eb05f59a7fff884022a9d931775d583bfaa", dependencies=[ "cmake", "ninja", From 206976cc9d4e6bdc3021b80ebd32bc49e9007131 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 20 Jul 2023 21:55:46 -0400 Subject: [PATCH 15/80] Update librsvg to version 2.56.3 --- gvsbuild/projects/librsvg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/librsvg.py b/gvsbuild/projects/librsvg.py index 4cadc6190..124e44438 100644 --- a/gvsbuild/projects/librsvg.py +++ b/gvsbuild/projects/librsvg.py @@ -26,11 +26,11 @@ def __init__(self): Project.__init__( self, "librsvg", - version="2.56.2", + version="2.56.3", lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/librsvg", archive_url="https://download.gnome.org/sources/librsvg/{major}.{minor}/librsvg-{version}.tar.xz", - hash="3ec3c4d8f73e0ba4b9130026969e8371c092b734298d36e2fdb3eb4afcec1200", + hash="5a328048a02d014645cd27f61140f4e0b11280fb2c7f2a21864fe0c59ac1ce88", dependencies=[ "cargo", "cairo", From dfbb20d9f9304738934ed537edf8fe3d4e2b7ae7 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 20 Jul 2023 21:57:35 -0400 Subject: [PATCH 16/80] Update meson to version 1.2.0 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index 4474c8e55..2acb4a78d 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -95,10 +95,10 @@ def __init__(self): Tool.__init__( self, "meson", - version="1.1.1", + version="1.2.0", archive_url="https://github.com/mesonbuild/meson/archive/refs/tags/{version}.tar.gz", archive_file_name="meson-{version}.tar.gz", - hash="1c3b9e1a3a36b51adb5de498d582fd5cbf6763fadbcf151de9f2a762e02bd2e6", + hash="603489f0aaa6305f806c6cc4a4455a965f22290fc74f65871f589b002110c790", dir_part="meson-{version}", exe_name="meson.py", ) From 11c686ae8115b344a54f559593689855d3d20ca7 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 20 Jul 2023 22:01:43 -0400 Subject: [PATCH 17/80] Update cmake to version 3.27.0 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index 2acb4a78d..daeee8757 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -68,9 +68,9 @@ def __init__(self): Tool.__init__( self, "cmake", - version="3.26.4", + version="3.27.0", archive_url="https://github.com/Kitware/CMake/releases/download/v{version}/cmake-{version}-windows-x86_64.zip", - hash="62c35427104a4f8205226f72708d71334bd36a72cf72c60d0e3a766d71dcc78a", + hash="fc5f901ef4d438eafbe35b24c608d5de11e517f157b3b7ab8ebbaa7c3c0171d2", dir_part="cmake-{version}-windows-x86_64", ) From f135f61f39c7bd3e4bdbf16319c61baea0700dd7 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 22 Jul 2023 14:46:10 -0400 Subject: [PATCH 18/80] Bump version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f0ff84f4c..f8b13ad42 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gvsbuild" -version = "2023.7.0" +version = "2023.7.1" description = "GTK stack for Windows" authors = ["Ignacio Casal Quinteiro ", "Dan Yeaw "] license = "GPL-2.0-only" From 48f204d26d15f69ca02a713b70efc25211ab21a7 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 22 Jul 2023 14:50:12 -0400 Subject: [PATCH 19/80] Update libarchive to version 3.7.0 --- gvsbuild/projects/libarchive.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libarchive.py b/gvsbuild/projects/libarchive.py index 97b068cca..51849751b 100644 --- a/gvsbuild/projects/libarchive.py +++ b/gvsbuild/projects/libarchive.py @@ -29,9 +29,9 @@ def __init__(self): Project.__init__( self, "libarchive", - version="3.6.2", + version="3.7.0", archive_url="https://libarchive.org/downloads/libarchive-{version}.tar.xz", - hash="9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d", + hash="44729a0cc3b0b0be6742a9873d25e85e240c9318f5f5ebf2cca6bc84d7b91b07", dependencies=[ "cmake", "ninja", From e48473bdd7ba962af435ffe9582f12bbbd250c36 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 22 Jul 2023 14:52:00 -0400 Subject: [PATCH 20/80] Update libcurl to version 8.2.0 --- gvsbuild/projects/libcurl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libcurl.py b/gvsbuild/projects/libcurl.py index 22b515ff1..8c7e77a6b 100644 --- a/gvsbuild/projects/libcurl.py +++ b/gvsbuild/projects/libcurl.py @@ -29,10 +29,10 @@ def __init__(self): Project.__init__( self, "libcurl", - version="8.1.2", + version="8.2.0", repository="https://github.com/curl/curl", archive_url="https://github.com/curl/curl/releases/download/curl-{major}_{minor}_{micro}/curl-{version}.tar.xz", - hash="31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6", + hash="2859ec79e2cd96e976a99493547359b8001af1d1e21f3a3a3b846544ef54500f", dependencies=[ "perl", "cmake", From e9b2852f7313ec53f9f05dcb566af1f5129e8608 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 22 Jul 2023 14:53:59 -0400 Subject: [PATCH 21/80] Update harfbuzz to version 8.0.1 --- gvsbuild/projects/harfbuzz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/harfbuzz.py b/gvsbuild/projects/harfbuzz.py index 8ec5062fa..f13269208 100644 --- a/gvsbuild/projects/harfbuzz.py +++ b/gvsbuild/projects/harfbuzz.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "harfbuzz", - version="7.3.0", + version="8.0.1", archive_url="https://github.com/harfbuzz/harfbuzz/releases/download/{version}/harfbuzz-{version}.tar.xz", - hash="20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb", + hash="c1ce780acd385569f25b9a29603d1d5bc71e6940e55bfdd4f7266fad50e42620", dependencies=["meson", "cmake", "freetype", "pkgconf", "glib"], ) From 0fd5fd12c1d27c0204e6b28108d8c23d690dec9a Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 22 Jul 2023 14:58:08 -0400 Subject: [PATCH 22/80] Update gstreamer to version 1.22.5 --- gvsbuild/projects/gstreamer.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gvsbuild/projects/gstreamer.py b/gvsbuild/projects/gstreamer.py index 3091b4f74..61f56f79f 100644 --- a/gvsbuild/projects/gstreamer.py +++ b/gvsbuild/projects/gstreamer.py @@ -42,10 +42,10 @@ def __init__(self): self, "gstreamer", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.22.4", + version="1.22.5", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-{version}.tar.xz", - hash="11cb0498bc16b93d8b99d22f75f829b8d0abfd8254840b2120618db5532dc655", + hash="4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61", dependencies=["meson", "ninja", "glib", "orc"], ) @@ -92,10 +92,10 @@ def __init__(self): self, "gst-plugins-base", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.22.4", + version="1.22.5", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-{version}.tar.xz", - hash="292424e82dea170528c42b456f62a89532bcabc0508f192e34672fb86f68e5b8", + hash="edd4338b45c26a9af28c0d35aab964a024c3884ba6f520d8428df04212c8c93a", dependencies=[ "meson", "ninja", @@ -129,10 +129,10 @@ def __init__(self): self, "gst-plugins-good", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.22.4", + version="1.22.5", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-{version}.tar.xz", - hash="d7120c1146a9d723d53d5bfe8074da2575a81f0598438752937f39bb7c833b6a", + hash="b67b31313a54c6929b82969d41d3cfdf2f58db573fb5f491e6bba5d84aea0778", dependencies=[ "meson", "ninja", @@ -153,10 +153,10 @@ def __init__(self): self, "gst-plugins-bad", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.22.4", + version="1.22.5", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-{version}.tar.xz", - hash="eaaf53224565eaabd505ca39c6d5769719b45795cf532ce1ceb60e1b2ebe99ac", + hash="e64e75cdafd7ff2fc7fc34e855b06b1e3ed227cc06fa378d17bbcd76780c338c", dependencies=["meson", "ninja", "gst-plugins-base"], patches=[ "wasapisink-reduce-buffer-latency.patch", @@ -178,10 +178,10 @@ def __init__(self): self, "gst-plugins-ugly", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.22.4", + version="1.22.5", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-{version}.tar.xz", - hash="ffb461fda6c06d316c4be5682632cc8901454ed72b1098b1e0221bc55e673cd7", + hash="2680473b218158f18467cac3e1c50291b7ff4e0710dd350a59eaacbc29c09a54", dependencies=["meson", "ninja", "gst-plugins-base"], ) @@ -197,10 +197,10 @@ def __init__(self): self, "gst-devtools", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.22.4", + version="1.22.5", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-{version}.tar.xz", - hash="4c52053ce8c1df72fd81721e9f53de3b146edcf2de28f607be705bce4cf909d1", + hash="2add1519aa6eeb01d544cb94293688ee3bc2079f6bca6075bf5c23d00a0921be", dependencies=["meson", "ninja", "json-glib"], ) @@ -216,10 +216,10 @@ def __init__(self): self, "gst-python", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.22.4", + version="1.22.5", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-python/gst-python-{version}.tar.xz", - hash="e1302dcc0f2451b64380dcc0dd3b82735795e8951dc812d938d8ba91f388163e", + hash="bf05232415cf6018142ae51dd3b897bb73432687b5ce1786bf46edc6298ce5b0", dependencies=["meson", "ninja", "pygobject", "gst-plugins-base"], ) From cddca01fb9a4700502e27eaf7794217bca553632 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 22 Jul 2023 15:00:40 -0400 Subject: [PATCH 23/80] Update nghttp2 to version 1.55.1 --- gvsbuild/projects/nghttp2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/nghttp2.py b/gvsbuild/projects/nghttp2.py index 43319efe4..08adaec68 100644 --- a/gvsbuild/projects/nghttp2.py +++ b/gvsbuild/projects/nghttp2.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "nghttp2", - version="1.54.0", + version="1.55.1", archive_url="https://github.com/nghttp2/nghttp2/releases/download/v{version}/nghttp2-{version}.tar.xz", - hash="20533c9354fbb6aa689b6aa0ddb77f91da1d242587444502832e1864308152df", + hash="19490b7c8c2ded1cf7c3e3a54ef4304e3a7876ae2d950d60a81d0dc6053be419", dependencies=[ "cmake", "zlib", From 2c63f8dc769e1ef0efe7c7e223c008e52c93c8e7 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 22 Jul 2023 15:02:42 -0400 Subject: [PATCH 24/80] Update dependencies to fix PyYaml version issue --- poetry.lock | 381 +++++++++++++++++++++++++++------------------------- 1 file changed, 201 insertions(+), 180 deletions(-) diff --git a/poetry.lock b/poetry.lock index 42a4b1540..188431510 100644 --- a/poetry.lock +++ b/poetry.lock @@ -54,13 +54,13 @@ virtualenv = ["virtualenv (>=20.0.35)"] [[package]] name = "cachecontrol" -version = "0.12.6" +version = "0.12.11" description = "httplib2 caching for requests" optional = true -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" files = [ - {file = "CacheControl-0.12.6-py2.py3-none-any.whl", hash = "sha256:10d056fa27f8563a271b345207402a6dcce8efab7e5b377e270329c62471b10d"}, - {file = "CacheControl-0.12.6.tar.gz", hash = "sha256:be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8"}, + {file = "CacheControl-0.12.11-py2.py3-none-any.whl", hash = "sha256:2c75d6a8938cb1933c75c50184549ad42728a27e9f6b92fd677c3151aa72555b"}, + {file = "CacheControl-0.12.11.tar.gz", hash = "sha256:a5b9fcc986b184db101aa280b42ecdcdfc524892596f606858e0b7a8b4d9e144"}, ] [package.dependencies] @@ -84,13 +84,13 @@ files = [ [[package]] name = "certifi" -version = "2022.12.7" +version = "2023.7.22" description = "Python package for providing Mozilla's CA Bundle." optional = true python-versions = ">=3.6" files = [ - {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"}, - {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"}, + {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"}, + {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, ] [[package]] @@ -117,97 +117,97 @@ files = [ [[package]] name = "charset-normalizer" -version = "3.1.0" +version = "3.2.0" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." optional = true python-versions = ">=3.7.0" files = [ - {file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"}, - {file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"}, + {file = "charset-normalizer-3.2.0.tar.gz", hash = "sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-win32.whl", hash = "sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-win32.whl", hash = "sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-win32.whl", hash = "sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-win32.whl", hash = "sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-win32.whl", hash = "sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80"}, + {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"}, ] [[package]] name = "click" -version = "8.1.3" +version = "8.1.6" description = "Composable command line interface toolkit" optional = false python-versions = ">=3.7" files = [ - {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"}, - {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"}, + {file = "click-8.1.6-py3-none-any.whl", hash = "sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5"}, + {file = "click-8.1.6.tar.gz", hash = "sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd"}, ] [package.dependencies] @@ -224,29 +224,15 @@ files = [ {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -[[package]] -name = "commonmark" -version = "0.9.1" -description = "Python parser for the CommonMark Markdown spec" -optional = false -python-versions = "*" -files = [ - {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"}, - {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"}, -] - -[package.extras] -test = ["flake8 (==3.7.8)", "hypothesis (==3.55.3)"] - [[package]] name = "distlib" -version = "0.3.6" +version = "0.3.7" description = "Distribution utilities" optional = false python-versions = "*" files = [ - {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"}, - {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"}, + {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"}, + {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"}, ] [[package]] @@ -262,13 +248,13 @@ files = [ [[package]] name = "exceptiongroup" -version = "1.1.1" +version = "1.1.2" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" files = [ - {file = "exceptiongroup-1.1.1-py3-none-any.whl", hash = "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e"}, - {file = "exceptiongroup-1.1.1.tar.gz", hash = "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"}, + {file = "exceptiongroup-1.1.2-py3-none-any.whl", hash = "sha256:e346e69d186172ca7cf029c8c1d16235aa0e04035e5750b4b95039e65204328f"}, + {file = "exceptiongroup-1.1.2.tar.gz", hash = "sha256:12c3e887d6485d16943a309616de20ae5582633e0a2eda17f4e10fd61c1e8af5"}, ] [package.extras] @@ -305,13 +291,13 @@ testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "p [[package]] name = "identify" -version = "2.5.23" +version = "2.5.25" description = "File identification library for Python" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "identify-2.5.23-py2.py3-none-any.whl", hash = "sha256:17d9351c028a781456965e781ed2a435755cac655df1ebd930f7186b54399312"}, - {file = "identify-2.5.23.tar.gz", hash = "sha256:50b01b9d5f73c6b53e5fa2caf9f543d3e657a9d0bbdeb203ebb8d45960ba7433"}, + {file = "identify-2.5.25-py2.py3-none-any.whl", hash = "sha256:9df2489842707d431b38ce3410ef8df40da5b10a3e28a3fcac1a42523e956409"}, + {file = "identify-2.5.25.tar.gz", hash = "sha256:db4de0e758c0db8f81996816cd2f3f2f8c5c8d49a7fd02f3b4109aac6fd80e29"}, ] [package.extras] @@ -381,6 +367,41 @@ files = [ {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, ] +[[package]] +name = "markdown-it-py" +version = "3.0.0" +description = "Python port of markdown-it. Markdown parsing, done right!" +optional = false +python-versions = ">=3.8" +files = [ + {file = "markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"}, + {file = "markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1"}, +] + +[package.dependencies] +mdurl = ">=0.1,<1.0" + +[package.extras] +benchmarking = ["psutil", "pytest", "pytest-benchmark"] +code-style = ["pre-commit (>=3.0,<4.0)"] +compare = ["commonmark (>=0.9,<1.0)", "markdown (>=3.4,<4.0)", "mistletoe (>=1.0,<2.0)", "mistune (>=2.0,<3.0)", "panflute (>=2.3,<3.0)"] +linkify = ["linkify-it-py (>=1,<3)"] +plugins = ["mdit-py-plugins"] +profiling = ["gprof2dot"] +rtd = ["jupyter_sphinx", "mdit-py-plugins", "myst-parser", "pyyaml", "sphinx", "sphinx-copybutton", "sphinx-design", "sphinx_book_theme"] +testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] + +[[package]] +name = "mdurl" +version = "0.1.2" +description = "Markdown URL utilities" +optional = false +python-versions = ">=3.7" +files = [ + {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, + {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, +] + [[package]] name = "msgpack" version = "1.0.5" @@ -455,13 +476,13 @@ files = [ [[package]] name = "nodeenv" -version = "1.7.0" +version = "1.8.0" description = "Node.js virtual environment builder" optional = false python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*" files = [ - {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"}, - {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"}, + {file = "nodeenv-1.8.0-py2.py3-none-any.whl", hash = "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec"}, + {file = "nodeenv-1.8.0.tar.gz", hash = "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2"}, ] [package.dependencies] @@ -480,13 +501,13 @@ files = [ [[package]] name = "platformdirs" -version = "3.8.1" +version = "3.9.1" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." optional = false python-versions = ">=3.7" files = [ - {file = "platformdirs-3.8.1-py3-none-any.whl", hash = "sha256:cec7b889196b9144d088e4c57d9ceef7374f6c39694ad1577a0aab50d27ea28c"}, - {file = "platformdirs-3.8.1.tar.gz", hash = "sha256:f87ca4fcff7d2b0f81c6a748a77973d7af0f4d526f98f308477c3c436c74d528"}, + {file = "platformdirs-3.9.1-py3-none-any.whl", hash = "sha256:ad8291ae0ae5072f66c16945166cb11c63394c7a3ad1b1bc9828ca3162da8c2f"}, + {file = "platformdirs-3.9.1.tar.gz", hash = "sha256:1b42b450ad933e981d56e59f1b97495428c9bd60698baab9f3eb3d00d5822421"}, ] [package.extras] @@ -542,13 +563,13 @@ plugins = ["importlib-metadata"] [[package]] name = "pyproject-api" -version = "1.5.2" +version = "1.5.3" description = "API to interact with the python pyproject.toml based projects" optional = false python-versions = ">=3.7" files = [ - {file = "pyproject_api-1.5.2-py3-none-any.whl", hash = "sha256:9cffcbfb64190f207444d7579d315f3278f2c04ba46d685fad93197b5326d348"}, - {file = "pyproject_api-1.5.2.tar.gz", hash = "sha256:999f58fa3c92b23ebd31a6bad5d1f87d456744d75e05391be7f5c729015d3d91"}, + {file = "pyproject_api-1.5.3-py3-none-any.whl", hash = "sha256:14cf09828670c7b08842249c1f28c8ee6581b872e893f81b62d5465bec41502f"}, + {file = "pyproject_api-1.5.3.tar.gz", hash = "sha256:ffb5b2d7cad43f5b2688ab490de7c4d3f6f15e0b819cb588c4b771567c9729eb"}, ] [package.dependencies] @@ -611,51 +632,51 @@ six = ">=1.5" [[package]] name = "pyyaml" -version = "6.0" +version = "6.0.1" description = "YAML parser and emitter for Python" optional = false python-versions = ">=3.6" files = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"}, - {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"}, - {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, + {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"}, + {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, + {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, + {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win32.whl", hash = "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa"}, + {file = "PyYAML-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win32.whl", hash = "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867"}, + {file = "PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, + {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, + {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, + {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, ] [[package]] @@ -681,37 +702,37 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "rich" -version = "12.6.0" +version = "13.4.2" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" optional = false -python-versions = ">=3.6.3,<4.0.0" +python-versions = ">=3.7.0" files = [ - {file = "rich-12.6.0-py3-none-any.whl", hash = "sha256:a4eb26484f2c82589bd9a17c73d32a010b1e29d89f1604cd9bf3a2097b81bb5e"}, - {file = "rich-12.6.0.tar.gz", hash = "sha256:ba3a3775974105c221d31141f2c116f4fd65c5ceb0698657a11e9f295ec93fd0"}, + {file = "rich-13.4.2-py3-none-any.whl", hash = "sha256:8f87bc7ee54675732fa66a05ebfe489e27264caeeff3728c945d25971b6485ec"}, + {file = "rich-13.4.2.tar.gz", hash = "sha256:d653d6bccede5844304c605d5aac802c7cf9621efd700b46c7ec2b51ea914898"}, ] [package.dependencies] -commonmark = ">=0.9.0,<0.10.0" -pygments = ">=2.6.0,<3.0.0" +markdown-it-py = ">=2.2.0" +pygments = ">=2.13.0,<3.0.0" typing-extensions = {version = ">=4.0.0,<5.0", markers = "python_version < \"3.9\""} [package.extras] -jupyter = ["ipywidgets (>=7.5.1,<8.0.0)"] +jupyter = ["ipywidgets (>=7.5.1,<9)"] [[package]] name = "setuptools" -version = "67.7.2" +version = "68.0.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.7" files = [ - {file = "setuptools-67.7.2-py3-none-any.whl", hash = "sha256:23aaf86b85ca52ceb801d32703f12d77517b2556af839621c641fca11287952b"}, - {file = "setuptools-67.7.2.tar.gz", hash = "sha256:f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990"}, + {file = "setuptools-68.0.0-py3-none-any.whl", hash = "sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f"}, + {file = "setuptools-68.0.0.tar.gz", hash = "sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235"}, ] [package.extras] docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] +testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] [[package]] @@ -841,24 +862,24 @@ test = ["black (>=22.3.0,<23.0.0)", "coverage (>=6.2,<7.0)", "isort (>=5.0.6,<6. [[package]] name = "typing-extensions" -version = "4.5.0" +version = "4.7.1" description = "Backported and Experimental Type Hints for Python 3.7+" optional = false python-versions = ">=3.7" files = [ - {file = "typing_extensions-4.5.0-py3-none-any.whl", hash = "sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4"}, - {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"}, + {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"}, + {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"}, ] [[package]] name = "urllib3" -version = "1.26.15" +version = "1.26.16" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = true python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ - {file = "urllib3-1.26.15-py2.py3-none-any.whl", hash = "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"}, - {file = "urllib3-1.26.15.tar.gz", hash = "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305"}, + {file = "urllib3-1.26.16-py2.py3-none-any.whl", hash = "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f"}, + {file = "urllib3-1.26.16.tar.gz", hash = "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14"}, ] [package.extras] @@ -868,13 +889,13 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "virtualenv" -version = "20.23.1" +version = "20.24.1" description = "Virtual Python Environment builder" optional = false python-versions = ">=3.7" files = [ - {file = "virtualenv-20.23.1-py3-none-any.whl", hash = "sha256:34da10f14fea9be20e0fd7f04aba9732f84e593dac291b757ce42e3368a39419"}, - {file = "virtualenv-20.23.1.tar.gz", hash = "sha256:8ff19a38c1021c742148edc4f81cb43d7f8c6816d2ede2ab72af5b84c749ade1"}, + {file = "virtualenv-20.24.1-py3-none-any.whl", hash = "sha256:01aacf8decd346cf9a865ae85c0cdc7f64c8caa07ff0d8b1dfc1733d10677442"}, + {file = "virtualenv-20.24.1.tar.gz", hash = "sha256:2ef6a237c31629da6442b0bcaa3999748108c7166318d1f55cc9f8d7294e97bd"}, ] [package.dependencies] From afd8aa4723b6660e9af748ab2257f5c277bf63b4 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Fri, 28 Jul 2023 22:02:36 -0400 Subject: [PATCH 25/80] Update cmake to version 3.27.1 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index daeee8757..8cd412d5b 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -68,9 +68,9 @@ def __init__(self): Tool.__init__( self, "cmake", - version="3.27.0", + version="3.27.1", archive_url="https://github.com/Kitware/CMake/releases/download/v{version}/cmake-{version}-windows-x86_64.zip", - hash="fc5f901ef4d438eafbe35b24c608d5de11e517f157b3b7ab8ebbaa7c3c0171d2", + hash="664fe1655999f0b693d1e64ddb430191c727ab0a03dc1da7278f291172e1e04e", dir_part="cmake-{version}-windows-x86_64", ) From 58a915d6c7801b636714ffc45b7abb6670ae3d78 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 29 Jul 2023 11:11:50 -0400 Subject: [PATCH 26/80] Fix paths with spaces in meson_params --- gvsbuild/projects/gobject_introspection.py | 3 +-- gvsbuild/projects/gstreamer.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gvsbuild/projects/gobject_introspection.py b/gvsbuild/projects/gobject_introspection.py index cba2ae7c7..88973f2be 100644 --- a/gvsbuild/projects/gobject_introspection.py +++ b/gvsbuild/projects/gobject_introspection.py @@ -61,6 +61,5 @@ def build(self): Meson.build( self, - meson_params="-Dpython=%s\\python.exe -Dcairo_libname=cairo-gobject-2.dll" - % (py_dir,), + meson_params=f'-Dpython="{py_dir}\\python.exe" -Dcairo_libname=cairo-gobject-2.dll', ) diff --git a/gvsbuild/projects/gstreamer.py b/gvsbuild/projects/gstreamer.py index 61f56f79f..86dbfb4f3 100644 --- a/gvsbuild/projects/gstreamer.py +++ b/gvsbuild/projects/gstreamer.py @@ -117,7 +117,7 @@ def __init__(self): def build(self): Meson.build( - self, meson_params=f"-Dc_link_args={self.builder.gtk_dir}\\lib\\ogg.lib" + self, meson_params=f'-Dc_link_args="{self.builder.gtk_dir}\\lib\\ogg.lib"' ) self.install(r".\COPYING share\doc\gst-plugins-base") From fdd2eaee2020351e854b8142f6418b6f79d21d66 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Tue, 1 Aug 2023 16:26:33 +0200 Subject: [PATCH 27/80] libarchive: update to 3.7.1 --- gvsbuild/projects/libarchive.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libarchive.py b/gvsbuild/projects/libarchive.py index 51849751b..f5624ee21 100644 --- a/gvsbuild/projects/libarchive.py +++ b/gvsbuild/projects/libarchive.py @@ -29,9 +29,9 @@ def __init__(self): Project.__init__( self, "libarchive", - version="3.7.0", + version="3.7.1", archive_url="https://libarchive.org/downloads/libarchive-{version}.tar.xz", - hash="44729a0cc3b0b0be6742a9873d25e85e240c9318f5f5ebf2cca6bc84d7b91b07", + hash="b17403ce670ff18d8e06fea05a9ea9accf70678c88f1b9392a2e29b51127895f", dependencies=[ "cmake", "ninja", From b36add38fb59dadd9b44e6b380a92262d2f7a815 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Tue, 1 Aug 2023 18:10:03 +0200 Subject: [PATCH 28/80] openssl: update to 3.1.2 --- gvsbuild/projects/openssl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/openssl.py b/gvsbuild/projects/openssl.py index e839697a9..745437ffd 100644 --- a/gvsbuild/projects/openssl.py +++ b/gvsbuild/projects/openssl.py @@ -27,9 +27,9 @@ def __init__(self): Project.__init__( self, "openssl", - version="3.1.1", + version="3.1.2", archive_url="https://www.openssl.org/source/openssl-{version}.tar.gz", - hash="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674", + hash="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539", dependencies=[ "perl", "nasm", From ac204e98aace3eec616712c28cfae929f00cc565 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Tue, 1 Aug 2023 21:22:38 -0400 Subject: [PATCH 29/80] Update harfbuzz to version 8.1.0 --- gvsbuild/projects/harfbuzz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/harfbuzz.py b/gvsbuild/projects/harfbuzz.py index f13269208..a8de56946 100644 --- a/gvsbuild/projects/harfbuzz.py +++ b/gvsbuild/projects/harfbuzz.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "harfbuzz", - version="8.0.1", + version="8.1.0", archive_url="https://github.com/harfbuzz/harfbuzz/releases/download/{version}/harfbuzz-{version}.tar.xz", - hash="c1ce780acd385569f25b9a29603d1d5bc71e6940e55bfdd4f7266fad50e42620", + hash="639596da7c26cc503b16b3bf4dfdca77fe832d3c9e06004ef63a7ce53cafbac9", dependencies=["meson", "cmake", "freetype", "pkgconf", "glib"], ) From 6ae4ce6ab123d852bed96b90041e16362781f38a Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Tue, 1 Aug 2023 21:27:01 -0400 Subject: [PATCH 30/80] Update go to version 1.20.7 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index 8cd412d5b..cbf80426b 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -211,9 +211,9 @@ def __init__(self): Tool.__init__( self, "go", - version="1.20.6", + version="1.20.7", archive_url="https://go.dev/dl/go{version}.windows-amd64.zip", - hash="b67dd7f2b4589701e53c98e348e1b4d9a7c3536dc316941172b2f0b60ae4ce5f", + hash="736dc6c7fcab1c96b682c8c93e38d7e371e62a17d34cb2c37d451a1147f66af9", dir_part="go-{version}", ) From 9f8564d6c2d8830b35a38756961a6682ceefe533 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Tue, 1 Aug 2023 21:35:34 -0400 Subject: [PATCH 31/80] Update libcurl to version 8.2.1 --- gvsbuild/projects/libcurl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libcurl.py b/gvsbuild/projects/libcurl.py index 8c7e77a6b..e483f5175 100644 --- a/gvsbuild/projects/libcurl.py +++ b/gvsbuild/projects/libcurl.py @@ -29,10 +29,10 @@ def __init__(self): Project.__init__( self, "libcurl", - version="8.2.0", + version="8.2.1", repository="https://github.com/curl/curl", archive_url="https://github.com/curl/curl/releases/download/curl-{major}_{minor}_{micro}/curl-{version}.tar.xz", - hash="2859ec79e2cd96e976a99493547359b8001af1d1e21f3a3a3b846544ef54500f", + hash="dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894", dependencies=[ "perl", "cmake", From 0c6fc8f7472dd180c9c9ea611a1b202279689528 Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Wed, 2 Aug 2023 12:46:19 +0200 Subject: [PATCH 32/80] expat: add patch to remove postfix d --- ...do-not-add-postfix-d-in-debug-builds.patch | 25 +++++++++++++++++++ gvsbuild/projects/expat.py | 17 +------------ 2 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 gvsbuild/patches/expat/0001-CMakeLists-do-not-add-postfix-d-in-debug-builds.patch diff --git a/gvsbuild/patches/expat/0001-CMakeLists-do-not-add-postfix-d-in-debug-builds.patch b/gvsbuild/patches/expat/0001-CMakeLists-do-not-add-postfix-d-in-debug-builds.patch new file mode 100644 index 000000000..6f2274044 --- /dev/null +++ b/gvsbuild/patches/expat/0001-CMakeLists-do-not-add-postfix-d-in-debug-builds.patch @@ -0,0 +1,25 @@ +From cefae9cae833348b5954edb9b214c477a212a434 Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Wed, 2 Aug 2023 12:43:56 +0200 +Subject: [PATCH] CMakeLists: do not add postfix d in debug builds + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 72cf0b01..842f900c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -426,7 +426,7 @@ foreach(build_type_upper + RELWITHDEBINFO + ) + if(WIN32 AND build_type_upper STREQUAL "DEBUG") +- set(_POSTFIX_DEBUG "d") ++ set(_POSTFIX_DEBUG "") + else() + set(_POSTFIX_DEBUG "") # needs a reset because of being looped + endif() +-- +2.34.1 + diff --git a/gvsbuild/projects/expat.py b/gvsbuild/projects/expat.py index 750fc70a2..c179df2f9 100644 --- a/gvsbuild/projects/expat.py +++ b/gvsbuild/projects/expat.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . -from pathlib import Path - from gvsbuild.utils.base_builders import CmakeProject from gvsbuild.utils.base_expanders import Tarball from gvsbuild.utils.base_project import Project, project_add @@ -33,22 +31,9 @@ def __init__(self): archive_url="https://github.com/libexpat/libexpat/releases/download/R_{major}_{minor}_{micro}/expat-{version}.tar.xz", hash="ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe", dependencies=["cmake", "ninja"], + patches=["0001-CMakeLists-do-not-add-postfix-d-in-debug-builds.patch"], ) def build(self): CmakeProject.build(self, use_ninja=True) self.install(r".\COPYING share\doc\expat") - - def post_install(self): - if self.builder.opts.configuration == "debug": - # Fontconfig is looking for libexpat, not libexpatd - bin_dir = Path(self.builder.gtk_dir) / "bin" - self.builder.exec_msys( - ["mv", "libexpatd.dll", "libexpat.dll"], - working_dir=bin_dir, - ) - lib_dir = Path(self.builder.gtk_dir) / "lib" - self.builder.exec_msys( - ["mv", "libexpatd.lib", "libexpat.lib"], - working_dir=lib_dir, - ) From e2eced77d09c73562498ca7570a8b4f03c2d63c8 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sun, 6 Aug 2023 17:43:36 -0400 Subject: [PATCH 33/80] Update GTK to version 4.12.0 --- gvsbuild/projects/gtk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/gtk.py b/gvsbuild/projects/gtk.py index 8b25b1c30..3ab9e1cfc 100644 --- a/gvsbuild/projects/gtk.py +++ b/gvsbuild/projects/gtk.py @@ -124,12 +124,12 @@ def __init__(self): self, "gtk4", prj_dir="gtk4", - version="4.10.4", + version="4.12.0", lastversion_major=4, lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/gtk", archive_url="https://download.gnome.org/sources/gtk/{major}.{minor}/gtk-{version}.tar.xz", - hash="7725400482e0685e28265e226c62847f4e73cfca9e9b416ac5838207f5377a24", + hash="a6d10829f405b1afc0b65e2a9642c04126a1d1b638d11c6d97426da4f84f1f6f", dependencies=[ "gdk-pixbuf", "pango", From b9aba050f3cae9ba7081408f8d2d38061afc0326 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sun, 6 Aug 2023 17:44:32 -0400 Subject: [PATCH 34/80] Update cargo to version 1.71.1 --- gvsbuild/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index cbf80426b..0f445f070 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -30,7 +30,7 @@ def __init__(self): Tool.__init__( self, "cargo", - version="1.71.0", + version="1.71.1", repository="rust-lang/rust", archive_url="https://win.rustup.rs/x86_64", archive_file_name="rustup-init.exe", From 4255f34f0580bd3a0affc18f4c336f314a79ce06 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sun, 6 Aug 2023 17:46:38 -0400 Subject: [PATCH 35/80] Update harfbuzz to version 8.1.1 --- gvsbuild/projects/harfbuzz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/harfbuzz.py b/gvsbuild/projects/harfbuzz.py index a8de56946..9d39c2fe9 100644 --- a/gvsbuild/projects/harfbuzz.py +++ b/gvsbuild/projects/harfbuzz.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "harfbuzz", - version="8.1.0", + version="8.1.1", archive_url="https://github.com/harfbuzz/harfbuzz/releases/download/{version}/harfbuzz-{version}.tar.xz", - hash="639596da7c26cc503b16b3bf4dfdca77fe832d3c9e06004ef63a7ce53cafbac9", + hash="0305ad702e11906a5fc0c1ba11c270b7f64a8f5390d676aacfd71db129d6565f", dependencies=["meson", "cmake", "freetype", "pkgconf", "glib"], ) From 60302ae24b8b221ea06105278d5b200b28f691e8 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sun, 6 Aug 2023 17:50:14 -0400 Subject: [PATCH 36/80] Bump version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f8b13ad42..90552f82f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gvsbuild" -version = "2023.7.1" +version = "2023.8.0" description = "GTK stack for Windows" authors = ["Ignacio Casal Quinteiro ", "Dan Yeaw "] license = "GPL-2.0-only" From c169d0f04567dc22fb1a8424f0d55a0a35be01b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 07:42:42 -0400 Subject: [PATCH 37/80] build(deps-dev): bump tox from 4.6.4 to 4.7.0 (#1028) Bumps [tox](https://github.com/tox-dev/tox) from 4.6.4 to 4.7.0. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/4.6.4...4.7.0) --- updated-dependencies: - dependency-name: tox dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- poetry.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index 188431510..ddcdb0149 100644 --- a/poetry.lock +++ b/poetry.lock @@ -791,13 +791,13 @@ files = [ [[package]] name = "tox" -version = "4.6.4" +version = "4.7.0" description = "tox is a generic virtualenv management and test command line tool" optional = false python-versions = ">=3.7" files = [ - {file = "tox-4.6.4-py3-none-any.whl", hash = "sha256:1b8f8ae08d6a5475cad9d508236c51ea060620126fd7c3c513d0f5c7f29cc776"}, - {file = "tox-4.6.4.tar.gz", hash = "sha256:5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda"}, + {file = "tox-4.7.0-py3-none-any.whl", hash = "sha256:79399a3d4641d1fd15eb6bd62c2f35923988038bf0ecf37a688b5e7a767de7d7"}, + {file = "tox-4.7.0.tar.gz", hash = "sha256:89120e1568c763924301cfde61ba7d4b5c4615eeb1086d5370deb03e9cf63c41"}, ] [package.dependencies] @@ -806,15 +806,15 @@ chardet = ">=5.1" colorama = ">=0.4.6" filelock = ">=3.12.2" packaging = ">=23.1" -platformdirs = ">=3.8" +platformdirs = ">=3.9.1" pluggy = ">=1.2" -pyproject-api = ">=1.5.2" +pyproject-api = ">=1.5.3" tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""} -virtualenv = ">=20.23.1" +virtualenv = ">=20.24.1" [package.extras] docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.23.3,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] -testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.6)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"] +testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.7)", "distlib (>=0.3.7)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"] [[package]] name = "tqdm" From c5eefc64dd0d01de1fea4c8dc3b3d6ebf24e88a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 13:40:22 -0500 Subject: [PATCH 38/80] build(deps-dev): bump tox from 4.7.0 to 4.8.0 (#1029) Bumps [tox](https://github.com/tox-dev/tox) from 4.7.0 to 4.8.0. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/4.7.0...4.8.0) --- updated-dependencies: - dependency-name: tox dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index ddcdb0149..814af4c15 100644 --- a/poetry.lock +++ b/poetry.lock @@ -791,13 +791,13 @@ files = [ [[package]] name = "tox" -version = "4.7.0" +version = "4.8.0" description = "tox is a generic virtualenv management and test command line tool" optional = false python-versions = ">=3.7" files = [ - {file = "tox-4.7.0-py3-none-any.whl", hash = "sha256:79399a3d4641d1fd15eb6bd62c2f35923988038bf0ecf37a688b5e7a767de7d7"}, - {file = "tox-4.7.0.tar.gz", hash = "sha256:89120e1568c763924301cfde61ba7d4b5c4615eeb1086d5370deb03e9cf63c41"}, + {file = "tox-4.8.0-py3-none-any.whl", hash = "sha256:4991305a56983d750a0d848a34242be290452aa88d248f1bf976e4036ee8b213"}, + {file = "tox-4.8.0.tar.gz", hash = "sha256:2adacf435b12ccf10b9dfa9975d8ec0afd7cbae44d300463140d2117b968037b"}, ] [package.dependencies] From a28103f57ea504ce9c8743feb9446da8bbab2773 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 20:49:10 -0400 Subject: [PATCH 39/80] build(deps-dev): bump tox from 4.8.0 to 4.9.0 (#1031) Bumps [tox](https://github.com/tox-dev/tox) from 4.8.0 to 4.9.0. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/4.8.0...4.9.0) --- updated-dependencies: - dependency-name: tox dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- poetry.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/poetry.lock b/poetry.lock index 814af4c15..b8946da0e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -106,13 +106,13 @@ files = [ [[package]] name = "chardet" -version = "5.1.0" +version = "5.2.0" description = "Universal encoding detector for Python 3" optional = false python-versions = ">=3.7" files = [ - {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"}, - {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"}, + {file = "chardet-5.2.0-py3-none-any.whl", hash = "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970"}, + {file = "chardet-5.2.0.tar.gz", hash = "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7"}, ] [[package]] @@ -501,18 +501,18 @@ files = [ [[package]] name = "platformdirs" -version = "3.9.1" +version = "3.10.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." optional = false python-versions = ">=3.7" files = [ - {file = "platformdirs-3.9.1-py3-none-any.whl", hash = "sha256:ad8291ae0ae5072f66c16945166cb11c63394c7a3ad1b1bc9828ca3162da8c2f"}, - {file = "platformdirs-3.9.1.tar.gz", hash = "sha256:1b42b450ad933e981d56e59f1b97495428c9bd60698baab9f3eb3d00d5822421"}, + {file = "platformdirs-3.10.0-py3-none-any.whl", hash = "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d"}, + {file = "platformdirs-3.10.0.tar.gz", hash = "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d"}, ] [package.extras] -docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)"] +docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"] +test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"] [[package]] name = "pluggy" @@ -791,30 +791,30 @@ files = [ [[package]] name = "tox" -version = "4.8.0" +version = "4.9.0" description = "tox is a generic virtualenv management and test command line tool" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "tox-4.8.0-py3-none-any.whl", hash = "sha256:4991305a56983d750a0d848a34242be290452aa88d248f1bf976e4036ee8b213"}, - {file = "tox-4.8.0.tar.gz", hash = "sha256:2adacf435b12ccf10b9dfa9975d8ec0afd7cbae44d300463140d2117b968037b"}, + {file = "tox-4.9.0-py3-none-any.whl", hash = "sha256:c80de60fe26f9a009b0a763888bf2099ccfbef50a0279a6b9f6de40eb4eb7457"}, + {file = "tox-4.9.0.tar.gz", hash = "sha256:9b6d38fe422599d084afd89375b4803f4bc1f8f16573c77c8fd8ffcc6938f1ff"}, ] [package.dependencies] cachetools = ">=5.3.1" -chardet = ">=5.1" +chardet = ">=5.2" colorama = ">=0.4.6" filelock = ">=3.12.2" packaging = ">=23.1" -platformdirs = ">=3.9.1" +platformdirs = ">=3.10" pluggy = ">=1.2" pyproject-api = ">=1.5.3" tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""} -virtualenv = ">=20.24.1" +virtualenv = ">=20.24.3" [package.extras] -docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.23.3,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] -testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.7)", "distlib (>=0.3.7)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"] +docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.24)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.7)", "distlib (>=0.3.7)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.18)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.12)", "wheel (>=0.41.1)"] [[package]] name = "tqdm" @@ -889,23 +889,23 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "virtualenv" -version = "20.24.1" +version = "20.24.3" description = "Virtual Python Environment builder" optional = false python-versions = ">=3.7" files = [ - {file = "virtualenv-20.24.1-py3-none-any.whl", hash = "sha256:01aacf8decd346cf9a865ae85c0cdc7f64c8caa07ff0d8b1dfc1733d10677442"}, - {file = "virtualenv-20.24.1.tar.gz", hash = "sha256:2ef6a237c31629da6442b0bcaa3999748108c7166318d1f55cc9f8d7294e97bd"}, + {file = "virtualenv-20.24.3-py3-none-any.whl", hash = "sha256:95a6e9398b4967fbcb5fef2acec5efaf9aa4972049d9ae41f95e0972a683fd02"}, + {file = "virtualenv-20.24.3.tar.gz", hash = "sha256:e5c3b4ce817b0b328af041506a2a299418c98747c4b1e68cb7527e74ced23efc"}, ] [package.dependencies] -distlib = ">=0.3.6,<1" -filelock = ">=3.12,<4" -platformdirs = ">=3.5.1,<4" +distlib = ">=0.3.7,<1" +filelock = ">=3.12.2,<4" +platformdirs = ">=3.9.1,<4" [package.extras] docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] -test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.3.1)", "pytest-env (>=0.8.1)", "pytest-freezer (>=0.4.6)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=67.8)", "time-machine (>=2.9)"] +test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] [extras] outdated = ["lastversion", "packaging"] From 15783f9fcd0efae9b3921c1b9808bd25af357e2d Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Wed, 16 Aug 2023 19:36:37 -0400 Subject: [PATCH 40/80] Update gtkmm to version 4.12.0 --- gvsbuild/projects/gtkmm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/gtkmm.py b/gvsbuild/projects/gtkmm.py index e04e4673d..74935957a 100644 --- a/gvsbuild/projects/gtkmm.py +++ b/gvsbuild/projects/gtkmm.py @@ -27,12 +27,12 @@ def __init__(self): self, "gtkmm", prj_dir="gtkmm", - version="4.10.0", + version="4.12.0", lastversion_major=4, lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/gtkmm", archive_url="https://download.gnome.org/sources/gtkmm/{major}.{minor}/gtkmm-{version}.tar.xz", - hash="e1b109771557ecc53cba915a80b6ede827ffdbd0049c62fdf8bd7fa79afcc6eb", + hash="fbc3e7618123345c0148ef71abb6548d421f52bb224fbda34875b677dc032c92", dependencies=[ "gdk-pixbuf", "pangomm", From 1938e8f7a2ec51c479ebcde7dfe503056f8776a4 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Wed, 16 Aug 2023 19:38:32 -0400 Subject: [PATCH 41/80] Update Go to version 1.21.0 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index 0f445f070..d07f642ba 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -211,9 +211,9 @@ def __init__(self): Tool.__init__( self, "go", - version="1.20.7", + version="1.21.0", archive_url="https://go.dev/dl/go{version}.windows-amd64.zip", - hash="736dc6c7fcab1c96b682c8c93e38d7e371e62a17d34cb2c37d451a1147f66af9", + hash="732121e64e0ecb07c77fdf6cc1bc5ce7b242c2d40d4ac29021ad4c64a08731f6", dir_part="go-{version}", ) From e8759df797b066791aec095d3511c6c64b2dd273 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Wed, 16 Aug 2023 19:39:51 -0400 Subject: [PATCH 42/80] Update Meson to version 1.2.1 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index d07f642ba..1c97ef199 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -95,10 +95,10 @@ def __init__(self): Tool.__init__( self, "meson", - version="1.2.0", + version="1.2.1", archive_url="https://github.com/mesonbuild/meson/archive/refs/tags/{version}.tar.gz", archive_file_name="meson-{version}.tar.gz", - hash="603489f0aaa6305f806c6cc4a4455a965f22290fc74f65871f589b002110c790", + hash="e1f3b32b636cc86496261bd89e63f00f206754697c7069788b62beed5e042713", dir_part="meson-{version}", exe_name="meson.py", ) From a2a24439993c75746cef21720307730afe618462 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Wed, 16 Aug 2023 19:42:26 -0400 Subject: [PATCH 43/80] Update CMake to version 3.27.3 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index 1c97ef199..c427cb1d3 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -68,9 +68,9 @@ def __init__(self): Tool.__init__( self, "cmake", - version="3.27.1", + version="3.27.3", archive_url="https://github.com/Kitware/CMake/releases/download/v{version}/cmake-{version}-windows-x86_64.zip", - hash="664fe1655999f0b693d1e64ddb430191c727ab0a03dc1da7278f291172e1e04e", + hash="9c11b58e50b00200c3b1ae5e05d35a87e4d8068e4c7b98ee4eab8740a79380ec", dir_part="cmake-{version}-windows-x86_64", ) From 7201f0a2a72d1a7ab341fa3327c41cadab616781 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Fri, 18 Aug 2023 13:38:42 -0400 Subject: [PATCH 44/80] Update pkgconf to version 2.0.2 --- gvsbuild/projects/pkgconf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/pkgconf.py b/gvsbuild/projects/pkgconf.py index 99e873b53..3fadf2a6c 100644 --- a/gvsbuild/projects/pkgconf.py +++ b/gvsbuild/projects/pkgconf.py @@ -27,9 +27,9 @@ def __init__(self): self, "pkgconf", prj_dir="pkgconf", - version="1.9.5", + version="2.0.2", archive_url="https://distfiles.ariadne.space/pkgconf/pkgconf-{version}.tar.gz", - hash="6466efd2e38c4c0ac5de4e345f0dc6dad57e689efb08c31f2a71547683d20dc7", + hash="dc285fd35f4777335304fd5fa5cef1e9e9b1e9bcc72cd353a207aa5471818142", dependencies=["ninja", "meson"], patches=["0001-libpkgconf-add-defines-to-unbreak-build-with-VS2013.patch"], ) From 7f782946c77a08bfc9ca429b710d087dff9fb95a Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Fri, 18 Aug 2023 13:40:37 -0400 Subject: [PATCH 45/80] Update zlib to version 1.3 --- gvsbuild/projects/zlib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/zlib.py b/gvsbuild/projects/zlib.py index b3d83f70d..9ace44a75 100644 --- a/gvsbuild/projects/zlib.py +++ b/gvsbuild/projects/zlib.py @@ -38,9 +38,9 @@ def __init__(self): Project.__init__( self, "zlib", - version="1.2.13", + version="1.3", archive_url="https://github.com/madler/zlib/releases/download/v{version}/zlib-{version}.tar.xz", - hash="d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98", + hash="8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7", ) def build(self): From 560fe969670d46fca988ab09505ce2868f04d050 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Mon, 21 Aug 2023 11:53:01 +0200 Subject: [PATCH 46/80] x264: Quote parameters --- gvsbuild/patches/x264/build/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/patches/x264/build/build.sh b/gvsbuild/patches/x264/build/build.sh index b8aba0d16..f6732b239 100644 --- a/gvsbuild/patches/x264/build/build.sh +++ b/gvsbuild/patches/x264/build/build.sh @@ -1,7 +1,7 @@ #!/bin/bash -prefix=$1 -build_type=$2 +prefix="$1" +build_type="$2" extra_flags="" extra_cflags="-DNO_PREFIX" From b47bfd14041c8a270b74c146c990f13c4b954b7f Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Mon, 21 Aug 2023 11:56:47 +0200 Subject: [PATCH 47/80] x264: Add missing make command --- gvsbuild/patches/x264/build/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gvsbuild/patches/x264/build/build.sh b/gvsbuild/patches/x264/build/build.sh index f6732b239..09050029f 100644 --- a/gvsbuild/patches/x264/build/build.sh +++ b/gvsbuild/patches/x264/build/build.sh @@ -12,4 +12,6 @@ if [ "$build_type" = "debug" ]; then fi CC=cl ./configure --enable-shared --prefix="$prefix" "$extra_flags" --extra-cflags="$extra_cflags" + +make make install From 76f419e7e27301b7e23e72b3568e217ad5edea67 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Thu, 17 Aug 2023 18:19:11 +0200 Subject: [PATCH 48/80] x264: Rework configure command Quoting $extra_flags doesn't work. The tailing space is taken into account as part of the option. ``` Building project x264 (git/bfc87b7a330f75f5c9a21e56081e4b20344f139e) Unknown option --enable-debug , ignored ``` See the space between --enable-debug and the comma. It is not supposed to be there: https://code.videolan.org/videolan/x264/-/blob/bfc87b7a330f75f5c9a21e56081e4b20344f139e/configure#L550 Patch inspired by FFmpeg build script: https://github.com/wingtk/gvsbuild/commit/499ad4a9fe58e287cd2ed85ec9d588debb791847 https://github.com/wingtk/gvsbuild/commit/0947abe2dba8c95a78611e8d5ce97681e78a3ab0 --- gvsbuild/patches/x264/build/build.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gvsbuild/patches/x264/build/build.sh b/gvsbuild/patches/x264/build/build.sh index 09050029f..de617d9c2 100644 --- a/gvsbuild/patches/x264/build/build.sh +++ b/gvsbuild/patches/x264/build/build.sh @@ -3,15 +3,20 @@ prefix="$1" build_type="$2" -extra_flags="" -extra_cflags="-DNO_PREFIX" +declare -a configure_cmd +declare -i idx=0 + +configure_cmd[idx++]="./configure" +configure_cmd[idx++]="--prefix=\"$prefix\"" +configure_cmd[idx++]="--enable-shared" +configure_cmd[idx++]="--extra-cflags=-DNO_PREFIX" if [ "$build_type" = "debug" ]; then - extra_flags="--enable-debug $extra_flags" - extra_cflags="-MDd -Od -Zi $extra_cflags" + configure_cmd[idx++]="--enable-debug" + configure_cmd[idx++]="--extra-cflags=-MDd -Od -Zi" fi -CC=cl ./configure --enable-shared --prefix="$prefix" "$extra_flags" --extra-cflags="$extra_cflags" +CC=cl "${configure_cmd[@]}" make make install From 53d0d68a4b3707486c88163e5bebd1c3662adb65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 07:03:38 +0000 Subject: [PATCH 49/80] build(deps-dev): bump tox from 4.9.0 to 4.10.0 Bumps [tox](https://github.com/tox-dev/tox) from 4.9.0 to 4.10.0. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/4.9.0...4.10.0) --- updated-dependencies: - dependency-name: tox dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index b8946da0e..7378a9182 100644 --- a/poetry.lock +++ b/poetry.lock @@ -791,13 +791,13 @@ files = [ [[package]] name = "tox" -version = "4.9.0" +version = "4.10.0" description = "tox is a generic virtualenv management and test command line tool" optional = false python-versions = ">=3.8" files = [ - {file = "tox-4.9.0-py3-none-any.whl", hash = "sha256:c80de60fe26f9a009b0a763888bf2099ccfbef50a0279a6b9f6de40eb4eb7457"}, - {file = "tox-4.9.0.tar.gz", hash = "sha256:9b6d38fe422599d084afd89375b4803f4bc1f8f16573c77c8fd8ffcc6938f1ff"}, + {file = "tox-4.10.0-py3-none-any.whl", hash = "sha256:e4a1b1438955a6da548d69a52350054350cf6a126658c20943261c48ed6d4c92"}, + {file = "tox-4.10.0.tar.gz", hash = "sha256:e041b2165375be690aca0ec4d96360c6906451380520e4665bf274f66112be35"}, ] [package.dependencies] From 58b7254a22613894b270cd6fc8fd63537a7adf5f Mon Sep 17 00:00:00 2001 From: Mofidul Jamal Date: Thu, 17 Aug 2023 22:52:43 -0400 Subject: [PATCH 50/80] Add libfido2 and libcbor Adding the libfido2 project and the libcbor project, as it is a dependency. Currently supported to build static libraries. --- ...cmake-script-to-have-sdl-flag-before.patch | 30 ++++++++++ gvsbuild/projects/__init__.py | 2 + gvsbuild/projects/libcbor.py | 43 ++++++++++++++ gvsbuild/projects/libfido2.py | 58 +++++++++++++++++++ 4 files changed, 133 insertions(+) create mode 100644 gvsbuild/patches/libfido2/0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch create mode 100644 gvsbuild/projects/libcbor.py create mode 100644 gvsbuild/projects/libfido2.py diff --git a/gvsbuild/patches/libfido2/0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch b/gvsbuild/patches/libfido2/0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch new file mode 100644 index 000000000..5c1939ce5 --- /dev/null +++ b/gvsbuild/patches/libfido2/0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch @@ -0,0 +1,30 @@ +From c3c7343d3a18de2f00f288db4969ec07cb1fae09 Mon Sep 17 00:00:00 2001 +From: Mofidul Jamal +Date: Fri, 18 Aug 2023 14:11:21 -0400 +Subject: [PATCH] libfido2: update cmake script to have /sdl flag before -W4 + and warning disabled flags + +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6fa341a..e97976c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -209,9 +209,9 @@ if(MSVC) + string(REPLACE "C" " -wd" MSVC_DISABLED_WARNINGS_STR + ${MSVC_DISABLED_WARNINGS_LIST}) + string(REGEX REPLACE "[/-]W[1234][ ]?" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MP -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}") +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Od /Z7 /guard:cf /sdl /RTCcsu") +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi /guard:cf /sdl") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /sdl -MP -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}") ++ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Od /Z7 /guard:cf /RTCcsu") ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi /guard:cf") + if(USE_WINHELLO) + add_definitions(-DUSE_WINHELLO) + endif() +-- +2.37.1.windows.1 + diff --git a/gvsbuild/projects/__init__.py b/gvsbuild/projects/__init__.py index 18c1d0ae1..e2b46e290 100644 --- a/gvsbuild/projects/__init__.py +++ b/gvsbuild/projects/__init__.py @@ -49,9 +49,11 @@ from gvsbuild.projects.lgi import Lgi from gvsbuild.projects.libadwaita import Libadwaita from gvsbuild.projects.libarchive import Libarchive +from gvsbuild.projects.libcbor import Libcbor from gvsbuild.projects.libcroco import Libcroco from gvsbuild.projects.libcurl import Libcurl from gvsbuild.projects.libepoxy import Libepoxy +from gvsbuild.projects.libfido2 import Libfido2 from gvsbuild.projects.libffi import Libffi from gvsbuild.projects.libgxps import Libgxps from gvsbuild.projects.libjpeg_turbo import LibjpegTurbo diff --git a/gvsbuild/projects/libcbor.py b/gvsbuild/projects/libcbor.py new file mode 100644 index 000000000..9df13ef6f --- /dev/null +++ b/gvsbuild/projects/libcbor.py @@ -0,0 +1,43 @@ +# Copyright (C) 2016 - Yevgen Muntyan +# Copyright (C) 2016 - Ignacio Casal Quinteiro +# Copyright (C) 2016 - Arnavion +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . + +from gvsbuild.utils.base_builders import CmakeProject +from gvsbuild.utils.base_expanders import Tarball +from gvsbuild.utils.base_project import Project, project_add + + +@project_add +class Libcbor(Tarball, CmakeProject): + def __init__(self): + Project.__init__( + self, + "libcbor", + version="0.10.2", + archive_url="https://github.com/PJK/libcbor/archive/refs/tags/v{version}.tar.gz", + hash="e75f712215d7b7e5c89ef322a09b701f7159f028b8b48978865725f00f79875b", + archive_filename="libcbor-{version}.tar.gz", + dependencies=["cmake", "ninja"], + ) + + def build(self): + # If do_install is True, the build fails + CmakeProject.build(self, use_ninja=True, do_install=False) + self.install(r"_gvsbuild-cmake\src\cbor.lib lib") + self.install(r"_gvsbuild-cmake\src\cbor\*.h include\cbor") + self.install(r"_gvsbuild-cmake\cbor\*.h include\cbor") + self.install(r"src\cbor.h include") + self.install(r"src\cbor\*.h include\cbor") diff --git a/gvsbuild/projects/libfido2.py b/gvsbuild/projects/libfido2.py new file mode 100644 index 000000000..81e745bfe --- /dev/null +++ b/gvsbuild/projects/libfido2.py @@ -0,0 +1,58 @@ +# Copyright (C) 2016 - Yevgen Muntyan +# Copyright (C) 2016 - Ignacio Casal Quinteiro +# Copyright (C) 2016 - Arnavion +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . + +import os + +from gvsbuild.utils.base_builders import CmakeProject +from gvsbuild.utils.base_expanders import Tarball +from gvsbuild.utils.base_project import Project, project_add + + +@project_add +class Libfido2(Tarball, CmakeProject): + def __init__(self): + Project.__init__( + self, + "libfido2", + version="1.13.0", + archive_url="https://developers.yubico.com/libfido2/Releases/libfido2-{version}.tar.gz", + hash="51d43727e2a1c4544c7fd0ee47786f443e39f1388ada735a509ad4af0a2459ca", + dependencies=[ + "cmake", + "ninja", + "zlib", + "openssl", + "libcbor", + ], + patches=["0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch"], + ) + + def build(self): + if self.builder.x86: + arch = "x86" + else: + arch = "x64" + + include_dirs = os.path.join(self.builder.gtk_dir, "inc") + lib_dirs = os.path.join(self.builder.gtk_dir, "lib") + bin_dirs = lib_dirs = os.path.join(self.builder.gtk_dir, "bin") + # Build static libs only for libfido2 + build_params = '-DBUILD_EXAMPLES=OFF -DBUILD_MANPAGES=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS_DEBUG="/MTd /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE" -DCMAKE_C_FLAGS_RELEASE="/MT /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE"' + cmake_params = f"-DWITH_ZLIB=ON -DCBOR_INCLUDE_DIRS={include_dirs} -DCRYPTO_INCLUDE_DIRS={include_dirs} -DZLIB_INCLUDE_DIRS={include_dirs} -DCBOR_LIBRARY_DIRS={lib_dirs} -DCRYPTO_LIBRARY_DIRS={lib_dirs} -DZLIB_LIBRARY_DIRS={lib_dirs} -DCBOR_BIN_DIRS={bin_dirs} -DCRYPTO_BIN_DIRS={bin_dirs} -DZLIB_BIN_DIRS={bin_dirs} {build_params}" + + CmakeProject.build(self, cmake_params=cmake_params, use_ninja=True) + self.install(r"output\%s\static\* ." % (arch)) From 98406f014c6f09bb006d6a2b87dc57aba4015a6d Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Fri, 25 Aug 2023 10:30:55 +0200 Subject: [PATCH 51/80] ffmpeg: switch to upstream MB_INFO patch The patch is now merged upstream: - 0001-lavu-add-video_hint-API.patch [1] - 0002-lavc-libx264-add-mb_info-option.patch [2] 0001-lavu-add-video_hint-API.patch The following file changes are dropped: - doc/APIchanges - libavutil/version.h 0002-lavc-libx264-add-mb_info-option.patch The following file changes are dropped: - Changelog - doc/APIchanges - libavcodec/version.h [1] https://github.com/FFmpeg/FFmpeg/commit/5012b4ab4ca65a1c71bbcc125ba39db074b94e70 [2] https://github.com/FFmpeg/FFmpeg/commit/418c954e318a79f77eae1b4d6b29d40daee4284a --- .../ffmpeg/0001-lavu-add-video_hint-API.patch | 262 ++++++++++++++++ ...l-libavcodec-add-support-for-MB_INFO.patch | 293 ------------------ ...0002-lavc-libx264-add-mb_info-option.patch | 187 +++++++++++ gvsbuild/projects/ffmpeg.py | 5 +- 4 files changed, 453 insertions(+), 294 deletions(-) create mode 100644 gvsbuild/patches/ffmpeg/0001-lavu-add-video_hint-API.patch delete mode 100644 gvsbuild/patches/ffmpeg/0001-libavutil-libavcodec-add-support-for-MB_INFO.patch create mode 100644 gvsbuild/patches/ffmpeg/0002-lavc-libx264-add-mb_info-option.patch diff --git a/gvsbuild/patches/ffmpeg/0001-lavu-add-video_hint-API.patch b/gvsbuild/patches/ffmpeg/0001-lavu-add-video_hint-API.patch new file mode 100644 index 000000000..3d40f0dc1 --- /dev/null +++ b/gvsbuild/patches/ffmpeg/0001-lavu-add-video_hint-API.patch @@ -0,0 +1,262 @@ +From 5012b4ab4ca65a1c71bbcc125ba39db074b94e70 Mon Sep 17 00:00:00 2001 +From: Elias Carotti +Date: Mon, 10 Jul 2023 14:34:53 +0200 +Subject: [PATCH] lavu: add video_hint API + +Add side data type to provide hint to the video encoders about +unchanged portions of each frame. + +Signed-off-by: Anton Khirnov +--- + doc/APIchanges | 3 ++ + libavutil/Makefile | 2 + + libavutil/frame.h | 10 ++++ + libavutil/version.h | 2 +- + libavutil/video_hint.c | 81 +++++++++++++++++++++++++++++++ + libavutil/video_hint.h | 107 +++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 204 insertions(+), 1 deletion(-) + create mode 100644 libavutil/video_hint.c + create mode 100644 libavutil/video_hint.h + +diff --git a/libavutil/Makefile b/libavutil/Makefile +index bd9c6f9e3277..7828c94dc562 100644 +--- a/libavutil/Makefile ++++ b/libavutil/Makefile +@@ -91,6 +91,7 @@ HEADERS = adler32.h \ + tea.h \ + tx.h \ + film_grain_params.h \ ++ video_hint.h + + ARCH_HEADERS = bswap.h \ + intmath.h \ +@@ -181,6 +182,7 @@ OBJS = adler32.o \ + uuid.o \ + version.o \ + video_enc_params.o \ ++ video_hint.o \ + film_grain_params.o \ + + +diff --git a/libavutil/frame.h b/libavutil/frame.h +index a491315f25cf..c0c1b23db7ce 100644 +--- a/libavutil/frame.h ++++ b/libavutil/frame.h +@@ -214,6 +214,16 @@ enum AVFrameSideDataType { + * Ambient viewing environment metadata, as defined by H.274. + */ + AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT, ++ ++ /** ++ * Provide encoder-specific hinting information about changed/unchanged ++ * portions of a frame. It can be used to pass information about which ++ * macroblocks can be skipped because they didn't change from the ++ * corresponding ones in the previous frame. This could be useful for ++ * applications which know this information in advance to speed up ++ * encoding. ++ */ ++ AV_FRAME_DATA_VIDEO_HINT, + }; + + enum AVActiveFormatDescription { +diff --git a/libavutil/video_hint.c b/libavutil/video_hint.c +new file mode 100644 +index 000000000000..431716ab675a +--- /dev/null ++++ b/libavutil/video_hint.c +@@ -0,0 +1,81 @@ ++/* ++ * Copyright 2023 Elias Carotti ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include ++ ++#include "avstring.h" ++#include "frame.h" ++#include "macros.h" ++#include "mem.h" ++#include "video_hint.h" ++ ++AVVideoHint *av_video_hint_alloc(size_t nb_rects, ++ size_t *out_size) ++{ ++ struct TestStruct { ++ AVVideoHint hint; ++ AVVideoRect rect; ++ }; ++ const size_t rect_offset = offsetof(struct TestStruct, rect); ++ size_t size = rect_offset; ++ AVVideoHint *hint; ++ ++ *out_size = 0; ++ if (nb_rects > (SIZE_MAX - size) / sizeof(AVVideoRect)) ++ return NULL; ++ size += sizeof(AVVideoRect) * nb_rects; ++ ++ hint = av_mallocz(size); ++ if (!hint) ++ return NULL; ++ ++ hint->nb_rects = nb_rects; ++ hint->rect_offset = rect_offset; ++ hint->rect_size = sizeof(AVVideoRect); ++ ++ *out_size = size; ++ ++ return hint; ++} ++ ++AVVideoHint *av_video_hint_create_side_data(AVFrame *frame, ++ size_t nb_rects) ++{ ++ AVVideoHint *hint; ++ AVBufferRef *buf; ++ size_t size = 0; ++ ++ hint = av_video_hint_alloc(nb_rects, &size); ++ if (!hint) ++ return NULL; ++ ++ buf = av_buffer_create((uint8_t *)hint, size, NULL, NULL, 0); ++ if (!buf) { ++ av_freep(&hint); ++ return NULL; ++ } ++ ++ if (!av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_VIDEO_HINT, buf)) { ++ av_buffer_unref(&buf); ++ return NULL; ++ } ++ ++ return hint; ++} +diff --git a/libavutil/video_hint.h b/libavutil/video_hint.h +new file mode 100644 +index 000000000000..1b2196093b6b +--- /dev/null ++++ b/libavutil/video_hint.h +@@ -0,0 +1,107 @@ ++/** ++ * Copyright 2023 Elias Carotti ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifndef AVUTIL_VIDEO_HINT_H ++#define AVUTIL_VIDEO_HINT_H ++ ++#include ++#include ++#include "libavutil/avassert.h" ++#include "libavutil/frame.h" ++ ++typedef struct AVVideoRect { ++ uint32_t x, y; ++ uint32_t width, height; ++} AVVideoRect; ++ ++typedef enum AVVideoHintType { ++ /* rectangled delimit the constant areas (unchanged), default is changed */ ++ AV_VIDEO_HINT_TYPE_CONSTANT, ++ ++ /* rectangled delimit the constant areas (changed), default is not changed */ ++ AV_VIDEO_HINT_TYPE_CHANGED, ++} AVVideoHintType; ++ ++typedef struct AVVideoHint { ++ /** ++ * Number of AVVideoRect present. ++ * ++ * May be 0, in which case no per-rectangle information is present. In this ++ * case the values of rect_offset / rect_size are unspecified and should ++ * not be accessed. ++ */ ++ size_t nb_rects; ++ ++ /** ++ * Offset in bytes from the beginning of this structure at which the array ++ * of AVVideoRect starts. ++ */ ++ size_t rect_offset; ++ ++ /** ++ * Size in bytes of AVVideoRect. ++ */ ++ size_t rect_size; ++ ++ AVVideoHintType type; ++} AVVideoHint; ++ ++static av_always_inline AVVideoRect * ++av_video_hint_rects(const AVVideoHint *hints) { ++ return (AVVideoRect *)((uint8_t *)hints + hints->rect_offset); ++} ++ ++static av_always_inline AVVideoRect * ++av_video_hint_get_rect(const AVVideoHint *hints, size_t idx) { ++ return (AVVideoRect *)((uint8_t *)hints + hints->rect_offset + idx * hints->rect_size); ++} ++ ++/** ++ * Allocate memory for the AVVideoHint struct along with an nb_rects-sized ++ * arrays of AVVideoRect. ++ * ++ * The side data contains a list of rectangles for the portions of the frame ++ * which changed from the last encoded one (and the remainder are assumed to be ++ * changed), or, alternately (depending on the type parameter) the unchanged ++ * ones (and the remanining ones are those which changed). ++ * Macroblocks will thus be hinted either to be P_SKIP-ped or go through the ++ * regular encoding procedure. ++ * ++ * It's responsibility of the caller to fill the AVRects accordingly, and to set ++ * the proper AVVideoHintType field. ++ * ++ * @param out_size if non-NULL, the size in bytes of the resulting data array is ++ * written here ++ * ++ * @return newly allocated AVVideoHint struct (must be freed by the caller using ++ * av_free()) on success, NULL on memory allocation failure ++ */ ++AVVideoHint *av_video_hint_alloc(size_t nb_rects, ++ size_t *out_size); ++ ++/** ++ * Same as av_video_hint_alloc(), except newly-allocated AVVideoHint is attached ++ * as side data of type AV_FRAME_DATA_VIDEO_HINT_INFO to frame. ++ */ ++AVVideoHint *av_video_hint_create_side_data(AVFrame *frame, ++ size_t nb_rects); ++ ++ ++#endif /* AVUTIL_VIDEO_HINT_H */ + diff --git a/gvsbuild/patches/ffmpeg/0001-libavutil-libavcodec-add-support-for-MB_INFO.patch b/gvsbuild/patches/ffmpeg/0001-libavutil-libavcodec-add-support-for-MB_INFO.patch deleted file mode 100644 index 28d9346a3..000000000 --- a/gvsbuild/patches/ffmpeg/0001-libavutil-libavcodec-add-support-for-MB_INFO.patch +++ /dev/null @@ -1,293 +0,0 @@ -From cb2c6e3314ca8657c21fc6731871aff9f1f548a2 Mon Sep 17 00:00:00 2001 -From: Elias Carotti -Date: Wed, 19 Apr 2023 11:49:39 +0200 -Subject: [PATCH] Add support for x264's MB_INFO - ---- - libavcodec/libx264.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ - libavutil/Makefile | 4 +++ - libavutil/frame.h | 10 ++++++++ - libavutil/mb_info.c | 46 +++++++++++++++++++++++++++++++++ - libavutil/mb_info.h | 46 +++++++++++++++++++++++++++++++++ - 5 files changed, 167 insertions(+) - create mode 100644 libavutil/mb_info.c - create mode 100644 libavutil/mb_info.h - -diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c -index cfdd422236..a98d702c92 100644 ---- a/libavcodec/libx264.c -+++ b/libavcodec/libx264.c -@@ -30,6 +30,7 @@ - #include "libavutil/stereo3d.h" - #include "libavutil/time.h" - #include "libavutil/intreadwrite.h" -+#include "libavutil/mb_info.h" - #include "avcodec.h" - #include "codec_internal.h" - #include "encode.h" -@@ -48,6 +49,9 @@ - // from x264.h, for quant_offsets, Macroblocks are 16x16 - // blocks of pixels (with respect to the luma plane) - #define MB_SIZE 16 -+#define MB_LSIZE 4 -+#define MB_FLOOR(x) ((x) >> (MB_LSIZE)) -+#define MB_CEIL(x) MB_FLOOR((x) + (MB_SIZE - 1)) - - typedef struct X264Opaque { - #if FF_API_REORDERED_OPAQUE -@@ -123,6 +127,8 @@ typedef struct X264Context { - * encounter a frame with ROI side data. - */ - int roi_warned; -+ -+ int mb_info; - } X264Context; - - static void X264_log(void *p, int level, const char *fmt, va_list args) -@@ -320,6 +326,45 @@ static enum AVPixelFormat csp_to_pixfmt(int csp) - return AV_PIX_FMT_NONE; - } - -+static int setup_mb_info(AVCodecContext *ctx, x264_picture_t *pic, -+ const AVFrame *frame, const uint8_t *data, -+ size_t size) -+{ -+ int mb_width = (frame->width + MB_SIZE - 1) / MB_SIZE; -+ int mb_height = (frame->height + MB_SIZE - 1) / MB_SIZE; -+ const AVMBInfoRect *mbinfo_rects; -+ size_t mbinfo_count; -+ uint8_t *mbinfo; -+ -+ mbinfo_rects = (const AVMBInfoRect *)data; -+ mbinfo_count = size / sizeof(AVMBInfoRect); -+ -+ mbinfo = av_calloc(mb_width * mb_height, sizeof(*mbinfo)); -+ if (!mbinfo) -+ return AVERROR(ENOMEM); -+ -+ /* Sets the default as constant, i.e. P_SKIP-able, then selectively resets the flag */ -+ memset(mbinfo, X264_MBINFO_CONSTANT, sizeof(*mbinfo) * mb_width * mb_height); -+ -+ for (int i = 0; i < mbinfo_count; i++) { -+ int min_y = MB_FLOOR(mbinfo_rects->y); -+ int max_y = MB_CEIL(mbinfo_rects->y + mbinfo_rects->height); -+ int min_x = MB_FLOOR(mbinfo_rects->x); -+ int max_x = MB_CEIL(mbinfo_rects->x + mbinfo_rects->width); -+ -+ for (int mb_y = min_y; mb_y < max_y; ++mb_y) { -+ memset(mbinfo + mb_y * mb_width + min_x, 0, max_x - min_x); -+ } -+ -+ mbinfo_rects++; -+ } -+ -+ pic->prop.mb_info = mbinfo; -+ pic->prop.mb_info_free = av_free; -+ -+ return 0; -+} -+ - static int setup_roi(AVCodecContext *ctx, x264_picture_t *pic, int bit_depth, - const AVFrame *frame, const uint8_t *data, size_t size) - { -@@ -404,6 +449,7 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, - int64_t wallclock = 0; - int bit_depth, ret; - AVFrameSideData *sd; -+ AVFrameSideData *mbinfo_sd; - - *ppic = NULL; - if (!frame) -@@ -499,6 +545,17 @@ FF_ENABLE_DEPRECATION_WARNINGS - goto fail; - } - -+ mbinfo_sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MB_INFO); -+ if (mbinfo_sd) { -+ int ret = setup_mb_info(ctx, pic, frame, mbinfo_sd->data, mbinfo_sd->size); -+ if (ret < 0) { -+ /* No need to fail here, this is not fatal. We just proceed with no -+ * mb_info and log a message */ -+ -+ av_log(ctx, AV_LOG_WARNING, "mb_info setup failure\n"); -+ } -+ } -+ - if (x4->udu_sei) { - for (int j = 0; j < frame->nb_side_data; j++) { - AVFrameSideData *side_data = frame->side_data[j]; -@@ -1096,6 +1153,9 @@ static av_cold int X264_init(AVCodecContext *avctx) - } - } - -+ x4->params.analyse.b_mb_info = x4->mb_info; -+ x4->params.analyse.b_fast_pskip = 1; -+ - // update AVCodecContext with x264 parameters - avctx->has_b_frames = x4->params.i_bframe ? - x4->params.i_bframe_pyramid ? 2 : 1 : 0; -@@ -1305,6 +1365,7 @@ static const AVOption options[] = { - { "noise_reduction", "Noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX, VE }, - { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, - { "x264-params", "Override the x264 configuration using a :-separated list of key=value parameters", OFFSET(x264_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, -+ { "mb_info", "Set mb_info data through AVSideData, only useful when used from the API", OFFSET(mb_info), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, - { NULL }, - }; - -diff --git a/libavutil/Makefile b/libavutil/Makefile -index dc9012f9a8..e99f448213 100644 ---- a/libavutil/Makefile -+++ b/libavutil/Makefile -@@ -91,6 +91,7 @@ HEADERS = adler32.h \ - tea.h \ - tx.h \ - film_grain_params.h \ -+ mb_info.h \ - - ARCH_HEADERS = bswap.h \ - intmath.h \ -@@ -196,6 +197,7 @@ OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o - OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o - OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o - OBJS-$(CONFIG_VULKAN) += hwcontext_vulkan.o -+OBJS-$(CONFIG_LIBX264) += mb_info.o - - OBJS-$(!CONFIG_VULKAN) += hwcontext_stub.o - -@@ -219,6 +221,8 @@ SKIPHEADERS-$(CONFIG_VULKAN) += hwcontext_vulkan.h vulkan.h \ - vulkan_functions.h \ - vulkan_loader.h - -+SKIPHEADERS-$(CONFIG_LIBX264) += mb_info.h -+ - TESTPROGS = adler32 \ - aes \ - aes_ctr \ -diff --git a/libavutil/frame.h b/libavutil/frame.h -index f85d630c5c..9c0fdcf25d 100644 ---- a/libavutil/frame.h -+++ b/libavutil/frame.h -@@ -214,6 +214,16 @@ enum AVFrameSideDataType { - * Ambient viewing environment metadata, as defined by H.274. - */ - AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT, -+ -+ /** -+ * Provide macro block encoder-specific hinting information for the encoder -+ * processing. It can be used to pass information about which macroblock -+ * can be skipped because it hasn't changed from the corresponding one in -+ * the previous frame. This is useful for applications which know in -+ * advance this information to speed up real-time encoding. Currently only -+ * used by libx264. -+ */ -+ AV_FRAME_DATA_MB_INFO, - }; - - enum AVActiveFormatDescription { -diff --git a/libavutil/mb_info.c b/libavutil/mb_info.c -new file mode 100644 -index 0000000000..789ded110f ---- /dev/null -+++ b/libavutil/mb_info.c -@@ -0,0 +1,46 @@ -+/* -+ * This file is part of FFmpeg. -+ * -+ * FFmpeg is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * FFmpeg is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with FFmpeg; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#include -+ -+#include "avstring.h" -+#include "frame.h" -+#include "macros.h" -+#include "mem.h" -+#include "mb_info.h" -+ -+ -+AVMBInfoRect *av_mb_info_create_side_data(AVFrame *frame, -+ AVMBInfoRect *rects, -+ size_t num_rects) -+{ -+ AVFrameSideData *side_data; -+ AVMBInfoRect *par; -+ -+ side_data = av_frame_new_side_data(frame, -+ AV_FRAME_DATA_MB_INFO, -+ num_rects * sizeof(AVMBInfoRect)); -+ -+ par = (AVMBInfoRect *)side_data->data; -+ -+ /* Just copies the rects over the newly allocated buffer */ -+ memcpy(par, rects, sizeof(AVMBInfoRect) * num_rects); -+ -+ return par; -+} -+ -diff --git a/libavutil/mb_info.h b/libavutil/mb_info.h -new file mode 100644 -index 0000000000..5095360ec5 ---- /dev/null -+++ b/libavutil/mb_info.h -@@ -0,0 +1,46 @@ -+/** -+ * This file is part of FFmpeg. -+ * -+ * FFmpeg is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * FFmpeg is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with FFmpeg; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#ifndef AVUTIL_MB_INFO_H -+#define AVUTIL_MB_INFO_H -+ -+#include -+#include -+#include "libavutil/avassert.h" -+#include "libavutil/frame.h" -+ -+typedef struct _AVMBInfoRect { -+ uint32_t x, y; -+ uint32_t width, height; -+} AVMBInfoRect; -+ -+/** -+ * Allocate memory for AVMBInfoRect in the given AVFrame {@code frame} -+ * as AVFrameSideData of type AV_FRAME_DATA_MB_INFO -+ * and initializes the variables. -+ * For each unchanged area a rectangle a flag is set in a special vector of -+ * flags to be passed down to libx264 which uses it as a hint to -+ * encode the corresponding macroblock(s) as P_SKIPS. -+ * Portions of the rects which are not on macroblock boundaries are not -+ * handled as P_SKIPS. -+ */ -+AVMBInfoRect *av_mb_info_create_side_data(AVFrame *frame, -+ AVMBInfoRect *rects, -+ size_t num_rects); -+ -+#endif /* AVUTIL_MB_INFO_H */ --- -2.34.1 - diff --git a/gvsbuild/patches/ffmpeg/0002-lavc-libx264-add-mb_info-option.patch b/gvsbuild/patches/ffmpeg/0002-lavc-libx264-add-mb_info-option.patch new file mode 100644 index 000000000..cd5f664d3 --- /dev/null +++ b/gvsbuild/patches/ffmpeg/0002-lavc-libx264-add-mb_info-option.patch @@ -0,0 +1,187 @@ +From 418c954e318a79f77eae1b4d6b29d40daee4284a Mon Sep 17 00:00:00 2001 +From: Elias Carotti +Date: Tue, 20 Jun 2023 19:29:08 +0200 +Subject: [PATCH] lavc/libx264: add mb_info option + +Pass the information about unchanged parts of the frame by means of +the AVVideoHint side data. +--- + Changelog | 1 + + doc/APIchanges | 3 ++ + doc/encoders.texi | 4 ++ + libavcodec/libx264.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ + libavcodec/version.h | 2 +- + 5 files changed, 100 insertions(+), 1 deletion(-) + +diff --git a/doc/encoders.texi b/doc/encoders.texi +index 25d6b7f09edc..6f8f5e127e87 100644 +--- a/doc/encoders.texi ++++ b/doc/encoders.texi +@@ -2738,6 +2738,10 @@ Only the mpeg2 and h264 decoders provide these. Default is 1 (on). + @item udu_sei @var{boolean} + Import user data unregistered SEI if available into output. Default is 0 (off). + ++@item mb_info @var{boolean} ++Set mb_info data through AVFrameSideData, only useful when used from the ++API. Default is 0 (off). ++ + @item x264-params (N.A.) + Override the x264 configuration using a :-separated list of key=value + parameters. +diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c +index 5736f1efa7f7..1a7dc7bdd5b4 100644 +--- a/libavcodec/libx264.c ++++ b/libavcodec/libx264.c +@@ -30,6 +30,7 @@ + #include "libavutil/stereo3d.h" + #include "libavutil/time.h" + #include "libavutil/intreadwrite.h" ++#include "libavutil/video_hint.h" + #include "avcodec.h" + #include "codec_internal.h" + #include "encode.h" +@@ -48,6 +49,9 @@ + // from x264.h, for quant_offsets, Macroblocks are 16x16 + // blocks of pixels (with respect to the luma plane) + #define MB_SIZE 16 ++#define MB_LSIZE 4 ++#define MB_FLOOR(x) ((x) >> (MB_LSIZE)) ++#define MB_CEIL(x) MB_FLOOR((x) + (MB_SIZE - 1)) + + typedef struct X264Opaque { + #if FF_API_REORDERED_OPAQUE +@@ -123,6 +127,8 @@ typedef struct X264Context { + * encounter a frame with ROI side data. + */ + int roi_warned; ++ ++ int mb_info; + } X264Context; + + static void X264_log(void *p, int level, const char *fmt, va_list args) +@@ -295,6 +301,7 @@ static void free_picture(x264_picture_t *pic) + av_free(pic->extra_sei.payloads[i].payload); + av_freep(&pic->extra_sei.payloads); + av_freep(&pic->prop.quant_offsets); ++ av_freep(&pic->prop.mb_info); + pic->extra_sei.num_payloads = 0; + } + +@@ -320,6 +327,74 @@ static enum AVPixelFormat csp_to_pixfmt(int csp) + return AV_PIX_FMT_NONE; + } + ++static void av_always_inline mbinfo_compute_changed_coords(const AVVideoRect *rect, ++ int *min_x, ++ int *max_x, ++ int *min_y, ++ int *max_y) ++{ ++ *min_y = MB_FLOOR(rect->y); ++ *max_y = MB_CEIL(rect->y + rect->height); ++ *min_x = MB_FLOOR(rect->x); ++ *max_x = MB_CEIL(rect->x + rect->width); ++} ++ ++static void av_always_inline mbinfo_compute_constant_coords(const AVVideoRect *rect, ++ int *min_x, ++ int *max_x, ++ int *min_y, ++ int *max_y) ++{ ++ *min_y = MB_CEIL(rect->y); ++ *max_y = MB_FLOOR(rect->y + rect->height); ++ *min_x = MB_CEIL(rect->x); ++ *max_x = MB_FLOOR(rect->x + rect->width); ++} ++ ++static int setup_mb_info(AVCodecContext *ctx, x264_picture_t *pic, ++ const AVFrame *frame, ++ const AVVideoHint *info) ++{ ++ int mb_width = (frame->width + MB_SIZE - 1) / MB_SIZE; ++ int mb_height = (frame->height + MB_SIZE - 1) / MB_SIZE; ++ ++ const AVVideoRect *mbinfo_rects; ++ int nb_rects; ++ uint8_t *mbinfo; ++ ++ mbinfo_rects = (const AVVideoRect *)av_video_hint_rects(info); ++ nb_rects = info->nb_rects; ++ ++ mbinfo = av_calloc(mb_width * mb_height, sizeof(*mbinfo)); ++ if (!mbinfo) ++ return AVERROR(ENOMEM); ++ ++#define COMPUTE_MBINFO(mbinfo_filler_, mbinfo_marker_, compute_coords_fn_) \ ++ memset(mbinfo, mbinfo_filler_, sizeof(*mbinfo) * mb_width * mb_height); \ ++ \ ++ for (int i = 0; i < nb_rects; i++) { \ ++ int min_x, max_x, min_y, max_y; \ ++ \ ++ compute_coords_fn_(mbinfo_rects, &min_x, &max_x, &min_y, &max_y); \ ++ for (int mb_y = min_y; mb_y < max_y; ++mb_y) { \ ++ memset(mbinfo + mb_y * mb_width + min_x, mbinfo_marker_, max_x - min_x); \ ++ } \ ++ \ ++ mbinfo_rects++; \ ++ } \ ++ ++ if (info->type == AV_VIDEO_HINT_TYPE_CHANGED) { ++ COMPUTE_MBINFO(X264_MBINFO_CONSTANT, 0, mbinfo_compute_changed_coords); ++ } else /* if (info->type == AV_VIDEO_HINT_TYPE_CHANGED) */ { ++ COMPUTE_MBINFO(0, X264_MBINFO_CONSTANT, mbinfo_compute_constant_coords); ++ } ++ ++ pic->prop.mb_info = mbinfo; ++ pic->prop.mb_info_free = av_free; ++ ++ return 0; ++} ++ + static int setup_roi(AVCodecContext *ctx, x264_picture_t *pic, int bit_depth, + const AVFrame *frame, const uint8_t *data, size_t size) + { +@@ -404,6 +479,7 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, + int64_t wallclock = 0; + int bit_depth, ret; + AVFrameSideData *sd; ++ AVFrameSideData *mbinfo_sd; + + *ppic = NULL; + if (!frame) +@@ -499,6 +575,17 @@ FF_ENABLE_DEPRECATION_WARNINGS + goto fail; + } + ++ mbinfo_sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_HINT); ++ if (mbinfo_sd) { ++ int ret = setup_mb_info(ctx, pic, frame, (const AVVideoHint *)mbinfo_sd->data); ++ if (ret < 0) { ++ /* No need to fail here, this is not fatal. We just proceed with no ++ * mb_info and log a message */ ++ ++ av_log(ctx, AV_LOG_WARNING, "setup_mb_info failed with error: %s\n", av_err2str(ret)); ++ } ++ } ++ + if (x4->udu_sei) { + for (int j = 0; j < frame->nb_side_data; j++) { + AVFrameSideData *side_data = frame->side_data[j]; +@@ -1102,6 +1189,9 @@ FF_ENABLE_DEPRECATION_WARNINGS + } + } + ++ x4->params.analyse.b_mb_info = x4->mb_info; ++ x4->params.analyse.b_fast_pskip = 1; ++ + // update AVCodecContext with x264 parameters + avctx->has_b_frames = x4->params.i_bframe ? + x4->params.i_bframe_pyramid ? 2 : 1 : 0; +@@ -1311,6 +1401,7 @@ static const AVOption options[] = { + { "noise_reduction", "Noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX, VE }, + { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "x264-params", "Override the x264 configuration using a :-separated list of key=value parameters", OFFSET(x264_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, ++ { "mb_info", "Set mb_info data through AVSideData, only useful when used from the API", OFFSET(mb_info), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { NULL }, + }; diff --git a/gvsbuild/projects/ffmpeg.py b/gvsbuild/projects/ffmpeg.py index deaec1c32..aa80c1f93 100644 --- a/gvsbuild/projects/ffmpeg.py +++ b/gvsbuild/projects/ffmpeg.py @@ -32,7 +32,10 @@ def __init__(self): archive_url="https://ffmpeg.org/releases/ffmpeg-{version}.tar.xz", hash="57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082", dependencies=["nasm", "msys2", "pkgconf", "nv-codec-headers"], - patches=["0001-libavutil-libavcodec-add-support-for-MB_INFO.patch"], + patches=[ + "0001-lavu-add-video_hint-API.patch", + "0002-lavc-libx264-add-mb_info-option.patch", + ], ) if self.opts.ffmpeg_enable_gpl: self.add_dependency("x264") From 05de239fa70207d59b8b5d74125051a8e48f86a0 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Wed, 23 Aug 2023 21:04:38 -0400 Subject: [PATCH 52/80] Update Poetry to version 1.6.1, use constraints file --- .github/constraints.txt | 1 + .github/workflows/ci.yml | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 .github/constraints.txt diff --git a/.github/constraints.txt b/.github/constraints.txt new file mode 100644 index 000000000..abb325842 --- /dev/null +++ b/.github/constraints.txt @@ -0,0 +1 @@ +poetry==1.6.1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8bfcabcd..a41f5c89d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,6 @@ on: env: python_version: '3.11' - poetry_version: '1.2.2' name: CI @@ -27,6 +26,11 @@ jobs: python-version: ${{ env.python_version }} - name: Lint with Pre-commit uses: pre-commit/action@v3.0.0 + - name: Check Poetry lock file integrity + run: | + python -m pip install --constraint=.github/constraints.txt poetry + poetry config virtualenvs.in-project true + poetry check test: needs: lint @@ -54,9 +58,9 @@ jobs: key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} restore-keys: ${{ runner.os }}-poetry- - name: Install Poetry - run: python -m pip install poetry==${{ env.poetry_version }} - - name: Configure Poetry - run: poetry config virtualenvs.in-project true + run: | + python -m pip install --constraint=.github/constraints.txt poetry + poetry config virtualenvs.in-project true - name: Install Python Dependencies run: poetry install - name: Install dependencies @@ -100,9 +104,9 @@ jobs: key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} restore-keys: ${{ runner.os }}-poetry- - name: Install Poetry - run: python -m pip install poetry==${{ env.poetry_version }} - - name: Configure Poetry - run: poetry config virtualenvs.in-project true + run: | + python -m pip install --constraint=.github/constraints.txt poetry + poetry config virtualenvs.in-project true - name: Install Python Dependencies run: poetry install # Temporarily move the preinstalled git, it causes errors related to cygwin. From a36e74600d97bdfec75aa8372e39253cda591900 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 26 Aug 2023 15:44:55 -0400 Subject: [PATCH 53/80] Update CMake to version 3.27.4 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index c427cb1d3..b6cde263d 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -68,9 +68,9 @@ def __init__(self): Tool.__init__( self, "cmake", - version="3.27.3", + version="3.27.4", archive_url="https://github.com/Kitware/CMake/releases/download/v{version}/cmake-{version}-windows-x86_64.zip", - hash="9c11b58e50b00200c3b1ae5e05d35a87e4d8068e4c7b98ee4eab8740a79380ec", + hash="e5e060756444d0b2070328a8821c1ceb62bd6d267aae61bfff06f96c7ec943a6", dir_part="cmake-{version}-windows-x86_64", ) From 03b79affed21131af75db8348a1c5987b14da6be Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 26 Aug 2023 15:46:50 -0400 Subject: [PATCH 54/80] Update CMake to version 1.72.0 --- gvsbuild/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index b6cde263d..5e0144d8d 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -30,7 +30,7 @@ def __init__(self): Tool.__init__( self, "cargo", - version="1.71.1", + version="1.72.0", repository="rust-lang/rust", archive_url="https://win.rustup.rs/x86_64", archive_file_name="rustup-init.exe", From 940ac08db2be996cd71c33be5714b8a77de0d6bf Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 26 Aug 2023 15:48:42 -0400 Subject: [PATCH 55/80] Update sqlite to version 3.43.0 --- gvsbuild/projects/sqlite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/sqlite.py b/gvsbuild/projects/sqlite.py index 015d33451..d8c299a18 100644 --- a/gvsbuild/projects/sqlite.py +++ b/gvsbuild/projects/sqlite.py @@ -25,9 +25,9 @@ def __init__(self): Project.__init__( self, "sqlite", - version="3.42.0", + version="3.43.0", archive_url="https://www.sqlite.org/2023/sqlite-autoconf-{major}{minor:0<3}{micro:0<3}.tar.gz", - hash="7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6", + hash="49008dbf3afc04d4edc8ecfc34e4ead196973034293c997adad2f63f01762ae1", ) def build(self): From 7637ddc391dd5d079a2774fe8fea419a8ba21fdb Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 26 Aug 2023 15:50:12 -0400 Subject: [PATCH 56/80] Update GTK to version 4.12.1 --- gvsbuild/projects/gtk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/gtk.py b/gvsbuild/projects/gtk.py index 3ab9e1cfc..c0540e799 100644 --- a/gvsbuild/projects/gtk.py +++ b/gvsbuild/projects/gtk.py @@ -124,12 +124,12 @@ def __init__(self): self, "gtk4", prj_dir="gtk4", - version="4.12.0", + version="4.12.1", lastversion_major=4, lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/gtk", archive_url="https://download.gnome.org/sources/gtk/{major}.{minor}/gtk-{version}.tar.xz", - hash="a6d10829f405b1afc0b65e2a9642c04126a1d1b638d11c6d97426da4f84f1f6f", + hash="b8b61d6cf94fac64bf3a0bfc7af137c9dd2f8360033fdeb0cfe9612b77a99a72", dependencies=[ "gdk-pixbuf", "pango", From 87f77b0bef159e93df620d89c91d5a995e3b3858 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 26 Aug 2023 15:52:26 -0400 Subject: [PATCH 57/80] Update freetype to version 2.13.2 --- gvsbuild/projects/freetype.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/freetype.py b/gvsbuild/projects/freetype.py index a0a2cc346..6c172f0b2 100644 --- a/gvsbuild/projects/freetype.py +++ b/gvsbuild/projects/freetype.py @@ -26,10 +26,10 @@ def __init__(self): Project.__init__( self, "freetype", - version="2.13.1", + version="2.13.2", repository="https://gitlab.freedesktop.org/freetype/freetype", archive_url="https://gitlab.freedesktop.org/freetype/freetype/-/archive/VER-{major}-{minor}-{micro}/freetype-VER-{major}-{minor}-{micro}.tar.gz", - hash="6d2349a5f4f8400ef63ce600c2038dbc3144c99246f7bc88e8f89eb3d318a3c2", + hash="427201f5d5151670d05c1f5b45bef5dda1f2e7dd971ef54f0feaaa7ffd2ab90c", dependencies=["pkgconf", "ninja", "libpng"], patches=["0001-meson-in-shared-libraries-we-need-to-export-the-meth.patch"], ) From c7e9d512140ac8040c097442e2c388572b29df64 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 26 Aug 2023 15:54:51 -0400 Subject: [PATCH 58/80] Update libzip to version 1.10.1 --- gvsbuild/projects/libzip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libzip.py b/gvsbuild/projects/libzip.py index c9794e72e..d5983d48b 100644 --- a/gvsbuild/projects/libzip.py +++ b/gvsbuild/projects/libzip.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "libzip", - version="1.10.0", + version="1.10.1", archive_url="https://libzip.org/download/libzip-{version}.tar.gz", - hash="52a60b46182587e083b71e2b82fcaaba64dd5eb01c5b1f1bc71069a3858e40fe", + hash="9669ae5dfe3ac5b3897536dc8466a874c8cf2c0e3b1fdd08d75b273884299363", dependencies=["cmake", "ninja", "zlib"], ) From 4f18fe0094774b9bf44c17ea44698755af259191 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 26 Aug 2023 21:12:44 -0400 Subject: [PATCH 59/80] Update luajit to version 2.1.1692716794 --- gvsbuild/projects/luajit.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gvsbuild/projects/luajit.py b/gvsbuild/projects/luajit.py index acb402a9f..40f03017e 100644 --- a/gvsbuild/projects/luajit.py +++ b/gvsbuild/projects/luajit.py @@ -15,19 +15,20 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . -from gvsbuild.utils.base_expanders import Tarball +from gvsbuild.utils.base_expanders import GitRepo from gvsbuild.utils.base_project import Project, project_add @project_add -class Luajit(Tarball, Project): +class Luajit(GitRepo, Project): def __init__(self): Project.__init__( self, "luajit", - version="2.1.0-beta3", - archive_url="http://luajit.org/download/LuaJIT-{version}.tar.gz", - hash="1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3", + version="2.1.1692716794", + repo_url="https://github.com/LuaJIT/LuaJIT", + fetch_submodules=False, + tag="03c31124cc3b521ef54fe398e10fa55660a5057d", patches=["set-paths.patch"], ) From bfd15c83344d856dd3d15ddab2d53ee9c349fdc6 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 26 Aug 2023 21:13:21 -0400 Subject: [PATCH 60/80] Update json-c to version 0.17.20230812 --- gvsbuild/projects/jsonc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gvsbuild/projects/jsonc.py b/gvsbuild/projects/jsonc.py index f422dc763..dd9162c8a 100644 --- a/gvsbuild/projects/jsonc.py +++ b/gvsbuild/projects/jsonc.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "json-c", - version="0.16-20220414", - archive_url="https://github.com/json-c/json-c/archive/json-c-{version}.tar.gz", - hash="3ecaeedffd99a60b1262819f9e60d7d983844073abc74e495cb822b251904185", + version="0.17.20230812", + archive_url="https://github.com/json-c/json-c/archive/json-c-{major}.{minor}-{micro}.tar.gz", + hash="024d302a3aadcbf9f78735320a6d5aedf8b77876c8ac8bbb95081ca55054c7eb", ) def build(self): From 04f160df33a97ba1e76f729859a6d8f8b2e73ba9 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Mon, 28 Aug 2023 15:19:03 +0200 Subject: [PATCH 61/80] x264: Install pdb files in debug configuration x264 doesn't install them for us. Do it manually. --- gvsbuild/projects/x264.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gvsbuild/projects/x264.py b/gvsbuild/projects/x264.py index fae6ad337..90a9d6e50 100644 --- a/gvsbuild/projects/x264.py +++ b/gvsbuild/projects/x264.py @@ -35,13 +35,14 @@ def __init__(self): ) def build(self): + configuration = self.builder.opts.configuration msys_path = Project.get_tool_path("msys2") self.exec_vs( r"%s\bash build\build.sh %s %s" % ( msys_path, convert_to_msys(self.builder.gtk_dir), - self.builder.opts.configuration, + configuration, ), add_path=msys_path, ) @@ -52,4 +53,8 @@ def build(self): working_dir=os.path.join(self.builder.gtk_dir, "lib"), ) + if configuration == "debug": + self.install(r".\libx264-164.pdb bin") + self.install(r".\x264.pdb bin") + self.install(r".\COPYING share\doc\x264") From 7c15227328c6f6b4b79c33afe061a66b5ba05dff Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Mon, 28 Aug 2023 15:21:13 +0200 Subject: [PATCH 62/80] x264: Generate and install pdb files in debug-optimized configuration Avoid --enable-debug flag because it turns off compiler optimizations. --- gvsbuild/patches/x264/build/build.sh | 4 ++++ gvsbuild/projects/x264.py | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gvsbuild/patches/x264/build/build.sh b/gvsbuild/patches/x264/build/build.sh index de617d9c2..b747bf516 100644 --- a/gvsbuild/patches/x264/build/build.sh +++ b/gvsbuild/patches/x264/build/build.sh @@ -16,6 +16,10 @@ if [ "$build_type" = "debug" ]; then configure_cmd[idx++]="--extra-cflags=-MDd -Od -Zi" fi +if [ "$build_type" = "debug-optimized" ]; then + configure_cmd[idx++]="--extra-ldflags=-DEBUG:FULL" +fi + CC=cl "${configure_cmd[@]}" make diff --git a/gvsbuild/projects/x264.py b/gvsbuild/projects/x264.py index 90a9d6e50..32337e13a 100644 --- a/gvsbuild/projects/x264.py +++ b/gvsbuild/projects/x264.py @@ -35,7 +35,11 @@ def __init__(self): ) def build(self): - configuration = self.builder.opts.configuration + configuration = ( + "debug-optimized" + if self.opts.release_configuration_is_actually_debug_optimized + else self.opts.configuration + ) msys_path = Project.get_tool_path("msys2") self.exec_vs( r"%s\bash build\build.sh %s %s" @@ -53,7 +57,7 @@ def build(self): working_dir=os.path.join(self.builder.gtk_dir, "lib"), ) - if configuration == "debug": + if configuration in ["debug-optimized", "debug"]: self.install(r".\libx264-164.pdb bin") self.install(r".\x264.pdb bin") From 86af107f6fcb74bee5d13356a85c94f8fe00b42b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 06:08:51 +0000 Subject: [PATCH 63/80] build(deps): bump actions/checkout from 3.5.3 to 3.6.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.5.3...v3.6.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a41f5c89d..764ff40f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: timeout-minutes: 10 if: "!contains(github.event.head_commit.message, 'skip ci')" steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python @@ -43,7 +43,7 @@ jobs: if: "!contains(github.event.head_commit.message, 'skip ci')" steps: - name: Checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v3.6.0 with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python @@ -90,7 +90,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v3.6.0 with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python From f24c49f39c8f5529c965de63a794650ccb29f91a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 06:51:11 +0000 Subject: [PATCH 64/80] build(deps-dev): bump tox from 4.10.0 to 4.11.0 Bumps [tox](https://github.com/tox-dev/tox) from 4.10.0 to 4.11.0. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/4.10.0...4.11.0) --- updated-dependencies: - dependency-name: tox dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 63 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/poetry.lock b/poetry.lock index 7378a9182..c6e78f3fc 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "appdirs" @@ -276,18 +276,21 @@ sgmllib3k = "*" [[package]] name = "filelock" -version = "3.12.2" +version = "3.12.3" description = "A platform independent file lock." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "filelock-3.12.2-py3-none-any.whl", hash = "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec"}, - {file = "filelock-3.12.2.tar.gz", hash = "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81"}, + {file = "filelock-3.12.3-py3-none-any.whl", hash = "sha256:f067e40ccc40f2b48395a80fcbd4728262fab54e232e090a4063ab804179efeb"}, + {file = "filelock-3.12.3.tar.gz", hash = "sha256:0ecc1dd2ec4672a10c8550a8182f1bd0c0a5088470ecd5a125e45f49472fac3d"}, ] +[package.dependencies] +typing-extensions = {version = ">=4.7.1", markers = "python_version < \"3.11\""} + [package.extras] -docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"] +docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-autodoc-typehints (>=1.24)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.3)", "diff-cover (>=7.7)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-timeout (>=2.1)"] [[package]] name = "identify" @@ -516,13 +519,13 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co [[package]] name = "pluggy" -version = "1.2.0" +version = "1.3.0" description = "plugin and hook calling mechanisms for python" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"}, - {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"}, + {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"}, + {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"}, ] [package.extras] @@ -563,13 +566,13 @@ plugins = ["importlib-metadata"] [[package]] name = "pyproject-api" -version = "1.5.3" +version = "1.6.1" description = "API to interact with the python pyproject.toml based projects" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pyproject_api-1.5.3-py3-none-any.whl", hash = "sha256:14cf09828670c7b08842249c1f28c8ee6581b872e893f81b62d5465bec41502f"}, - {file = "pyproject_api-1.5.3.tar.gz", hash = "sha256:ffb5b2d7cad43f5b2688ab490de7c4d3f6f15e0b819cb588c4b771567c9729eb"}, + {file = "pyproject_api-1.6.1-py3-none-any.whl", hash = "sha256:4c0116d60476b0786c88692cf4e325a9814965e2469c5998b830bba16b183675"}, + {file = "pyproject_api-1.6.1.tar.gz", hash = "sha256:1817dc018adc0d1ff9ca1ed8c60e1623d5aaca40814b953af14a9cf9a5cae538"}, ] [package.dependencies] @@ -577,8 +580,8 @@ packaging = ">=23.1" tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""} [package.extras] -docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"] -testing = ["covdefaults (>=2.3)", "importlib-metadata (>=6.6)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "setuptools (>=67.8)", "wheel (>=0.40)"] +docs = ["furo (>=2023.8.19)", "sphinx (<7.2)", "sphinx-autodoc-typehints (>=1.24)"] +testing = ["covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "setuptools (>=68.1.2)", "wheel (>=0.41.2)"] [[package]] name = "pyproject-hooks" @@ -642,6 +645,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -649,8 +653,15 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -667,6 +678,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -674,6 +686,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -791,30 +804,30 @@ files = [ [[package]] name = "tox" -version = "4.10.0" +version = "4.11.0" description = "tox is a generic virtualenv management and test command line tool" optional = false python-versions = ">=3.8" files = [ - {file = "tox-4.10.0-py3-none-any.whl", hash = "sha256:e4a1b1438955a6da548d69a52350054350cf6a126658c20943261c48ed6d4c92"}, - {file = "tox-4.10.0.tar.gz", hash = "sha256:e041b2165375be690aca0ec4d96360c6906451380520e4665bf274f66112be35"}, + {file = "tox-4.11.0-py3-none-any.whl", hash = "sha256:7f7e5f1b20115560e610b9a11143bbcf48270ec3293f36c0a18be7b287c3b41f"}, + {file = "tox-4.11.0.tar.gz", hash = "sha256:cc665e1e6b095f843b952ea5696f7a64bb64982aff62b62547ef171fa60e21eb"}, ] [package.dependencies] cachetools = ">=5.3.1" chardet = ">=5.2" colorama = ">=0.4.6" -filelock = ">=3.12.2" +filelock = ">=3.12.3" packaging = ">=23.1" platformdirs = ">=3.10" -pluggy = ">=1.2" -pyproject-api = ">=1.5.3" +pluggy = ">=1.3" +pyproject-api = ">=1.6.1" tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""} virtualenv = ">=20.24.3" [package.extras] -docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.24)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] -testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.7)", "distlib (>=0.3.7)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.18)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.12)", "wheel (>=0.41.1)"] +docs = ["furo (>=2023.8.19)", "sphinx (>=7.2.4)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.24)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=1)", "diff-cover (>=7.7)", "distlib (>=0.3.7)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.18)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.12)", "wheel (>=0.41.2)"] [[package]] name = "tqdm" From 61500d6326dfc9ebfa80a69e94756163fc45e896 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Wed, 30 Aug 2023 14:10:35 +0200 Subject: [PATCH 65/80] x264: pass -Zi in debug-optimized "Use of /Zi doesn't affect optimizations."[1]. [1] https://learn.microsoft.com/en-us/cpp/build/reference/z7-zi-zi-debug-information-format?view=msvc-170#zi --- gvsbuild/patches/x264/build/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gvsbuild/patches/x264/build/build.sh b/gvsbuild/patches/x264/build/build.sh index b747bf516..d70771278 100644 --- a/gvsbuild/patches/x264/build/build.sh +++ b/gvsbuild/patches/x264/build/build.sh @@ -18,6 +18,7 @@ fi if [ "$build_type" = "debug-optimized" ]; then configure_cmd[idx++]="--extra-ldflags=-DEBUG:FULL" + configure_cmd[idx++]="--extra-cflags=-Zi" fi CC=cl "${configure_cmd[@]}" From 5a7e0b45d6e3cccabcce710948f52c26b9d50270 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Thu, 31 Aug 2023 12:12:51 +0200 Subject: [PATCH 66/80] freerdp: Update to 2.11.0 --- gvsbuild/projects/freerdp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/freerdp.py b/gvsbuild/projects/freerdp.py index c64b4a2cc..039c97079 100644 --- a/gvsbuild/projects/freerdp.py +++ b/gvsbuild/projects/freerdp.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "freerdp", - version="2.10.0", + version="2.11.0", archive_url="https://github.com/FreeRDP/FreeRDP/releases/download/{version}/freerdp-{version}.tar.gz", - hash="a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1", + hash="8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e", dependencies=[ "cmake", "ninja", From 77c264bc93892cd2a4c860d7bd3152f229c095c8 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Fri, 1 Sep 2023 16:13:23 +0200 Subject: [PATCH 67/80] libxml2: Update to 2.11.5 --- gvsbuild/projects/libxml2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libxml2.py b/gvsbuild/projects/libxml2.py index c01a715a8..aa7ae96e7 100644 --- a/gvsbuild/projects/libxml2.py +++ b/gvsbuild/projects/libxml2.py @@ -26,11 +26,11 @@ def __init__(self): Project.__init__( self, "libxml2", - version="2.10.4", + version="2.11.5", lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/libxml2", archive_url="https://download.gnome.org/sources/libxml2/{major}.{minor}/libxml2-{version}.tar.xz", - hash="ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45", + hash="3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6", dependencies=["win-iconv", "meson", "ninja"], ) From 95e63233122ab948bf07af45d08a0d54927df422 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Fri, 1 Sep 2023 16:20:55 +0200 Subject: [PATCH 68/80] libxml2: Backport buffer overflow fixes Issue: https://gitlab.gnome.org/GNOME/libxml2/-/issues/535 Backported patches: https://gitlab.gnome.org/GNOME/libxml2/-/commit/d0c3f01e110d54415611c5fa0040cdf4a56053f9 https://gitlab.gnome.org/GNOME/libxml2/-/commit/235b15a590eecf97b09e87bdb7e4f8333e9de129 --- ...ld-SAX1-parser-with-custom-callbacks.patch | 32 +++++++++ ...ays-initialize-SAX1-element-handlers.patch | 67 +++++++++++++++++++ gvsbuild/projects/libxml2.py | 4 ++ 3 files changed, 103 insertions(+) create mode 100644 gvsbuild/patches/libxml2/0001-parser-fix-old-SAX1-parser-with-custom-callbacks.patch create mode 100644 gvsbuild/patches/libxml2/0002-sax-always-initialize-SAX1-element-handlers.patch diff --git a/gvsbuild/patches/libxml2/0001-parser-fix-old-SAX1-parser-with-custom-callbacks.patch b/gvsbuild/patches/libxml2/0001-parser-fix-old-SAX1-parser-with-custom-callbacks.patch new file mode 100644 index 000000000..50fba5536 --- /dev/null +++ b/gvsbuild/patches/libxml2/0001-parser-fix-old-SAX1-parser-with-custom-callbacks.patch @@ -0,0 +1,32 @@ +From d0c3f01e110d54415611c5fa0040cdf4a56053f9 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Sat, 6 May 2023 17:47:37 +0200 +Subject: [PATCH] parser: Fix old SAX1 parser with custom callbacks + +For some reason, xmlCtxtUseOptionsInternal set the start and end element +SAX handlers to the internal DOM builder functions when XML_PARSE_SAX1 +was specified. This means that custom SAX handlers could never work with +that flag because these functions would receive the wrong user data +argument and crash immediately. + +Fixes #535. +--- + parser.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/parser.c b/parser.c +index bb05791d3..0c8bed129 100644 +--- a/parser.c ++++ b/parser.c +@@ -14479,8 +14479,6 @@ xmlCtxtUseOptionsInternal(xmlParserCtxtPtr ctxt, int options, const char *encodi + } + #ifdef LIBXML_SAX1_ENABLED + if (options & XML_PARSE_SAX1) { +- ctxt->sax->startElement = xmlSAX2StartElement; +- ctxt->sax->endElement = xmlSAX2EndElement; + ctxt->sax->startElementNs = NULL; + ctxt->sax->endElementNs = NULL; + ctxt->sax->initialized = 1; +-- +GitLab + diff --git a/gvsbuild/patches/libxml2/0002-sax-always-initialize-SAX1-element-handlers.patch b/gvsbuild/patches/libxml2/0002-sax-always-initialize-SAX1-element-handlers.patch new file mode 100644 index 000000000..ec9968169 --- /dev/null +++ b/gvsbuild/patches/libxml2/0002-sax-always-initialize-SAX1-element-handlers.patch @@ -0,0 +1,67 @@ +From 235b15a590eecf97b09e87bdb7e4f8333e9de129 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Mon, 8 May 2023 17:58:02 +0200 +Subject: [PATCH] SAX: Always initialize SAX1 element handlers + +Follow-up to commit d0c3f01e. A parser context will be initialized to +SAX version 2, but this can be overridden with XML_PARSE_SAX1 later, +so we must initialize the SAX1 element handlers as well. + +Change the check in xmlDetectSAX2 to only look for XML_SAX2_MAGIC, so +we don't switch to SAX1 if the SAX2 element handlers are NULL. +--- + SAX2.c | 11 +++++++---- + parser.c | 5 +---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/SAX2.c b/SAX2.c +index b6be1a6c4..910193892 100644 +--- a/SAX2.c ++++ b/SAX2.c +@@ -2874,20 +2874,23 @@ xmlSAXVersion(xmlSAXHandler *hdlr, int version) + { + if (hdlr == NULL) return(-1); + if (version == 2) { +- hdlr->startElement = NULL; +- hdlr->endElement = NULL; + hdlr->startElementNs = xmlSAX2StartElementNs; + hdlr->endElementNs = xmlSAX2EndElementNs; + hdlr->serror = NULL; + hdlr->initialized = XML_SAX2_MAGIC; + #ifdef LIBXML_SAX1_ENABLED + } else if (version == 1) { +- hdlr->startElement = xmlSAX2StartElement; +- hdlr->endElement = xmlSAX2EndElement; + hdlr->initialized = 1; + #endif /* LIBXML_SAX1_ENABLED */ + } else + return(-1); ++#ifdef LIBXML_SAX1_ENABLED ++ hdlr->startElement = xmlSAX2StartElement; ++ hdlr->endElement = xmlSAX2EndElement; ++#else ++ hdlr->startElement = NULL; ++ hdlr->endElement = NULL; ++#endif /* LIBXML_SAX1_ENABLED */ + hdlr->internalSubset = xmlSAX2InternalSubset; + hdlr->externalSubset = xmlSAX2ExternalSubset; + hdlr->isStandalone = xmlSAX2IsStandalone; +diff --git a/parser.c b/parser.c +index 0c8bed129..e133fe0a6 100644 +--- a/parser.c ++++ b/parser.c +@@ -842,10 +842,7 @@ xmlDetectSAX2(xmlParserCtxtPtr ctxt) { + if (ctxt == NULL) return; + sax = ctxt->sax; + #ifdef LIBXML_SAX1_ENABLED +- if ((sax) && (sax->initialized == XML_SAX2_MAGIC) && +- ((sax->startElementNs != NULL) || +- (sax->endElementNs != NULL) || +- ((sax->startElement == NULL) && (sax->endElement == NULL)))) ++ if ((sax) && (sax->initialized == XML_SAX2_MAGIC)) + ctxt->sax2 = 1; + #else + ctxt->sax2 = 1; +-- +GitLab + diff --git a/gvsbuild/projects/libxml2.py b/gvsbuild/projects/libxml2.py index aa7ae96e7..b6a177f4a 100644 --- a/gvsbuild/projects/libxml2.py +++ b/gvsbuild/projects/libxml2.py @@ -32,6 +32,10 @@ def __init__(self): archive_url="https://download.gnome.org/sources/libxml2/{major}.{minor}/libxml2-{version}.tar.xz", hash="3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6", dependencies=["win-iconv", "meson", "ninja"], + patches=[ + "0001-parser-fix-old-SAX1-parser-with-custom-callbacks.patch", + "0002-sax-always-initialize-SAX1-element-handlers.patch", + ], ) def build(self): From 2fa49908191c4748f651f42f63eb4c94150a581e Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Fri, 1 Sep 2023 20:08:52 -0400 Subject: [PATCH 69/80] Update glib to version 2.76.5 --- gvsbuild/projects/glib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/glib.py b/gvsbuild/projects/glib.py index 0901ffdd2..c4d1afc87 100644 --- a/gvsbuild/projects/glib.py +++ b/gvsbuild/projects/glib.py @@ -26,11 +26,11 @@ def __init__(self): Project.__init__( self, "glib", - version="2.76.4", + version="2.76.5", lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/glib", archive_url="https://download.gnome.org/sources/glib/{major}.{minor}/glib-{version}.tar.xz", - hash="5a5a191c96836e166a7771f7ea6ca2b0069c603c7da3cba1cd38d1694a395dda", + hash="ed3a9953a90b20da8e5578a79f7d1c8a532eacbe2adac82aa3881208db8a3abe", dependencies=[ "ninja", "meson", From 85f3a19ae4ed031ca6cc2df2a37a1eb91b4e6f76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 06:38:40 +0000 Subject: [PATCH 70/80] build(deps-dev): bump tox from 4.11.0 to 4.11.1 Bumps [tox](https://github.com/tox-dev/tox) from 4.11.0 to 4.11.1. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/4.11.0...4.11.1) --- updated-dependencies: - dependency-name: tox dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index c6e78f3fc..9327be7c6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -804,13 +804,13 @@ files = [ [[package]] name = "tox" -version = "4.11.0" +version = "4.11.1" description = "tox is a generic virtualenv management and test command line tool" optional = false python-versions = ">=3.8" files = [ - {file = "tox-4.11.0-py3-none-any.whl", hash = "sha256:7f7e5f1b20115560e610b9a11143bbcf48270ec3293f36c0a18be7b287c3b41f"}, - {file = "tox-4.11.0.tar.gz", hash = "sha256:cc665e1e6b095f843b952ea5696f7a64bb64982aff62b62547ef171fa60e21eb"}, + {file = "tox-4.11.1-py3-none-any.whl", hash = "sha256:da761b4a57ee2b92b5ce39f48ff723fc42d185bf2af508effb683214efa662ea"}, + {file = "tox-4.11.1.tar.gz", hash = "sha256:8a8cc94b7269f8e43dfc636eff2da4b33a199a4e575b5b086cc51aae24ac4262"}, ] [package.dependencies] From 6697c841f3ddf55be629afb19597a24961155e0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 06:38:55 +0000 Subject: [PATCH 71/80] build(deps-dev): bump pre-commit from 3.3.3 to 3.4.0 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.3.3 to 3.4.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.3.3...v3.4.0) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 9327be7c6..96997f6bc 100644 --- a/poetry.lock +++ b/poetry.lock @@ -534,13 +534,13 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "pre-commit" -version = "3.3.3" +version = "3.4.0" description = "A framework for managing and maintaining multi-language pre-commit hooks." optional = false python-versions = ">=3.8" files = [ - {file = "pre_commit-3.3.3-py2.py3-none-any.whl", hash = "sha256:10badb65d6a38caff29703362271d7dca483d01da88f9d7e05d0b97171c136cb"}, - {file = "pre_commit-3.3.3.tar.gz", hash = "sha256:a2256f489cd913d575c145132ae196fe335da32d91a8294b7afe6622335dd023"}, + {file = "pre_commit-3.4.0-py2.py3-none-any.whl", hash = "sha256:96d529a951f8b677f730a7212442027e8ba53f9b04d217c4c67dc56c393ad945"}, + {file = "pre_commit-3.4.0.tar.gz", hash = "sha256:6bbd5129a64cad4c0dfaeeb12cd8f7ea7e15b77028d985341478c8af3c759522"}, ] [package.dependencies] From 4bb75685097aed1288f043b6fa54b1acd8ff5d45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 06:39:09 +0000 Subject: [PATCH 72/80] build(deps-dev): bump pytest from 7.4.0 to 7.4.1 Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.0 to 7.4.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.0...7.4.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 96997f6bc..3f683f71e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -599,13 +599,13 @@ tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} [[package]] name = "pytest" -version = "7.4.0" +version = "7.4.1" description = "pytest: simple powerful testing with Python" optional = false python-versions = ">=3.7" files = [ - {file = "pytest-7.4.0-py3-none-any.whl", hash = "sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32"}, - {file = "pytest-7.4.0.tar.gz", hash = "sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a"}, + {file = "pytest-7.4.1-py3-none-any.whl", hash = "sha256:460c9a59b14e27c602eb5ece2e47bec99dc5fc5f6513cf924a7d03a578991b1f"}, + {file = "pytest-7.4.1.tar.gz", hash = "sha256:2f2301e797521b23e4d2585a0a3d7b5e50fdddaaf7e7d6773ea26ddb17c213ab"}, ] [package.dependencies] From 8c3ae4a6d2d7aaf14ba193c6d8f62ddfc4ffa87c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 06:39:23 +0000 Subject: [PATCH 73/80] build(deps): bump build from 0.10.0 to 1.0.0 Bumps [build](https://github.com/pypa/build) from 0.10.0 to 1.0.0. - [Release notes](https://github.com/pypa/build/releases) - [Changelog](https://github.com/pypa/build/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pypa/build/compare/0.10.0...1.0.0) --- updated-dependencies: - dependency-name: build dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- poetry.lock | 49 ++++++++++++++++++++++++++++++++++++++++++------- pyproject.toml | 2 +- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3f683f71e..f17aa0704 100644 --- a/poetry.lock +++ b/poetry.lock @@ -31,25 +31,26 @@ lxml = ["lxml"] [[package]] name = "build" -version = "0.10.0" +version = "1.0.0" description = "A simple, correct Python build frontend" optional = false python-versions = ">= 3.7" files = [ - {file = "build-0.10.0-py3-none-any.whl", hash = "sha256:af266720050a66c893a6096a2f410989eeac74ff9a68ba194b3f6473e8e26171"}, - {file = "build-0.10.0.tar.gz", hash = "sha256:d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269"}, + {file = "build-1.0.0-py3-none-any.whl", hash = "sha256:f4c7b45e70e2c345e673902253d435a9a7729ff09ab574924420cf120c60bcc9"}, + {file = "build-1.0.0.tar.gz", hash = "sha256:49a60f212df4d9925727c2118e1cbe3abf30b393eff7d0e7287d2170eb36844d"}, ] [package.dependencies] colorama = {version = "*", markers = "os_name == \"nt\""} +importlib-metadata = {version = ">=4.6", markers = "python_version < \"3.10\""} packaging = ">=19.0" pyproject_hooks = "*" tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} [package.extras] -docs = ["furo (>=2021.08.31)", "sphinx (>=4.0,<5.0)", "sphinx-argparse-cli (>=1.5)", "sphinx-autodoc-typehints (>=1.10)"] -test = ["filelock (>=3)", "pytest (>=6.2.4)", "pytest-cov (>=2.12)", "pytest-mock (>=2)", "pytest-rerunfailures (>=9.1)", "pytest-xdist (>=1.34)", "setuptools (>=42.0.0)", "setuptools (>=56.0.0)", "toml (>=0.10.0)", "wheel (>=0.36.0)"] -typing = ["importlib-metadata (>=5.1)", "mypy (==0.991)", "tomli", "typing-extensions (>=3.7.4.3)"] +docs = ["furo (>=2023.08.17)", "sphinx (>=7.0,<8.0)", "sphinx-argparse-cli (>=1.5)", "sphinx-autodoc-typehints (>=1.10)", "sphinx-issues (>=3.0.0)"] +test = ["filelock (>=3)", "pytest (>=6.2.4)", "pytest-cov (>=2.12)", "pytest-mock (>=2)", "pytest-rerunfailures (>=9.1)", "pytest-xdist (>=1.34)", "setuptools (>=42.0.0)", "setuptools (>=56.0.0)", "setuptools (>=56.0.0)", "setuptools (>=67.8.0)", "wheel (>=0.36.0)"] +typing = ["importlib-metadata (>=5.1)", "mypy (>=1.5.0,<1.6.0)", "tomli", "typing-extensions (>=3.7.4.3)"] virtualenv = ["virtualenv (>=20.0.35)"] [[package]] @@ -317,6 +318,25 @@ files = [ {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, ] +[[package]] +name = "importlib-metadata" +version = "6.8.0" +description = "Read metadata from Python packages" +optional = false +python-versions = ">=3.8" +files = [ + {file = "importlib_metadata-6.8.0-py3-none-any.whl", hash = "sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb"}, + {file = "importlib_metadata-6.8.0.tar.gz", hash = "sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743"}, +] + +[package.dependencies] +zipp = ">=0.5" + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +perf = ["ipython"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] + [[package]] name = "iniconfig" version = "2.0.0" @@ -920,10 +940,25 @@ platformdirs = ">=3.9.1,<4" docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] +[[package]] +name = "zipp" +version = "3.16.2" +description = "Backport of pathlib-compatible object wrapper for zip files" +optional = false +python-versions = ">=3.8" +files = [ + {file = "zipp-3.16.2-py3-none-any.whl", hash = "sha256:679e51dd4403591b2d6838a48de3d283f3d188412a9782faadf845f298736ba0"}, + {file = "zipp-3.16.2.tar.gz", hash = "sha256:ebc15946aa78bd63458992fc81ec3b6f7b1e92d51c35e6de1c3804e73b799147"}, +] + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] + [extras] outdated = ["lastversion", "packaging"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "dbcbf1f332ee2501cf76d9a7c35812fc6494e35f7864a0650344ddb5519f8d41" +content-hash = "0ca717f20610bd54f1a986b4d1569a349cc0341725d87bb17c02f49829c183b0" diff --git a/pyproject.toml b/pyproject.toml index 90552f82f..4228ba75c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ classifiers = [ [tool.poetry.dependencies] python = "^3.8" -build = ">=0.9,<0.11" +build = ">=0.9,<1.1" lastversion = { version = ">=2.4.2,<4.0.0", optional = true } packaging = { version = ">=21.3,<24.0", optional = true } typer = {extras = ["all"], version = ">=0.6.1,<0.10.0"} From cde5c75a413cc5486298843a2bf7887ec0a6348a Mon Sep 17 00:00:00 2001 From: BiagioFesta <15035284+BiagioFesta@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:33:02 +0200 Subject: [PATCH 74/80] boringssl: update to same version boring-sys (rust) version 3 --- gvsbuild/projects/boringssl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvsbuild/projects/boringssl.py b/gvsbuild/projects/boringssl.py index aada4f4ff..50d74127b 100644 --- a/gvsbuild/projects/boringssl.py +++ b/gvsbuild/projects/boringssl.py @@ -29,7 +29,7 @@ def __init__(self): repository="https://github.com/google/boringssl", repo_url="https://github.com/google/boringssl.git", fetch_submodules=False, - tag="f1c75347daa2ea81a941e953f2263e0a4d970c8d", # commit from master-with-bazel branch + tag="44b3df6f03d85c901767250329c571db405122d5", # commit from master-with-bazel branch dependencies=["cmake", "go", "perl", "nasm", "ninja"], ) From e225a20fd82707091365f61f433ba2e58b0a014f Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Mon, 4 Sep 2023 10:49:11 -0400 Subject: [PATCH 75/80] Update FreeRDP to version 2.11.1 --- gvsbuild/projects/freerdp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/freerdp.py b/gvsbuild/projects/freerdp.py index 039c97079..0111a98c9 100644 --- a/gvsbuild/projects/freerdp.py +++ b/gvsbuild/projects/freerdp.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "freerdp", - version="2.11.0", + version="2.11.1", archive_url="https://github.com/FreeRDP/FreeRDP/releases/download/{version}/freerdp-{version}.tar.gz", - hash="8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e", + hash="fa9aeff43ffef27c8bd04f9be124e58dd30df1be5f0cce90eb0342153bfa2425", dependencies=[ "cmake", "ninja", From 9e5879fc6a7f4f2eb67c302bb3257c90517d5d78 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Mon, 4 Sep 2023 10:50:14 -0400 Subject: [PATCH 76/80] Update pkgconf to version 2.0.3 --- gvsbuild/projects/pkgconf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/pkgconf.py b/gvsbuild/projects/pkgconf.py index 3fadf2a6c..4610ae1db 100644 --- a/gvsbuild/projects/pkgconf.py +++ b/gvsbuild/projects/pkgconf.py @@ -27,9 +27,9 @@ def __init__(self): self, "pkgconf", prj_dir="pkgconf", - version="2.0.2", + version="2.0.3", archive_url="https://distfiles.ariadne.space/pkgconf/pkgconf-{version}.tar.gz", - hash="dc285fd35f4777335304fd5fa5cef1e9e9b1e9bcc72cd353a207aa5471818142", + hash="a8f25f4b0c1ad48edc9b07ed46101aab4bcb305ba6ae811be49b7499b00eed49", dependencies=["ninja", "meson"], patches=["0001-libpkgconf-add-defines-to-unbreak-build-with-VS2013.patch"], ) From 422d24bf9431c9a6f2c9845e10059fc71d9472e8 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Mon, 4 Sep 2023 10:51:08 -0400 Subject: [PATCH 77/80] Update nghttp2 to version 1.56.0 --- gvsbuild/projects/nghttp2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/nghttp2.py b/gvsbuild/projects/nghttp2.py index 08adaec68..c6b2d8598 100644 --- a/gvsbuild/projects/nghttp2.py +++ b/gvsbuild/projects/nghttp2.py @@ -26,9 +26,9 @@ def __init__(self): Project.__init__( self, "nghttp2", - version="1.55.1", + version="1.56.0", archive_url="https://github.com/nghttp2/nghttp2/releases/download/v{version}/nghttp2-{version}.tar.xz", - hash="19490b7c8c2ded1cf7c3e3a54ef4304e3a7876ae2d950d60a81d0dc6053be419", + hash="65eee8021e9d3620589a4a4e91ce9983d802b5229f78f3313770e13f4d2720e9", dependencies=[ "cmake", "zlib", From ec94d6b39644b8c7e134b31b9e91262dc8fc496b Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Mon, 4 Sep 2023 10:56:57 -0400 Subject: [PATCH 78/80] Bump version for September release --- poetry.lock | 90 ++++++++++++++++++++++---------------------------- pyproject.toml | 2 +- 2 files changed, 41 insertions(+), 51 deletions(-) diff --git a/poetry.lock b/poetry.lock index f17aa0704..7287f2f92 100644 --- a/poetry.lock +++ b/poetry.lock @@ -96,13 +96,13 @@ files = [ [[package]] name = "cfgv" -version = "3.3.1" +version = "3.4.0" description = "Validate configuration and produce human readable error messages." optional = false -python-versions = ">=3.6.1" +python-versions = ">=3.8" files = [ - {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"}, - {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"}, + {file = "cfgv-3.4.0-py2.py3-none-any.whl", hash = "sha256:b7265b1f29fd3316bfcd2b330d63d024f2bfd8bcb8b0272f8e19a504856c48f9"}, + {file = "cfgv-3.4.0.tar.gz", hash = "sha256:e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560"}, ] [[package]] @@ -202,13 +202,13 @@ files = [ [[package]] name = "click" -version = "8.1.6" +version = "8.1.7" description = "Composable command line interface toolkit" optional = false python-versions = ">=3.7" files = [ - {file = "click-8.1.6-py3-none-any.whl", hash = "sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5"}, - {file = "click-8.1.6.tar.gz", hash = "sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd"}, + {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, + {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, ] [package.dependencies] @@ -249,13 +249,13 @@ files = [ [[package]] name = "exceptiongroup" -version = "1.1.2" +version = "1.1.3" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" files = [ - {file = "exceptiongroup-1.1.2-py3-none-any.whl", hash = "sha256:e346e69d186172ca7cf029c8c1d16235aa0e04035e5750b4b95039e65204328f"}, - {file = "exceptiongroup-1.1.2.tar.gz", hash = "sha256:12c3e887d6485d16943a309616de20ae5582633e0a2eda17f4e10fd61c1e8af5"}, + {file = "exceptiongroup-1.1.3-py3-none-any.whl", hash = "sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3"}, + {file = "exceptiongroup-1.1.3.tar.gz", hash = "sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9"}, ] [package.extras] @@ -295,13 +295,13 @@ testing = ["covdefaults (>=2.3)", "coverage (>=7.3)", "diff-cover (>=7.7)", "pyt [[package]] name = "identify" -version = "2.5.25" +version = "2.5.27" description = "File identification library for Python" optional = false python-versions = ">=3.8" files = [ - {file = "identify-2.5.25-py2.py3-none-any.whl", hash = "sha256:9df2489842707d431b38ce3410ef8df40da5b10a3e28a3fcac1a42523e956409"}, - {file = "identify-2.5.25.tar.gz", hash = "sha256:db4de0e758c0db8f81996816cd2f3f2f8c5c8d49a7fd02f3b4109aac6fd80e29"}, + {file = "identify-2.5.27-py2.py3-none-any.whl", hash = "sha256:fdb527b2dfe24602809b2201e033c2a113d7bdf716db3ca8e3243f735dcecaba"}, + {file = "identify-2.5.27.tar.gz", hash = "sha256:287b75b04a0e22d727bc9a41f0d4f3c1bcada97490fa6eabb5b28f0e9097e733"}, ] [package.extras] @@ -572,13 +572,13 @@ virtualenv = ">=20.10.0" [[package]] name = "pygments" -version = "2.15.1" +version = "2.16.1" description = "Pygments is a syntax highlighting package written in Python." optional = false python-versions = ">=3.7" files = [ - {file = "Pygments-2.15.1-py3-none-any.whl", hash = "sha256:db2db3deb4b4179f399a09054b023b6a586b76499d36965813c71aa8ed7b5fd1"}, - {file = "Pygments-2.15.1.tar.gz", hash = "sha256:8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c"}, + {file = "Pygments-2.16.1-py3-none-any.whl", hash = "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692"}, + {file = "Pygments-2.16.1.tar.gz", hash = "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"}, ] [package.extras] @@ -665,7 +665,6 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, - {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -673,15 +672,8 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, - {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, - {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, - {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, - {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, - {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -698,7 +690,6 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, - {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -706,7 +697,6 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, - {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -735,13 +725,13 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "rich" -version = "13.4.2" +version = "13.5.2" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" optional = false python-versions = ">=3.7.0" files = [ - {file = "rich-13.4.2-py3-none-any.whl", hash = "sha256:8f87bc7ee54675732fa66a05ebfe489e27264caeeff3728c945d25971b6485ec"}, - {file = "rich-13.4.2.tar.gz", hash = "sha256:d653d6bccede5844304c605d5aac802c7cf9621efd700b46c7ec2b51ea914898"}, + {file = "rich-13.5.2-py3-none-any.whl", hash = "sha256:146a90b3b6b47cac4a73c12866a499e9817426423f57c5a66949c086191a8808"}, + {file = "rich-13.5.2.tar.gz", hash = "sha256:fb9d6c0a0f643c99eed3875b5377a184132ba9be4d61516a55273d3554d75a39"}, ] [package.dependencies] @@ -754,18 +744,18 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"] [[package]] name = "setuptools" -version = "68.0.0" +version = "68.1.2" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "setuptools-68.0.0-py3-none-any.whl", hash = "sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f"}, - {file = "setuptools-68.0.0.tar.gz", hash = "sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235"}, + {file = "setuptools-68.1.2-py3-none-any.whl", hash = "sha256:3d8083eed2d13afc9426f227b24fd1659489ec107c0e86cec2ffdde5c92e790b"}, + {file = "setuptools-68.1.2.tar.gz", hash = "sha256:3d4dfa6d95f1b101d695a6160a7626e15583af71a5f52176efa5d39a054d475d"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5,<=7.1.2)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] +testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] [[package]] @@ -780,13 +770,13 @@ files = [ [[package]] name = "shellingham" -version = "1.5.0.post1" +version = "1.5.3" description = "Tool to Detect Surrounding Shell" optional = false python-versions = ">=3.7" files = [ - {file = "shellingham-1.5.0.post1-py2.py3-none-any.whl", hash = "sha256:368bf8c00754fd4f55afb7bbb86e272df77e4dc76ac29dbcbb81a59e9fc15744"}, - {file = "shellingham-1.5.0.post1.tar.gz", hash = "sha256:823bc5fb5c34d60f285b624e7264f4dda254bc803a3774a147bf99c0e3004a28"}, + {file = "shellingham-1.5.3-py2.py3-none-any.whl", hash = "sha256:419c6a164770c9c7cfcaeddfacb3d31ac7a8db0b0f3e9c1287679359734107e9"}, + {file = "shellingham-1.5.3.tar.gz", hash = "sha256:cb4a6fec583535bc6da17b647dd2330cf7ef30239e05d547d99ae3705fd0f7f8"}, ] [[package]] @@ -802,13 +792,13 @@ files = [ [[package]] name = "soupsieve" -version = "2.4.1" +version = "2.5" description = "A modern CSS selector implementation for Beautiful Soup." optional = true -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "soupsieve-2.4.1-py3-none-any.whl", hash = "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8"}, - {file = "soupsieve-2.4.1.tar.gz", hash = "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"}, + {file = "soupsieve-2.5-py3-none-any.whl", hash = "sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7"}, + {file = "soupsieve-2.5.tar.gz", hash = "sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690"}, ] [[package]] @@ -851,20 +841,20 @@ testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pol [[package]] name = "tqdm" -version = "4.65.0" +version = "4.66.1" description = "Fast, Extensible Progress Meter" optional = true python-versions = ">=3.7" files = [ - {file = "tqdm-4.65.0-py3-none-any.whl", hash = "sha256:c4f53a17fe37e132815abceec022631be8ffe1b9381c2e6e30aa70edc99e9671"}, - {file = "tqdm-4.65.0.tar.gz", hash = "sha256:1871fb68a86b8fb3b59ca4cdd3dcccbc7e6d613eeed31f4c332531977b89beb5"}, + {file = "tqdm-4.66.1-py3-none-any.whl", hash = "sha256:d302b3c5b53d47bce91fea46679d9c3c6508cf6332229aa1e7d8653723793386"}, + {file = "tqdm-4.66.1.tar.gz", hash = "sha256:d88e651f9db8d8551a62556d3cff9e3034274ca5d66e93197cf2490e2dcb69c7"}, ] [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} [package.extras] -dev = ["py-make (>=0.1.0)", "twine", "wheel"] +dev = ["pytest (>=6)", "pytest-cov", "pytest-timeout", "pytest-xdist"] notebook = ["ipywidgets (>=6)"] slack = ["slack-sdk"] telegram = ["requests"] @@ -922,13 +912,13 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "virtualenv" -version = "20.24.3" +version = "20.24.4" description = "Virtual Python Environment builder" optional = false python-versions = ">=3.7" files = [ - {file = "virtualenv-20.24.3-py3-none-any.whl", hash = "sha256:95a6e9398b4967fbcb5fef2acec5efaf9aa4972049d9ae41f95e0972a683fd02"}, - {file = "virtualenv-20.24.3.tar.gz", hash = "sha256:e5c3b4ce817b0b328af041506a2a299418c98747c4b1e68cb7527e74ced23efc"}, + {file = "virtualenv-20.24.4-py3-none-any.whl", hash = "sha256:29c70bb9b88510f6414ac3e55c8b413a1f96239b6b789ca123437d5e892190cb"}, + {file = "virtualenv-20.24.4.tar.gz", hash = "sha256:772b05bfda7ed3b8ecd16021ca9716273ad9f4467c801f27e83ac73430246dca"}, ] [package.dependencies] @@ -937,7 +927,7 @@ filelock = ">=3.12.2,<4" platformdirs = ">=3.9.1,<4" [package.extras] -docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] [[package]] diff --git a/pyproject.toml b/pyproject.toml index 4228ba75c..65f7a06ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gvsbuild" -version = "2023.8.0" +version = "2023.9.0" description = "GTK stack for Windows" authors = ["Ignacio Casal Quinteiro ", "Dan Yeaw "] license = "GPL-2.0-only" From c7dc80f424d3d2558d22efe05d28723610b8fd9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 06:17:08 -0400 Subject: [PATCH 79/80] build(deps): bump actions/checkout from 3.6.0 to 4.0.0 (#1052) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.6.0...v4.0.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 764ff40f8..4b1cdb86d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: timeout-minutes: 10 if: "!contains(github.event.head_commit.message, 'skip ci')" steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python @@ -43,7 +43,7 @@ jobs: if: "!contains(github.event.head_commit.message, 'skip ci')" steps: - name: Checkout - uses: actions/checkout@v3.6.0 + uses: actions/checkout@v4.0.0 with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python @@ -90,7 +90,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.6.0 + uses: actions/checkout@v4.0.0 with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python From ab041f0cc7ea9f5e39ab073095639208b6141a9d Mon Sep 17 00:00:00 2001 From: Elias Carotti Date: Tue, 5 Sep 2023 11:07:16 +0200 Subject: [PATCH 80/80] Add -MD to link with the thread-safe version of libc --- gvsbuild/patches/ffmpeg/build/build.sh | 2 ++ gvsbuild/patches/x264/build/build.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gvsbuild/patches/ffmpeg/build/build.sh b/gvsbuild/patches/ffmpeg/build/build.sh index be3886e3e..208147b31 100644 --- a/gvsbuild/patches/ffmpeg/build/build.sh +++ b/gvsbuild/patches/ffmpeg/build/build.sh @@ -41,6 +41,8 @@ if [ "$build_type" = "debug" ]; then configure_cmd[idx++]="--enable-debug" # FIXME: the -Od and -Zi instructions are overriden in the compilation command configure_cmd[idx++]="--extra-cflags=\"-Od -Zi -MDd\"" +else + configure_cmd[idx++]="--extra-cflags=-MD" fi if [ "$enable_gpl" = "enable_gpl" ]; then diff --git a/gvsbuild/patches/x264/build/build.sh b/gvsbuild/patches/x264/build/build.sh index d70771278..e2cbb464a 100644 --- a/gvsbuild/patches/x264/build/build.sh +++ b/gvsbuild/patches/x264/build/build.sh @@ -14,6 +14,8 @@ configure_cmd[idx++]="--extra-cflags=-DNO_PREFIX" if [ "$build_type" = "debug" ]; then configure_cmd[idx++]="--enable-debug" configure_cmd[idx++]="--extra-cflags=-MDd -Od -Zi" +else + configure_cmd[idx++]="--extra-cflags=-MD" fi if [ "$build_type" = "debug-optimized" ]; then