From 0d6453751de64ace7620343f13c3dc8e6cf90674 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Sat, 19 Jul 2025 23:54:38 +0700 Subject: [PATCH] fixes --- .php-cs-fixer.php | 1 + config/lib.json | 4 +--- config/source.json | 1 - src/SPC/builder/unix/library/jbig.php | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 47d17866..55fca81a 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -4,6 +4,7 @@ declare(strict_types=1); return (new PhpCsFixer\Config()) ->setRiskyAllowed(true) + ->setUnsupportedPhpVersionAllowed(true) ->setRules([ '@PSR12' => true, '@Symfony' => true, diff --git a/config/lib.json b/config/lib.json index 1ad1494f..964876b8 100644 --- a/config/lib.json +++ b/config/lib.json @@ -497,6 +497,7 @@ "static-libs-windows": [ "libssh2.lib" ], + "provide-pre-built": true, "headers": [ "libssh2.h", "libssh2_publickey.h", @@ -504,9 +505,6 @@ ], "lib-depends": [ "openssl" - ], - "lib-suggests": [ - "zlib" ] }, "libtiff": { diff --git a/config/source.json b/config/source.json index 81b3f074..82cc2395 100644 --- a/config/source.json +++ b/config/source.json @@ -625,7 +625,6 @@ "type": "filelist", "url": "https://download.osgeo.org/libtiff/", "regex": "/href=\"(?tiff-(?[^\"]+)\\.tar\\.xz)\"/", - "provide-pre-built": true, "license": { "type": "file", "path": "LICENSE.md" diff --git a/src/SPC/builder/unix/library/jbig.php b/src/SPC/builder/unix/library/jbig.php index 515c72bd..85e24748 100644 --- a/src/SPC/builder/unix/library/jbig.php +++ b/src/SPC/builder/unix/library/jbig.php @@ -15,8 +15,8 @@ trait jbig */ public function patchBeforeBuild(): bool { - // Patch Makefile to add -fPIC flag for position-independent code FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'CFLAGS = -O2 -W -Wno-unused-result', 'CFLAGS = -O2 -W -Wno-unused-result -fPIC'); + return true; } /** @@ -24,7 +24,6 @@ trait jbig */ protected function build(): void { - // Build the library shell()->cd($this->source_dir)->initializeEnv($this) ->exec("make -j{$this->builder->concurrency} {$this->builder->getEnvString()} lib") ->exec('cp libjbig/libjbig.a ' . BUILD_LIB_PATH)