Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
e3ada2f7
by Hugh McMaster at 2023-08-24T20:47:00+02:00
-
aa5f0018
by Werner Lemberg at 2023-08-24T20:47:00+02:00
3 changed files:
Changes:
| ... | ... | @@ -966,14 +966,14 @@ esac |
| 966 | 966 | AX_PTHREAD([have_pthread=yes], [have_pthread=no])
|
| 967 | 967 | |
| 968 | 968 | # Check for Python and docwriter
|
| 969 | - |
|
| 969 | +PYTHON_MIN_VERSION=3.5
|
|
| 970 | 970 | have_py3=no
|
| 971 | 971 | have_docwriter=no
|
| 972 | 972 | PIP=pip
|
| 973 | 973 | |
| 974 | 974 | AC_CHECK_PROGS([PYTHON], [python3 python], [missing])
|
| 975 | 975 | if test "x$PYTHON" != "xmissing"; then
|
| 976 | - AX_PROG_PYTHON_VERSION([3.5], [have_py3=yes], [])
|
|
| 976 | + AX_PROG_PYTHON_VERSION([$PYTHON_MIN_VERSION], [have_py3=yes], [])
|
|
| 977 | 977 | |
| 978 | 978 | if test "x$have_py3" = "xyes"; then
|
| 979 | 979 | PIP="$PYTHON -m $PIP"
|
| ... | ... | @@ -1162,7 +1162,7 @@ if test $have_docwriter = no; then |
| 1162 | 1162 | `make refdoc' will fail since pip package `docwriter' is not installed.
|
| 1163 | 1163 | To install, run `$PIP install docwriter', or to use a Python
|
| 1164 | 1164 | virtual environment, run `make refdoc-venv' (requires pip package
|
| 1165 | - `virtualenv'). These operations require Python >= 3.5.
|
|
| 1165 | + `virtualenv'). These operations require Python >= $PYTHON_MIN_VERSION.
|
|
| 1166 | 1166 | ])
|
| 1167 | 1167 | fi
|
| 1168 | 1168 |
| 1 | 1 | [wrap-file]
|
| 2 | -directory = libpng-1.6.39
|
|
| 3 | -source_url = https://github.com/glennrp/libpng/archive/v1.6.39.tar.gz
|
|
| 4 | -source_filename = libpng-1.6.39.tar.gz
|
|
| 5 | -source_hash = a00e9d2f2f664186e4202db9299397f851aea71b36a35e74910b8820e380d441
|
|
| 6 | -patch_filename = libpng_1.6.39-3_patch.zip
|
|
| 7 | -patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.39-3/get_patch
|
|
| 8 | -patch_hash = 6af2a8d464e3f1d2e2832580896323ac7b0b786806c75f0eff0c8ec82dd603ec
|
|
| 9 | -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.39-3/libpng-1.6.39.tar.gz
|
|
| 10 | -wrapdb_version = 1.6.39-3
|
|
| 2 | +directory = libpng-1.6.40
|
|
| 3 | +source_url = https://github.com/glennrp/libpng/archive/v1.6.40.tar.gz
|
|
| 4 | +source_filename = libpng-1.6.40.tar.gz
|
|
| 5 | +source_hash = 62d25af25e636454b005c93cae51ddcd5383c40fa14aa3dae8f6576feb5692c2
|
|
| 6 | +patch_filename = libpng_1.6.40-1_patch.zip
|
|
| 7 | +patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.40-1/get_patch
|
|
| 8 | +patch_hash = bad558070e0a82faa5c0ae553bcd12d49021fc4b628f232a8e58c3fbd281aae1
|
|
| 9 | +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.40-1/libpng-1.6.40.tar.gz
|
|
| 10 | +wrapdb_version = 1.6.40-1
|
|
| 11 | 11 | |
| 12 | 12 | [provide]
|
| 13 | 13 | libpng = libpng_dep |
| 1 | 1 | [wrap-file]
|
| 2 | -directory = zlib-1.2.13
|
|
| 3 | -source_url = http://zlib.net/fossils/zlib-1.2.13.tar.gz
|
|
| 4 | -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.2.13-4/zlib-1.2.13.tar.gz
|
|
| 5 | -source_filename = zlib-1.2.13.tar.gz
|
|
| 6 | -source_hash = b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
|
|
| 7 | -patch_filename = zlib_1.2.13-4_patch.zip
|
|
| 8 | -patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-4/get_patch
|
|
| 9 | -patch_hash = 19636b7807e679b92240bc7a99aed85d1be908a45430b12c7687a825cb499d5e
|
|
| 10 | -wrapdb_version = 1.2.13-4
|
|
| 2 | +directory = zlib-1.3
|
|
| 3 | +source_url = http://zlib.net/fossils/zlib-1.3.tar.gz
|
|
| 4 | +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3-1/zlib-1.3.tar.gz
|
|
| 5 | +source_filename = zlib-1.3.tar.gz
|
|
| 6 | +source_hash = ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
|
|
| 7 | +patch_filename = zlib_1.3-1_patch.zip
|
|
| 8 | +patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3-1/get_patch
|
|
| 9 | +patch_hash = ab9d6b8167bb34a7c52b60b0cd6138aa4e0c2d31f997343a5f506f3b97b32008
|
|
| 10 | +wrapdb_version = 1.3-1
|
|
| 11 | 11 | |
| 12 | 12 | [provide]
|
| 13 | 13 | zlib = zlib_dep |