diff --git a/recipes/devel/ninja.yaml b/recipes/devel/ninja.yaml index 44e1744d..4e3c5f3c 100644 --- a/recipes/devel/ninja.yaml +++ b/recipes/devel/ninja.yaml @@ -1,18 +1,15 @@ inherit: [cpackage, install, patch] metaEnvironment: - PKG_VERSION: "1.11.1.g95dee.kitware.jobserver-1" + PKG_VERSION: "1.13.1" + PKG_LICENSE: "Apache-2.0" checkoutSCM: scm: url - url: ${GITHUB_MIRROR}/Kitware/ninja/archive/v${PKG_VERSION}.tar.gz - digestSHA256: 7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db + url: ${GITHUB_MIRROR}/ninja-build/ninja/archive/v1.13.1.tar.gz + digestSHA256: f0055ad0369bf2e372955ba55128d000cfcc21777057806015b45e4accbebf23 stripComponents: 1 -checkoutDeterministic: True -checkoutScript: | - patchApplySeries $<@ninja/*.patch@> - buildVars: [AR, CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS] buildToolsWeak: [python3] multiPackage: diff --git a/recipes/devel/ninja/0001-Replace-pipes.quote-with-shlex.quote-in-configure.py.patch b/recipes/devel/ninja/0001-Replace-pipes.quote-with-shlex.quote-in-configure.py.patch deleted file mode 100644 index 20836224..00000000 --- a/recipes/devel/ninja/0001-Replace-pipes.quote-with-shlex.quote-in-configure.py.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9cf13cd1ecb7ae649394f4133d121a01e191560b Mon Sep 17 00:00:00 2001 -From: Byoungchan Lee -Date: Mon, 9 Oct 2023 20:13:20 +0900 -Subject: [PATCH] Replace pipes.quote with shlex.quote in configure.py - -Python 3.12 deprecated the pipes module and it will be removed -in Python 3.13. In configure.py, I have replaced the usage of pipes.quote -with shlex.quote, which is the exactly same function as pipes.quote. - -For more details, refer to PEP 0594: https://peps.python.org/pep-0594 ---- - configure.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.py b/configure.py -index 588250a..c6973cd 100755 ---- a/configure.py -+++ b/configure.py -@@ -21,7 +21,7 @@ or use a meta-build system that supports Ninja output.""" - - from optparse import OptionParser - import os --import pipes -+import shlex - import string - import subprocess - import sys -@@ -262,7 +262,7 @@ n.variable('configure_args', ' '.join(configure_args)) - env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) - configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) - if configure_env: -- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) -+ config_str = ' '.join([k + '=' + shlex.quote(configure_env[k]) - for k in configure_env]) - n.variable('configure_env', config_str + '$ ') - n.newline() --- -2.48.1 -