CVS commit: pkgsrc/devel/py-ninja

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Apr  2 15:12:07 UTC 2025

Modified Files:
        pkgsrc/devel/py-ninja: Makefile distinfo
        pkgsrc/devel/py-ninja/patches: patch-CMakeLists.txt

Log Message:
py-ninja: updated to 1.11.1.4

1.11.1.4

ci(linux): use GHA ARM runners to build ARM wheels
fix: linter issues & nox macOS build
feat: use a submodule for ninja sources
chore: use dependency-groups


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-ninja/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-ninja/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-ninja/Makefile
diff -u pkgsrc/devel/py-ninja/Makefile:1.5 pkgsrc/devel/py-ninja/Makefile:1.6
--- pkgsrc/devel/py-ninja/Makefile:1.5  Mon Dec 16 05:45:04 2024
+++ pkgsrc/devel/py-ninja/Makefile      Wed Apr  2 15:12:07 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2024/12/16 05:45:04 adam Exp $
+# $NetBSD: Makefile,v 1.6 2025/04/02 15:12:07 adam Exp $
 
-DISTNAME=      ninja-1.11.1.3
+DISTNAME=      ninja-1.11.1.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/ninja/}

Index: pkgsrc/devel/py-ninja/distinfo
diff -u pkgsrc/devel/py-ninja/distinfo:1.3 pkgsrc/devel/py-ninja/distinfo:1.4
--- pkgsrc/devel/py-ninja/distinfo:1.3  Mon Dec 16 05:45:04 2024
+++ pkgsrc/devel/py-ninja/distinfo      Wed Apr  2 15:12:07 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2024/12/16 05:45:04 adam Exp $
+$NetBSD: distinfo,v 1.4 2025/04/02 15:12:07 adam Exp $
 
-BLAKE2s (ninja-1.11.1.3.tar.gz) = dd22780dd51d5edc29ba96ba70a4f0042eeb4d9fdf7bd8c650223c858c68446f
-SHA512 (ninja-1.11.1.3.tar.gz) = caaf45220a63a785e3d56650e62e4197f90cba532b8182e7b001c7e25d427f2774ffebf8c30a9e969a1bdb7686efa36d483e1c4644952eb94f78d14d98bed0ab
-Size (ninja-1.11.1.3.tar.gz) = 129532 bytes
+BLAKE2s (ninja-1.11.1.4.tar.gz) = 595d7182956346acf16a8e768820eb5997b94e39c495f06c353d2e1c0c1c1dcd
+SHA512 (ninja-1.11.1.4.tar.gz) = ba5d4eddbed187adf309dab653a9f4a115f55a85bb22c1ec002d1227c8ed514515a57429994a1cf44e6e68ea75399b822c0dabd5998f335a88cc2a0137727641
+Size (ninja-1.11.1.4.tar.gz) = 201256 bytes
 BLAKE2s (ninja-1.11.1.tar.gz) = 31edc9a8845b6b1c0f54b8db714d2927b84cf2d0af15754838fcd7c646834a95
 SHA512 (ninja-1.11.1.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 Size (ninja-1.11.1.tar.gz) = 229479 bytes
-SHA1 (patch-CMakeLists.txt) = 8c3d91b8afa76c5b0f98c2bc2f8f49fb9af908b9
+SHA1 (patch-CMakeLists.txt) = ff781319d1cd47bc655cebe6f54eec8234b1dc6f

Index: pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt:1.2 pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt:1.2      Sun Nov 24 07:21:16 2024
+++ pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt  Wed Apr  2 15:12:07 2025
@@ -1,33 +1,28 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2024/11/24 07:21:16 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/04/02 15:12:07 adam Exp $
 
 Avoid downloading and building ninja.
 We'll just install a link to the pkgsrc copy in the package Makefile
 instead.
 
---- CMakeLists.txt.orig        2022-11-09 12:37:21.000000000 +0000
+--- CMakeLists.txt.orig        2025-04-02 15:03:02.617445005 +0000
 +++ CMakeLists.txt
-@@ -24,7 +24,6 @@ set(src_archive "unix_source")
- if(WIN32)
-   set(src_archive "windows_source")
- endif()
--check_archive_var("${src_archive}")
- 
- message(STATUS "*********************************************")
- message(STATUS "Ninja Python Distribution")
-@@ -46,15 +45,5 @@ if(NOT BUILD_VERBOSE)
-     )
- endif()
+@@ -13,12 +13,6 @@ message(STATUS "")
+ message(STATUS "  RUN_NINJA_TEST : ${RUN_NINJA_TEST}")
+ message(STATUS "************************************")
  
 -include(FetchContent)
 -FetchContent_Declare(
 -  ninja
--  URL ${${src_archive}_url}
--  URL_HASH SHA256=${${src_archive}_sha256}
--  DOWNLOAD_DIR ${ARCHIVE_DOWNLOAD_DIR}
--  ${ep_download_no_progress_args}
+-  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ninja-upstream
 -)
 -FetchContent_MakeAvailable(ninja)
--
+ 
+ if(RUN_NINJA_TEST)
+   add_custom_target(
+@@ -28,5 +22,5 @@ if(RUN_NINJA_TEST)
+   )
+ endif()
+ 
 -install(TARGETS ninja COMPONENT python DESTINATION "${SKBUILD_SCRIPTS_DIR}")
 +set(ninja_SOURCE_DIR "${CMAKE_SOURCE_DIR}/Ninja-src")
  install(FILES "${ninja_SOURCE_DIR}/misc/ninja_syntax.py" COMPONENT python DESTINATION ninja)