修复 libxml2, libxslt

swoole · Oct 24, 2024 · 548e4c5 · 548e4c5
1 parent bfb1738
commit 548e4c5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/sapi/src/Preprocessor.php b/sapi/src/Preprocessor.php
@@ -338,7 +338,7 @@ public function donotInstallLibrary()
      * @param string $file
      * @param object|null $project [ $lib or $ext ]
      */
-    protected function downloadFile(string $url, string $file, object $project = null)
+    protected function downloadFile(string $url, string $file, ?object $project = null)
     {
         $retry_number = DOWNLOAD_FILE_RETRY_NUMBE;
         $wait_retry = DOWNLOAD_FILE_WAIT_RETRY;
@@ -847,6 +847,7 @@ public function execute(): void
         }
 
         $this->generateFile(__DIR__ . '/template/make.php', $this->rootDir . '/make.sh');
+        shell_exec('chmod a+x '.$this->rootDir . '/make.sh');
         $this->mkdirIfNotExists($this->rootDir . '/bin');
         $this->generateFile(__DIR__ . '/template/license.php', $this->rootDir . '/bin/LICENSE');
         $this->generateFile(__DIR__ . '/template/credits.php', $this->rootDir . '/bin/credits.html');

diff --git a/sapi/src/builder/library/libxml2.php b/sapi/src/builder/library/libxml2.php
@@ -10,9 +10,10 @@
         (new Library('libxml2'))
             ->withHomePage('https://gitlab.gnome.org/GNOME/libxml2/')
             ->withManual('https://gitlab.gnome.org/GNOME/libxml2/-/wikis')
+            ->withFile('libxml2-v2.9.14.tar.gz')
             ->withLicense('https://www.opensource.org/licenses/mit-license.html', Library::LICENSE_MIT)
-            ->withUrl('https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.9.10/libxml2-v2.9.10.tar.gz')
-            ->withFileHash('md5', 'b18faee9173c3378c910f6d7d1493115')
+            ->withUrl('https://github.com/GNOME/libxml2/archive/refs/tags/v2.9.14.tar.gz')
+            ->withFileHash('md5', '801d9101ff91e258c02c74d2166323c3')
             ->withPrefix($libxml2_prefix)
             ->withConfigure(
                 <<<EOF

diff --git a/sapi/src/builder/library/libxslt.php b/sapi/src/builder/library/libxslt.php
@@ -11,8 +11,9 @@
             ->withHomePage('https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home')
             ->withManual('https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home')
             ->withLicense('http://www.opensource.org/licenses/mit-license.html', Library::LICENSE_MIT)
-            ->withUrl('https://gitlab.gnome.org/GNOME/libxslt/-/archive/v1.1.34/libxslt-v1.1.34.tar.gz')
-            ->withFileHash('md5', '0b89ee955fd13326d40e762242da7f84')
+            ->withUrl('https://github.com/GNOME/libxslt/archive/refs/tags/v1.1.34.tar.gz')
+            ->withFile('libxslt-v1.1.34.tar.gz')
+            ->withFileHash('md5', 'a96b227436c0f394a59509fc7bfefcb4')
             ->withPrefix($libxslt_prefix)
             ->withConfigure(
                 <<<EOF