From a93759d78e319cf89799846c8eb3d45894767467 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 28 Apr 2024 22:19:06 +0000 Subject: [PATCH] extra/ninja to 1.12.0-2 --- extra/ninja/.SRCINFO | 14 ++++++++------ extra/ninja/PKGBUILD | 21 ++++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/extra/ninja/.SRCINFO b/extra/ninja/.SRCINFO index e34edbd31..e212e3c8b 100644 --- a/extra/ninja/.SRCINFO +++ b/extra/ninja/.SRCINFO @@ -1,16 +1,18 @@ pkgbase = ninja pkgdesc = Small build system with a focus on speed - pkgver = 1.11.1 - pkgrel = 4 + pkgver = 1.12.0 + pkgrel = 2 url = https://ninja-build.org/ arch = x86_64 - license = Apache + license = Apache-2.0 + checkdepends = gtest + makedepends = cmake makedepends = python makedepends = re2c makedepends = emacs-nox depends = gcc-libs - source = ninja-1.11.1.zip::https://github.com/martine/ninja/archive/v1.11.1.zip - sha1sums = fbcb284b7280335835c3f085fb825e6f1514396e - sha256sums = 03b7ea14bf04b87cbdd64b9a1262577093e177f8e5662515de77f3a796b75951 + source = ninja-1.12.0.zip::https://github.com/ninja-build/ninja/archive/v1.12.0.zip + sha1sums = 53e759ea6ed7895d71ce9f60915b37b20327da55 + sha256sums = 47411d1c95a91f416efc6f1bfb22477047c7a91951711af6123ab68ab11d6fcf pkgname = ninja diff --git a/extra/ninja/PKGBUILD b/extra/ninja/PKGBUILD index fa1bfedb8..a01e7f16b 100644 --- a/extra/ninja/PKGBUILD +++ b/extra/ninja/PKGBUILD @@ -8,17 +8,18 @@ # https://www.linuxfromscratch.org/lfs/view/development/chapter08/ninja.html pkgname=ninja -pkgver=1.11.1 -pkgrel=4 +pkgver=1.12.0 +pkgrel=2 pkgdesc='Small build system with a focus on speed' arch=(x86_64) url='https://ninja-build.org/' license=(Apache-2.0) depends=(gcc-libs) -makedepends=(python re2c emacs-nox) +makedepends=(cmake python re2c emacs-nox) +checkdepends=(gtest) source=($pkgname-$pkgver.zip::https://github.com/ninja-build/ninja/archive/v$pkgver.zip) -sha1sums=('fbcb284b7280335835c3f085fb825e6f1514396e') -sha256sums=('03b7ea14bf04b87cbdd64b9a1262577093e177f8e5662515de77f3a796b75951') +sha1sums=('53e759ea6ed7895d71ce9f60915b37b20327da55') +sha256sums=('47411d1c95a91f416efc6f1bfb22477047c7a91951711af6123ab68ab11d6fcf') prepare() { cd ninja-$pkgver @@ -34,16 +35,14 @@ prepare() { build() { cd ninja-$pkgver - python configure.py --bootstrap + cmake -Bbuild-cmake + cmake --build build-cmake emacs -Q --batch -f batch-byte-compile misc/ninja-mode.el } check() { cd ninja-$pkgver - - python ./configure.py - ./ninja ninja_test - ./ninja_test + ./build-cmake/ninja_test } package() { @@ -51,7 +50,7 @@ package() { local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") - install -m755 -D ninja "$pkgdir/usr/bin/ninja" + install -m755 -D build-cmake/ninja "$pkgdir/usr/bin/ninja" install -m644 -D doc/manual.asciidoc "$pkgdir/usr/share/doc/ninja/manual.asciidoc" install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"