CVS commit: pkgsrc/devel/py-ninja

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Dec 27 22:17:02 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.13.0

1.13.0

break: drop Python 3.7, manylinux2010 & musllinux_1_1
feat: use 1.13.0 official release
feat: use 1.13.0 from Kitware fork (older Make observers support)
feat: add riscv64 linux wheels
feat: use a manylinux_2_31 compatible image for riscv64
fix: fail early if Ninja sources are missing
chore(deps): bump pypa/cibuildwheel from 2.23 to 3.1
chore: Simplify build-system replacing FetchContent calls with add_subdirectory
ci: split QEMU builds


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-ninja/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-ninja/distinfo
cvs rdiff -u -r1.3 -r1.4 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.6 pkgsrc/devel/py-ninja/Makefile:1.7
--- pkgsrc/devel/py-ninja/Makefile:1.6  Wed Apr  2 15:12:07 2025
+++ pkgsrc/devel/py-ninja/Makefile      Sat Dec 27 22:17:02 2025
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2025/04/02 15:12:07 adam Exp $
+# $NetBSD: Makefile,v 1.7 2025/12/27 22:17:02 adam Exp $
 
-DISTNAME=      ninja-1.11.1.4
+DISTNAME=      ninja-1.13.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/ninja/}
-DISTFILES=     ${DEFAULT_DISTFILES} ninja-1.11.1.tar.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/scikit-build/ninja-python-distributions
@@ -23,13 +22,10 @@ USE_LANGUAGES=      c c++
 
 INSTALLATION_DIRS+=    ${PYSITELIB}/ninja/data/bin
 
-# avoid building ninja again, just provide source code so CMake is happy
-post-extract:
-       cd ${WRKSRC} && ${LN} -s ../ninja-1.11.1 Ninja-src
-
 # add symlink where the normal build system would put the freshly-compiled ninja binary
 post-install:
        cd ${DESTDIR}${PREFIX}/${PYSITELIB}/ninja/data/bin && ${LN} -s ${PREFIX}/bin/ninja .
 
+.include "../../devel/googletest/buildlink3.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-ninja/distinfo
diff -u pkgsrc/devel/py-ninja/distinfo:1.4 pkgsrc/devel/py-ninja/distinfo:1.5
--- pkgsrc/devel/py-ninja/distinfo:1.4  Wed Apr  2 15:12:07 2025
+++ pkgsrc/devel/py-ninja/distinfo      Sat Dec 27 22:17:02 2025
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2025/04/02 15:12:07 adam Exp $
+$NetBSD: distinfo,v 1.5 2025/12/27 22:17:02 adam Exp $
 
-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) = ff781319d1cd47bc655cebe6f54eec8234b1dc6f
+BLAKE2s (ninja-1.13.0.tar.gz) = 2d52248690f4623a5d8935b6685e5fc5e7ec6667f0d0d08273748c663a7c823b
+SHA512 (ninja-1.13.0.tar.gz) = 383c342ff3ea061e83ccec0100d6e03b65268792a93fed58f6e7a6fc29d996c9639ed5f71b5800e69fec6f989b3e6221de496e35f9ee67d9f5f2e84621fb3d08
+Size (ninja-1.13.0.tar.gz) = 242558 bytes
+SHA1 (patch-CMakeLists.txt) = 071d718895af64ee7a215bb9c0d3a7e6f6619458

Index: pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt:1.3 pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt:1.3      Wed Apr  2 15:12:07 2025
+++ pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt  Sat Dec 27 22:17:02 2025
@@ -1,28 +1,22 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2025/04/02 15:12:07 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2025/12/27 22:17:02 adam Exp $
 
-Avoid downloading and building ninja.
-We'll just install a link to the pkgsrc copy in the package Makefile
-instead.
+Don't build ninja binary. Just install a link to the pkgsrc copy in the package
+Makefile instead.
 
---- CMakeLists.txt.orig        2025-04-02 15:03:02.617445005 +0000
+--- CMakeLists.txt.orig        2022-11-09 12:37:21.000000000 +0000
 +++ CMakeLists.txt
-@@ -13,12 +13,6 @@ message(STATUS "")
+@@ -23,7 +23,6 @@ message(STATUS "")
  message(STATUS "  RUN_NINJA_TEST : ${RUN_NINJA_TEST}")
  message(STATUS "************************************")
  
--include(FetchContent)
--FetchContent_Declare(
--  ninja
--  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ninja-upstream
--)
--FetchContent_MakeAvailable(ninja)
+-add_subdirectory(ninja-upstream)
  
  if(RUN_NINJA_TEST)
    add_custom_target(
-@@ -28,5 +22,5 @@ if(RUN_NINJA_TEST)
+@@ -33,5 +32,5 @@ if(RUN_NINJA_TEST)
    )
  endif()
  
 -install(TARGETS ninja COMPONENT python DESTINATION "${SKBUILD_SCRIPTS_DIR}")
-+set(ninja_SOURCE_DIR "${CMAKE_SOURCE_DIR}/Ninja-src")
++set(ninja_SOURCE_DIR "${CMAKE_SOURCE_DIR}/ninja-upstream")
  install(FILES "${ninja_SOURCE_DIR}/misc/ninja_syntax.py" COMPONENT python DESTINATION ninja)