From 441f94b6ce0245be56342a4c82db37c266dea4a8 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Wed, 20 Mar 2024 21:03:23 +0800 Subject: [PATCH 1/3] fix pkg-config build for macOS sonoma --- src/SPC/builder/unix/library/pkgconfig.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SPC/builder/unix/library/pkgconfig.php b/src/SPC/builder/unix/library/pkgconfig.php index 18e9b4b9..eac7ab03 100644 --- a/src/SPC/builder/unix/library/pkgconfig.php +++ b/src/SPC/builder/unix/library/pkgconfig.php @@ -8,7 +8,7 @@ trait pkgconfig { protected function build(): void { - $macos_env = "CFLAGS='{$this->builder->arch_c_flags} -Wimplicit-function-declaration' "; + $macos_env = "CFLAGS='{$this->builder->arch_c_flags} -Wimplicit-function-declaration -Wno-int-conversion' "; $linux_env = 'LDFLAGS=--static '; shell()->cd($this->source_dir) From 47feedecb633680c6effa230d63aa70b128526e4 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Wed, 20 Mar 2024 21:09:14 +0800 Subject: [PATCH 2/3] cs fix --- src/SPC/builder/traits/UnixLibraryTrait.php | 2 +- src/SPC/command/BaseCommand.php | 2 +- src/SPC/command/BuildCommand.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SPC/builder/traits/UnixLibraryTrait.php b/src/SPC/builder/traits/UnixLibraryTrait.php index 19005476..9561663f 100644 --- a/src/SPC/builder/traits/UnixLibraryTrait.php +++ b/src/SPC/builder/traits/UnixLibraryTrait.php @@ -48,7 +48,7 @@ public function getStaticLibFiles(string $style = 'autoconf', bool $recursive = * @throws RuntimeException * @throws WrongUsageException */ - public function makeAutoconfEnv(string $prefix = null): string + public function makeAutoconfEnv(?string $prefix = null): string { if ($prefix === null) { $prefix = str_replace('-', '_', strtoupper(static::NAME)); diff --git a/src/SPC/command/BaseCommand.php b/src/SPC/command/BaseCommand.php index f3ca525c..31064123 100644 --- a/src/SPC/command/BaseCommand.php +++ b/src/SPC/command/BaseCommand.php @@ -25,7 +25,7 @@ abstract class BaseCommand extends Command protected OutputInterface $output; - public function __construct(string $name = null) + public function __construct(?string $name = null) { parent::__construct($name); $this->addOption('debug', null, null, 'Enable debug mode'); diff --git a/src/SPC/command/BuildCommand.php b/src/SPC/command/BuildCommand.php index 4d3f7d06..bea9c119 100644 --- a/src/SPC/command/BuildCommand.php +++ b/src/SPC/command/BuildCommand.php @@ -8,7 +8,7 @@ abstract class BuildCommand extends BaseCommand { - public function __construct(string $name = null) + public function __construct(?string $name = null) { parent::__construct($name); From 7b23e538b833992dc80de7f4fa8c9c8378abe5e9 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Wed, 20 Mar 2024 21:30:21 +0800 Subject: [PATCH 3/3] bump version to 2.1.6 [skip ci] --- src/SPC/ConsoleApplication.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SPC/ConsoleApplication.php b/src/SPC/ConsoleApplication.php index 9922d8a8..ed37f578 100644 --- a/src/SPC/ConsoleApplication.php +++ b/src/SPC/ConsoleApplication.php @@ -25,7 +25,7 @@ */ final class ConsoleApplication extends Application { - public const VERSION = '2.1.5'; + public const VERSION = '2.1.6'; public function __construct() {