From 8e38c8f308e3357a53d3abe761d7a56fab046451 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 28 Jun 2025 19:23:08 +0200 Subject: [PATCH] ninja, bump to 1.13.0 (#12531) --- ...inja-1.12.1.recipe => ninja-1.13.0.recipe} | 3 +- dev-build/ninja/patches/ninja-1.12.1.patchset | 56 ------------------- 2 files changed, 1 insertion(+), 58 deletions(-) rename dev-build/ninja/{ninja-1.12.1.recipe => ninja-1.13.0.recipe} (93%) delete mode 100644 dev-build/ninja/patches/ninja-1.12.1.patchset diff --git a/dev-build/ninja/ninja-1.12.1.recipe b/dev-build/ninja/ninja-1.13.0.recipe similarity index 93% rename from dev-build/ninja/ninja-1.12.1.recipe rename to dev-build/ninja/ninja-1.13.0.recipe index 063bf7600..89e14de6f 100644 --- a/dev-build/ninja/ninja-1.12.1.recipe +++ b/dev-build/ninja/ninja-1.13.0.recipe @@ -11,8 +11,7 @@ COPYRIGHT="2012-2019 Google Inc." LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://github.com/ninja-build/ninja/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="821bdff48a3f683bc4bb3b6f0b5fe7b2d647cf65d52aeb63328c91a6c6df285a" -PATCHES="ninja-$portVersion.patchset" +CHECKSUM_SHA256="f08641d00099a9e40d44ec0146f841c472ae58b7e6dd517bee3945cfd923cedf" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" diff --git a/dev-build/ninja/patches/ninja-1.12.1.patchset b/dev-build/ninja/patches/ninja-1.12.1.patchset deleted file mode 100644 index a5cad5d48..000000000 --- a/dev-build/ninja/patches/ninja-1.12.1.patchset +++ /dev/null @@ -1,56 +0,0 @@ -From b9bb78e8e8292121be1ad4e265127434f281fd25 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Sat, 16 Sep 2017 12:25:48 +0200 -Subject: Add minimal Haiku support; based on Adrien's patch. - - -diff --git a/src/util.cc b/src/util.cc -index 7668e33..a51bc7e 100644 ---- a/src/util.cc -+++ b/src/util.cc -@@ -814,7 +814,7 @@ int GetProcessorCount() { - #endif - } - --#if defined(_WIN32) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__HAIKU__) - static double CalculateProcessorLoad(uint64_t idle_ticks, uint64_t total_ticks) - { - static uint64_t previous_idle_ticks = 0; --- -2.48.1 - - -From 39387b0a89556bac65c523094d17c4bb01fdb1b7 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 16 Sep 2017 12:48:42 +0200 -Subject: GetLoadAvg to be implemented for Haiku - - -diff --git a/src/util.cc b/src/util.cc -index a51bc7e..2c46090 100644 ---- a/src/util.cc -+++ b/src/util.cc -@@ -814,7 +814,7 @@ int GetProcessorCount() { - #endif - } - --#if defined(_WIN32) || defined(__CYGWIN__) || defined(__HAIKU__) -+#if defined(_WIN32) || defined(__CYGWIN__) - static double CalculateProcessorLoad(uint64_t idle_ticks, uint64_t total_ticks) - { - static uint64_t previous_idle_ticks = 0; -@@ -905,6 +905,10 @@ double GetLoadAverage() { - double GetLoadAverage() { - return -0.0f; - } -+#elif defined(__HAIKU__) -+double GetLoadAverage() { -+ return -0.0f; -+} - #else - double GetLoadAverage() { - double loadavg[3] = { 0.0f, 0.0f, 0.0f }; --- -2.48.1 -