diff --git a/config/ext.json b/config/ext.json index ea15b495..7c4d531e 100644 --- a/config/ext.json +++ b/config/ext.json @@ -215,6 +215,10 @@ "type": "builtin", "unix-only": true }, + "protobuf": { + "type": "external", + "source": "protobuf" + }, "pspell": { "type": "builtin", "arg-type": "with", @@ -356,10 +360,6 @@ "libxslt" ] }, - "protobuf": { - "type": "external", - "source": "protobuf" - }, "yaml": { "type": "external", "source": "yaml", diff --git a/config/lib.json b/config/lib.json index f1177817..e872126f 100644 --- a/config/lib.json +++ b/config/lib.json @@ -66,6 +66,16 @@ "SystemConfiguration" ] }, + "freetype": { + "source": "freetype", + "static-libs-unix": [ + "libfreetype.a" + ], + "headers-unix": [ + "freetype2/freetype/freetype.h", + "freetype2/ft2build.h" + ] + }, "gmp": { "source": "gmp", "static-libs-unix": [ @@ -96,7 +106,23 @@ "ffitarget.h" ] }, - + "libiconv": { + "source": "libiconv", + "static-libs-unix": [ + "libiconv.a" + ], + "headers": [ + "iconv.h", + "libcharset.h", + "localcharset.h" + ] + }, + "libmcrypt": { + "source": "libmcrypt", + "static-libs-unix": [ + "libmcrypt.a" + ] + }, "libpng": { "source": "libpng", "static-libs-unix": [ @@ -118,23 +144,6 @@ "zlib" ] }, - "glib": { - "source": "glib", - "static-libs-unix": [ - "libglib-2.0.a", - "libgio-2.0.a", - "libgmodule-2.0.a", - "libgobject-2.0.a", - "libgthread-2.0.a" - ], - "bin-depends-unix": [ - "meson", - "ninja" - ], - "headers": [ - "glib-2.0" - ] - }, "libssh2": { "source": "libssh2", "static-libs-unix": [ @@ -155,6 +164,15 @@ "zlib" ] }, + "libuv": { + "source": "libuv", + "static-libs-unix": [ + "libuv.a" + ], + "headers": [ + "uv.h" + ] + }, "libxml2": { "source": "libxml2", "static-libs-unix": [ @@ -183,17 +201,6 @@ "pthreads4w" ] }, - "libiconv": { - "source": "libiconv", - "static-libs-unix": [ - "libiconv.a" - ], - "headers": [ - "iconv.h", - "libcharset.h", - "localcharset.h" - ] - }, "libyaml": { "source": "libyaml", "static-libs-unix": [ @@ -231,28 +238,12 @@ "openssl" ] }, - "libmcrypt": { - "source": "libmcrypt", - "static-libs-unix": [ - "libmcrypt.a" - ] - }, "mcrypt": { "source": "mcrypt", "static-libs-unix": [ "libmcrypt.a" ] }, - "freetype": { - "source": "freetype", - "static-libs-unix": [ - "libfreetype.a" - ], - "headers-unix": [ - "freetype2/freetype/freetype.h", - "freetype2/ft2build.h" - ] - }, "nghttp2": { "source": "nghttp2", "static-libs-unix": [ @@ -282,15 +273,6 @@ "cunit" ] }, - "libuv": { - "source": "libuv", - "static-libs-unix": [ - "libuv.a" - ], - "headers": [ - "uv.h" - ] - }, "onig": { "source": "onig", "static-libs-unix": [ diff --git a/config/source.json b/config/source.json index 6aa0362f..3d60d094 100644 --- a/config/source.json +++ b/config/source.json @@ -62,12 +62,13 @@ "path": "LICENSE" } }, - "mcrypt": { - "type": "url", - "url": "https://jaist.dl.sourceforge.net/project/mcrypt/MCrypt/2.6.8/mcrypt-2.6.8.tar.gz", + "libiconv": { + "type": "filelist", + "url": "https://ftp.gnu.org/gnu/libiconv/", + "regex": "/href=\"(?libiconv-(?[^\"]+)\\.tar\\.gz)\"/", "license": { - "type": "file", - "path": "COPYING" + "type": "text", + "text": "TODO" } }, "libmcrypt": { @@ -105,6 +106,14 @@ "path": "COPYING" } }, + "libuv": { + "type": "ghtar", + "repo": "libuv/libuv", + "license": { + "type": "file", + "path": "LICENSE" + } + }, "libxml2": { "type": "url", "url": "https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.9.14/libxml2-v2.9.14.tar.gz", @@ -131,6 +140,14 @@ "path": "LICENSE" } }, + "mcrypt": { + "type": "url", + "url": "https://jaist.dl.sourceforge.net/project/mcrypt/MCrypt/2.6.8/mcrypt-2.6.8.tar.gz", + "license": { + "type": "file", + "path": "COPYING" + } + }, "micro": { "type": "git", "path": "php-src/sapi/micro", @@ -160,24 +177,6 @@ "path": "COPYING" } }, - "libuv": { - "type": "ghtar", - "repo": "libuv/libuv", - "license": { - "type": "file", - "path": "LICENSE" - } - }, - "protobuf": { - "type": "url", - "url": "http://pecl.php.net/get/protobuf", - "path": "php-src/ext/protobuf", - "filename": "protobuf.tgz", - "license": { - "type": "file", - "path": "LICENSE" - } - }, "onig": { "type": "ghrel", "repo": "kkos/oniguruma", @@ -196,6 +195,16 @@ "path": "LICENSE.txt" } }, + "protobuf": { + "type": "url", + "url": "http://pecl.php.net/get/protobuf", + "path": "php-src/ext/protobuf", + "filename": "protobuf.tgz", + "license": { + "type": "file", + "path": "LICENSE" + } + }, "pthreads4w": { "type": "git", "rev": "master", @@ -243,15 +252,6 @@ "path": "LICENSE" } }, - "libiconv":{ - "type": "filelist", - "url": "https://ftp.gnu.org/gnu/libiconv/", - "regex": "/href=\"(?libiconv-(?[^\"]+)\\.tar\\.gz)\"/", - "license": { - "type": "text", - "text": "TODO" - } - }, "xz": { "type": "filelist", "url": "https://tukaani.org/xz/",