diff --git a/config/defaults.conf b/config/defaults.conf index 0fbabd9d..c151d05d 100644 --- a/config/defaults.conf +++ b/config/defaults.conf @@ -22,7 +22,6 @@ export QGIS_DOWNLOAD_ROOT_URL="https://qgis.org/downloads/macos" ############################ # QGIS DEPS -export VERSION_major_python=3.7 export ROOT_QT_PATH="/opt/Qt/" export QT_BASE="${ROOT_QT_PATH}/${VERSION_qt}" export MACOSX_DEPLOYMENT_TARGET=10.13.0 diff --git a/config/dev.conf b/config/dev.conf index e2077287..0882baa8 100644 --- a/config/dev.conf +++ b/config/dev.conf @@ -2,8 +2,9 @@ CONFIGDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +export VERSION_major_python=3.8 export VERSION_qt=5.14.2 -export RELEASE_VERSION=0.6.0 +export RELEASE_VERSION=0.7.0 export RELEASE=dev export WITH_ECW="true" diff --git a/config/ltr.conf b/config/ltr.conf index ac3c9698..53648914 100644 --- a/config/ltr.conf +++ b/config/ltr.conf @@ -2,6 +2,7 @@ CONFIGDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +export VERSION_major_python=3.7 export VERSION_qt=5.14.2 export RELEASE_VERSION=0.6.0 export RELEASE=ltr diff --git a/config/nightly.conf b/config/nightly.conf index 7e70a27f..f1d6fc50 100644 --- a/config/nightly.conf +++ b/config/nightly.conf @@ -2,8 +2,9 @@ CONFIGDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +export VERSION_major_python=3.8 export VERSION_qt=5.14.2 -export RELEASE_VERSION=0.6.0 +export RELEASE_VERSION=0.7.0 export RELEASE=nightly export WITH_ECW="true" diff --git a/config/pr.conf b/config/pr.conf index f48d0d83..196412f0 100644 --- a/config/pr.conf +++ b/config/pr.conf @@ -2,6 +2,7 @@ CONFIGDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +export VERSION_major_python=3.7 export VERSION_qt=5.14.2 export RELEASE_VERSION=0.6.0 export RELEASE=pr diff --git a/qgis_bundle/recipes/fontconfig/recipe.sh b/qgis_bundle/recipes/fontconfig/recipe.sh index 8b3910c6..6d9fad7e 100644 --- a/qgis_bundle/recipes/fontconfig/recipe.sh +++ b/qgis_bundle/recipes/fontconfig/recipe.sh @@ -16,7 +16,8 @@ function fix_binaries_fontconfig() { $LINK_expat \ $LINK_freetype \ $LINK_libintl \ - $LINK_zlib + $LINK_zlib \ + $LINK_libpng do install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_LIB_DIR/$LINK_fontconfig done diff --git a/qgis_bundle/recipes/freetype/recipe.sh b/qgis_bundle/recipes/freetype/recipe.sh index e8cf38ab..2e776309 100644 --- a/qgis_bundle/recipes/freetype/recipe.sh +++ b/qgis_bundle/recipes/freetype/recipe.sh @@ -13,7 +13,8 @@ function fix_binaries_freetype() { for i in \ $LINK_bz2 \ - $LINK_zlib + $LINK_zlib \ + $LINK_libpng do install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_LIB_DIR/$LINK_freetype done diff --git a/qgis_bundle/recipes/gdal/recipe.sh b/qgis_bundle/recipes/gdal/recipe.sh index cf4cd4c2..77e4e25c 100644 --- a/qgis_bundle/recipes/gdal/recipe.sh +++ b/qgis_bundle/recipes/gdal/recipe.sh @@ -34,7 +34,6 @@ function bundle_gdal() { gdalmanage \ gdalmdiminfo \ gdalmdimtranslate \ - gdalserver \ gdalsrsinfo \ gdaltindex \ gdaltransform \ @@ -103,7 +102,6 @@ function fix_binaries_gdal() { bin/_gdalmanage \ bin/_gdalmdiminfo \ bin/_gdalmdimtranslate \ - bin/_gdalserver \ bin/_gdalsrsinfo \ bin/_gdaltindex \ bin/_gdaltransform \ @@ -123,6 +121,7 @@ function fix_binaries_gdal() { $LINK_libtiff \ $LINK_libxml2 \ $LINK_libcrypto \ + $LINK_libssl \ $LINK_libpng \ $LINK_libpq \ $LINK_libproj \ @@ -145,6 +144,8 @@ function fix_binaries_gdal() { $LINK_poppler \ $LINK_openjpeg \ $LINK_libltdl \ + $LINK_libcurl \ + $LINK_libssh2 \ $LINK_gdal do install_name_change $DEPS_LIB_DIR/$j @rpath/$j $BUNDLE_CONTENTS_DIR/MacOS/$i @@ -169,7 +170,6 @@ function fix_binaries_gdal() { bin/_gdalmanage \ bin/_gdalmdiminfo \ bin/_gdalmdimtranslate \ - bin/_gdalserver \ bin/_gdalsrsinfo \ bin/_gdaltindex \ bin/_gdaltransform \ diff --git a/qgis_bundle/recipes/libcurl/recipe.sh b/qgis_bundle/recipes/libcurl/recipe.sh new file mode 100644 index 00000000..ed63c9a6 --- /dev/null +++ b/qgis_bundle/recipes/libcurl/recipe.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +function check_libcurl() { + env_var_exists VERSION_libcurl + env_var_exists LINK_libcurl +} + +function bundle_libcurl() { + try cp -av $DEPS_LIB_DIR/libcurl.*dylib $BUNDLE_LIB_DIR +} + +function fix_binaries_libcurl() { + install_name_id @rpath/$LINK_libcurl $BUNDLE_CONTENTS_DIR/MacOS/lib/$LINK_libcurl + + for i in \ + $LINK_libssh2 \ + $LINK_libssl \ + $LINK_libcrypto \ + $LINK_zlib \ + $LINK_zstd + do + install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_LIB_DIR/$LINK_libcurl + done +} + +function fix_binaries_libcurl_check() { + verify_binary $BUNDLE_LIB_DIR/$LINK_libcurl +} + +function fix_paths_libcurl() { + : +} + +function fix_paths_libcurl_check() { + : +} \ No newline at end of file diff --git a/qgis_bundle/recipes/libicu/recipe.sh b/qgis_bundle/recipes/libicu/recipe.sh new file mode 100644 index 00000000..150da32e --- /dev/null +++ b/qgis_bundle/recipes/libicu/recipe.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +function check_libicu() { + env_var_exists VERSION_libicu + env_var_exists LINK_libicudata +} + +function bundle_libicu() { + try cp -av $DEPS_LIB_DIR/libicudata.*dylib $BUNDLE_LIB_DIR + try cp -av $DEPS_LIB_DIR/libicuuc.*dylib $BUNDLE_LIB_DIR + try cp -av $DEPS_LIB_DIR/libicui18n.*dylib $BUNDLE_LIB_DIR + try cp -av $DEPS_LIB_DIR/libicuio.*dylib $BUNDLE_LIB_DIR + try cp -av $DEPS_LIB_DIR/libicutu.*dylib $BUNDLE_LIB_DIR +} + +function fix_binaries_libicu() { + targets=( + $LINK_libicudata + $LINK_libicuuc + $LINK_libicui18n + $LINK_libicuio + $LINK_libicutu + ) + for i in ${targets[*]} + do + try install_name_tool -id @rpath/$i $BUNDLE_LIB_DIR/$i + for j in ${targets[*]} + do + try install_name_tool -change $DEPS_LIB_DIR/$j @rpath/$j $BUNDLE_LIB_DIR/$i + done + done +} + +function fix_binaries_libicu_check() { + targets=( + $LINK_libicudata + $LINK_libicuuc + $LINK_libicui18n + $LINK_libicuio + $LINK_libicutu + ) + for i in ${targets[*]} + do + verify_binary $BUNDLE_LIB_DIR/$i + done +} + +function fix_paths_libicu() { + : +} + +function fix_paths_libicu_check() { + : +} \ No newline at end of file diff --git a/qgis_bundle/recipes/libssh2/recipe.sh b/qgis_bundle/recipes/libssh2/recipe.sh new file mode 100644 index 00000000..becfefe4 --- /dev/null +++ b/qgis_bundle/recipes/libssh2/recipe.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +function check_libssh2() { + env_var_exists VERSION_libssh2 + env_var_exists LINK_libssh2 +} + +function bundle_libssh2() { + try cp -av $DEPS_LIB_DIR/libssh2.*dylib $BUNDLE_LIB_DIR +} + +function fix_binaries_libssh2() { + install_name_id @rpath/$LINK_libssh2 $BUNDLE_LIB_DIR/$LINK_libssh2 + + install_name_change $DEPS_LIB_DIR/$LINK_libssh2 @rpath/$LINK_libssh2 $BUNDLE_LIB_DIR/$LINK_libssh2 + + for i in \ + $LINK_libssl \ + $LINK_zlib \ + $LINK_libcrypto + do + install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_LIB_DIR/$LINK_libssh2 + done +} + +function fix_binaries_libssh2_check() { + verify_binary $BUNDLE_LIB_DIR/$LINK_libssh2 +} + +function fix_paths_libssh2() { + : +} + +function fix_paths_libssh2_check() { + : +} \ No newline at end of file diff --git a/qgis_bundle/recipes/libunistring/recipe.sh b/qgis_bundle/recipes/libunistring/recipe.sh new file mode 100644 index 00000000..2d0565cc --- /dev/null +++ b/qgis_bundle/recipes/libunistring/recipe.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +function check_libunistring() { + env_var_exists VERSION_libunistring + env_var_exists LINK_libunistring +} + +function bundle_libunistring() { + try cp -av $DEPS_LIB_DIR/libunistring.*dylib $BUNDLE_LIB_DIR +} + +function fix_binaries_libunistring() { + install_name_id @rpath/$LINK_libunistring $BUNDLE_CONTENTS_DIR/MacOS/lib/$LINK_libunistring + + install_name_change $DEPS_LIB_DIR/$LINK_libunistring @rpath/$LINK_libunistring $BUNDLE_CONTENTS_DIR/MacOS/lib/$LINK_libunistring +} + +function fix_binaries_libunistring_check() { + verify_binary $BUNDLE_LIB_DIR/$LINK_libunistring +} + +function fix_paths_libunistring() { + : +} + +function fix_paths_libunistring_check() { + : +} \ No newline at end of file diff --git a/qgis_bundle/recipes/netcdf/recipe.sh b/qgis_bundle/recipes/netcdf/recipe.sh index 87e909be..54e0f878 100644 --- a/qgis_bundle/recipes/netcdf/recipe.sh +++ b/qgis_bundle/recipes/netcdf/recipe.sh @@ -14,7 +14,8 @@ function fix_binaries_netcdf() { for i in \ $LINK_libhdf5 \ $LINK_libhdf5_hl \ - $LINK_zlib + $LINK_zlib \ + $LINK_libcurl do install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_LIB_DIR/$LINK_netcdf done diff --git a/qgis_bundle/recipes/pdal/recipe.sh b/qgis_bundle/recipes/pdal/recipe.sh index 8c7bee75..a82e6f53 100644 --- a/qgis_bundle/recipes/pdal/recipe.sh +++ b/qgis_bundle/recipes/pdal/recipe.sh @@ -28,6 +28,7 @@ function fix_binaries_pdal() { $LINK_zlib \ $LINK_libxml2 \ $LINK_liblaszip \ + $LINK_libcurl \ $LINK_gdal do install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_LIB_DIR/$LINK_libpdalcpp diff --git a/qgis_bundle/recipes/poppler/recipe.sh b/qgis_bundle/recipes/poppler/recipe.sh index eb1a62aa..7cdc6096 100644 --- a/qgis_bundle/recipes/poppler/recipe.sh +++ b/qgis_bundle/recipes/poppler/recipe.sh @@ -30,7 +30,8 @@ function fix_binaries_poppler() { $LINK_openjpeg \ $LINK_libpng \ $LINK_libtiff \ - $LINK_little_cms2 + $LINK_little_cms2 \ + $LINK_libcurl do install_name_change $DEPS_LIB_DIR/$j @rpath/$j $BUNDLE_LIB_DIR/$i done diff --git a/qgis_bundle/recipes/python/recipe.sh b/qgis_bundle/recipes/python/recipe.sh index 16bbacb9..3db3d74b 100644 --- a/qgis_bundle/recipes/python/recipe.sh +++ b/qgis_bundle/recipes/python/recipe.sh @@ -31,29 +31,29 @@ function fix_binaries_python() { install_name_add_rpath @executable_path/../../Frameworks $BUNDLE_BIN_DIR/python$VERSION_major_python install_name_add_rpath @executable_path/../Frameworks $BUNDLE_BIN_DIR/python$VERSION_major_python - install_name_change $DEPS_LIB_DIR/$LINK_libintl @rpath/$LINK_libintl $BUNDLE_LIB_DIR/libpython${VERSION_major_python}m.dylib + install_name_change $DEPS_LIB_DIR/$LINK_libintl @rpath/$LINK_libintl $BUNDLE_LIB_DIR/libpython${VERSION_major_python}.dylib - install_name_change $DEPS_LIB_DIR/$LINK_bz2 @rpath/$LINK_bz2 $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_bz2.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_expat @rpath/$LINK_expat $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/pyexpat.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_expat @rpath/$LINK_expat $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_elementtree.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libssl @rpath/$LINK_libssl $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_ssl.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libssl @rpath/$LINK_libssl $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_hashlib.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libcrypto @rpath/$LINK_libcrypto $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_ssl.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libcrypto @rpath/$LINK_libcrypto $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_hashlib.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_sqlite @rpath/$LINK_sqlite $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_sqlite3.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_liblzma @rpath/$LINK_liblzma $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_lzma.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_zlib @rpath/$LINK_zlib $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/zlib.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_zlib @rpath/$LINK_zlib $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/binascii.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libffi @rpath/$LINK_libffi $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_ctypes.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_bz2 @rpath/$LINK_bz2 $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_bz2.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_expat @rpath/$LINK_expat $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/pyexpat.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_expat @rpath/$LINK_expat $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_elementtree.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libssl @rpath/$LINK_libssl $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_ssl.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libssl @rpath/$LINK_libssl $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_hashlib.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libcrypto @rpath/$LINK_libcrypto $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_ssl.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libcrypto @rpath/$LINK_libcrypto $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_hashlib.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_sqlite @rpath/$LINK_sqlite $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_sqlite3.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_liblzma @rpath/$LINK_liblzma $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_lzma.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_zlib @rpath/$LINK_zlib $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/zlib.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_zlib @rpath/$LINK_zlib $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/binascii.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libffi @rpath/$LINK_libffi $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_ctypes.cpython-${VERSION_major_python//./}-darwin.so # this one contains path to cert.pem - clean_binary $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_ssl.cpython-${VERSION_major_python//./}m-darwin.so + clean_binary $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_ssl.cpython-${VERSION_major_python//./}-darwin.so } function fix_binaries_python_check() { verify_binary $BUNDLE_LIB_DIR/$LINK_python verify_binary $BUNDLE_BIN_DIR/python$VERSION_major_python - verify_binary $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_elementtree.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $BUNDLE_CONTENTS_DIR/Resources/python/lib-dynload/_elementtree.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python() { @@ -62,18 +62,17 @@ function fix_paths_python() { pip \ pip3 \ pip${VERSION_major_python} \ - python${VERSION_major_python}-config \ - python${VERSION_major_python}m-config + python${VERSION_major_python}-config do fix_exec_link $QGIS_DEPS_STAGE_PATH/bin/python3 python3 $BUNDLE_BIN_DIR/$i done - fix_exec_link $QGIS_DEPS_STAGE_PATH/bin/python3 python3 $BUNDLE_PYTHON_PACKAGES_DIR/config-3.7m-darwin/python-config.py - clean_path $BUNDLE_PYTHON_PACKAGES_DIR/config-3.7m-darwin/Makefile - clean_path $BUNDLE_PYTHON_PACKAGES_DIR/config-3.7m-darwin/Setup + fix_exec_link $QGIS_DEPS_STAGE_PATH/bin/python3 python3 $BUNDLE_PYTHON_PACKAGES_DIR/config-${VERSION_major_python}-darwin/python-config.py + clean_path $BUNDLE_PYTHON_PACKAGES_DIR/config-${VERSION_major_python}-darwin/Makefile + clean_path $BUNDLE_PYTHON_PACKAGES_DIR/config-${VERSION_major_python}-darwin/Setup } function fix_paths_python_check() { verify_file_paths $BUNDLE_BIN_DIR/pip3 - verify_file_paths $BUNDLE_PYTHON_PACKAGES_DIR/config-3.7m-darwin/python-config.py -} \ No newline at end of file + verify_file_paths $BUNDLE_PYTHON_PACKAGES_DIR/config-${VERSION_major_python}-darwin/python-config.py +} diff --git a/qgis_bundle/recipes/python_cftime/recipe.sh b/qgis_bundle/recipes/python_cftime/recipe.sh new file mode 100644 index 00000000..e0f1d17b --- /dev/null +++ b/qgis_bundle/recipes/python_cftime/recipe.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +function check_python_cftime() { + env_var_exists VERSION_python_cftime +} + +function bundle_python_cftime() { + : +} + +function fix_binaries_python_cftime() { + : +} + +function fix_binaries_python_cftime_check() { + : +} + +function fix_paths_python_cftime() { + CFTIME_EGG=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/cftime-${VERSION_python_cftime}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg + clean_path $CFTIME_EGG/EGG-INFO/SOURCES.txt +} + +function fix_paths_python_cftime_check() { + : +} \ No newline at end of file diff --git a/qgis_bundle/recipes/python_fiona/recipe.sh b/qgis_bundle/recipes/python_fiona/recipe.sh index ff9100c9..cbee89a6 100644 --- a/qgis_bundle/recipes/python_fiona/recipe.sh +++ b/qgis_bundle/recipes/python_fiona/recipe.sh @@ -20,14 +20,14 @@ function fix_binaries_python_fiona() { _geometry \ _shim \ _err; do - install_name_change $DEPS_LIB_DIR/$LINK_gdal @rpath/$LINK_gdal $FIONA_EGG/fiona/$i.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_gdal @rpath/$LINK_gdal $FIONA_EGG/fiona/$i.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_fiona_check() { FIONA_EGG=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/Fiona-${VERSION_python_fiona}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg - verify_binary $FIONA_EGG/fiona/_crs.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $FIONA_EGG/fiona/_crs.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_fiona() { diff --git a/qgis_bundle/recipes/python_gdal/recipe.sh b/qgis_bundle/recipes/python_gdal/recipe.sh index 98f12584..3c711caf 100644 --- a/qgis_bundle/recipes/python_gdal/recipe.sh +++ b/qgis_bundle/recipes/python_gdal/recipe.sh @@ -48,14 +48,14 @@ function fix_binaries_python_gdal() { _gnm \ _gdalconst do - install_name_change $DEPS_LIB_DIR/$LINK_gdal @rpath/$LINK_gdal $GDAL_EGG_DIR/osgeo/$i.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_gdal @rpath/$LINK_gdal $GDAL_EGG_DIR/osgeo/$i.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_gdal_check() { GDAL_EGG_DIR=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/GDAL-${VERSION_gdal}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg/ - verify_binary $GDAL_EGG_DIR/osgeo/_gdal.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $GDAL_EGG_DIR/osgeo/_gdal.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_gdal() { diff --git a/qgis_bundle/recipes/python_h5py/recipe.sh b/qgis_bundle/recipes/python_h5py/recipe.sh index 1769db8c..6ee96653 100644 --- a/qgis_bundle/recipes/python_h5py/recipe.sh +++ b/qgis_bundle/recipes/python_h5py/recipe.sh @@ -34,14 +34,14 @@ function fix_binaries_python_h5py() { h5pl \ h5p do - install_name_change $DEPS_LIB_DIR/$LINK_libhdf5 @rpath/$LINK_libhdf5 $BUNDLE_PYTHON_SITE_PACKAGES_DIR/h5py/$i.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libhdf5_hl @rpath/$LINK_libhdf5_hl $BUNDLE_PYTHON_SITE_PACKAGES_DIR/h5py/$i.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libhdf5 @rpath/$LINK_libhdf5 $BUNDLE_PYTHON_SITE_PACKAGES_DIR/h5py/$i.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libhdf5_hl @rpath/$LINK_libhdf5_hl $BUNDLE_PYTHON_SITE_PACKAGES_DIR/h5py/$i.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_h5py_check() { - verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/h5py/h5fd.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/h5py/h5fd.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_h5py() { diff --git a/qgis_bundle/recipes/python_matplotlib/recipe.sh b/qgis_bundle/recipes/python_matplotlib/recipe.sh index 065e1c65..7b057f39 100644 --- a/qgis_bundle/recipes/python_matplotlib/recipe.sh +++ b/qgis_bundle/recipes/python_matplotlib/recipe.sh @@ -15,14 +15,14 @@ function fix_binaries_python_matplotlib() { backends/_backend_agg \ ft2font do - install_name_change $DEPS_LIB_DIR/$LINK_freetype @rpath/$LINK_freetype $MATPLOTLIB_EGG_DIR/matplotlib/$i.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_freetype @rpath/$LINK_freetype $MATPLOTLIB_EGG_DIR/matplotlib/$i.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_matplotlib_check() { MATPLOTLIB_EGG_DIR=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/matplotlib-${VERSION_python_matplotlib}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg - verify_binary $MATPLOTLIB_EGG_DIR/matplotlib/ft2font.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $MATPLOTLIB_EGG_DIR/matplotlib/ft2font.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_matplotlib() { diff --git a/qgis_bundle/recipes/python_netcdf/recipe.sh b/qgis_bundle/recipes/python_netcdf/recipe.sh index 09079684..6b9bd65e 100644 --- a/qgis_bundle/recipes/python_netcdf/recipe.sh +++ b/qgis_bundle/recipes/python_netcdf/recipe.sh @@ -16,14 +16,14 @@ function fix_binaries_python_netcdf() { $LINK_libhdf5_hl \ $LINK_netcdf do - install_name_change $DEPS_LIB_DIR/$i @rpath/$i $NETCDF_EGG/netCDF4/_netCDF4.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$i @rpath/$i $NETCDF_EGG/netCDF4/_netCDF4.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_netcdf_check() { NETCDF_EGG=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/netCDF4-$VERSION_python_netcdf4-py$VERSION_major_python-macosx-$MACOSX_DEPLOYMENT_TARGET-x86_64.egg - verify_binary $NETCDF_EGG/netCDF4/_netCDF4.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $NETCDF_EGG/netCDF4/_netCDF4.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_netcdf() { diff --git a/qgis_bundle/recipes/python_numpy/recipe.sh b/qgis_bundle/recipes/python_numpy/recipe.sh index 22f79202..ab086e14 100644 --- a/qgis_bundle/recipes/python_numpy/recipe.sh +++ b/qgis_bundle/recipes/python_numpy/recipe.sh @@ -16,14 +16,14 @@ function fix_binaries_python_numpy() { linalg/lapack_lite \ linalg/_umath_linalg do - install_name_change $DEPS_LIB_DIR/$LINK_libopenblas @rpath/$LINK_libopenblas $NUMPY_EGG_DIR/numpy/$i.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libopenblas @rpath/$LINK_libopenblas $NUMPY_EGG_DIR/numpy/$i.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_numpy_check() { NUMPY_EGG_DIR=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/numpy-${VERSION_python_numpy}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg - verify_binary $NUMPY_EGG_DIR/numpy/core/_multiarray_umath.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $NUMPY_EGG_DIR/numpy/core/_multiarray_umath.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_numpy() { diff --git a/qgis_bundle/recipes/python_opencv/recipe.sh b/qgis_bundle/recipes/python_opencv/recipe.sh index b889545e..fce21256 100644 --- a/qgis_bundle/recipes/python_opencv/recipe.sh +++ b/qgis_bundle/recipes/python_opencv/recipe.sh @@ -23,14 +23,14 @@ function fix_binaries_python_opencv() { $LINK_libhdf5 \ $LINK_openjpeg do - install_name_change $DEPS_LIB_DIR/$i @rpath/$i $OPENCV_EGG_DIR/cv2/cv2.cpython-37m-darwin.so + install_name_change $DEPS_LIB_DIR/$i @rpath/$i $OPENCV_EGG_DIR/cv2/cv2.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_opencv_check() { OPENCV_EGG_DIR=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/opencv_contrib_python-${VERSION_python_opencv}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg - verify_binary $OPENCV_EGG_DIR/cv2/cv2.cpython-37m-darwin.so + verify_binary $OPENCV_EGG_DIR/cv2/cv2.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_opencv() { diff --git a/qgis_bundle/recipes/python_packages/recipe.sh b/qgis_bundle/recipes/python_packages/recipe.sh index cf1f67f8..969dd882 100644 --- a/qgis_bundle/recipes/python_packages/recipe.sh +++ b/qgis_bundle/recipes/python_packages/recipe.sh @@ -17,7 +17,7 @@ function bundle_python_packages() { try rm -rf $BUNDLE_PYTHON_PACKAGES_DIR/test # we do not need to ship cmake, it is development tool - try rm -r $BUNDLE_PYTHON_PACKAGES_DIR/config-${VERSION_major_python}m-darwin/python.o + try rm -rf $BUNDLE_PYTHON_PACKAGES_DIR/config-${VERSION_major_python}-darwin/python.o try rm $BUNDLE_PYTHON_PACKAGES_DIR/site-packages/setuptools.pth cd $BUNDLE_PYTHON_SITE_PACKAGES_DIR @@ -40,12 +40,12 @@ function bundle_python_packages() { } function fix_binaries_python_packages() { - install_name_change $QGIS_DEPS_STAGE_PATH/unixodbc/lib/$LINK_unixodbc @rpath/$LINK_unixodbc $BUNDLE_PYTHON_SITE_PACKAGES_DIR/pyodbc.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $QGIS_DEPS_STAGE_PATH/unixodbc/lib/$LINK_unixodbc @rpath/$LINK_unixodbc $BUNDLE_PYTHON_SITE_PACKAGES_DIR/pyodbc.cpython-${VERSION_major_python//./}-darwin.so install_name_change $DEPS_LIB_DIR/$LINK_libssl @rpath/$LINK_libssl $BUNDLE_PYTHON_SITE_PACKAGES_DIR/cryptography/hazmat/bindings/_openssl.abi3.so install_name_change $DEPS_LIB_DIR/$LINK_libcrypto @rpath/$LINK_libcrypto $BUNDLE_PYTHON_SITE_PACKAGES_DIR/cryptography/hazmat/bindings/_openssl.abi3.so - install_name_change $DEPS_LIB_DIR/$LINK_libffi @rpath/$LINK_libffi $BUNDLE_PYTHON_SITE_PACKAGES_DIR/_cffi_backend.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libffi @rpath/$LINK_libffi $BUNDLE_PYTHON_SITE_PACKAGES_DIR/_cffi_backend.cpython-${VERSION_major_python//./}-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libffi @rpath/$LINK_libffi $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/etree.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libffi @rpath/$LINK_libffi $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/etree.cpython-${VERSION_major_python//./}-darwin.so for i in \ $LINK_libxml2 \ @@ -53,18 +53,18 @@ function fix_binaries_python_packages() { $LINK_libxslt \ $LINK_libexslt do - install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/etree.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/objectify.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/etree.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/objectify.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_packages_check() { - verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/pyodbc.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/pyodbc.cpython-${VERSION_major_python//./}-darwin.so verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/cryptography/hazmat/bindings/_openssl.abi3.so verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/cryptography/hazmat/bindings/_openssl.abi3.so - verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/_cffi_backend.cpython-${VERSION_major_python//./}m-darwin.so - verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/etree.cpython-${VERSION_major_python//./}m-darwin.so - verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/objectify.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/_cffi_backend.cpython-${VERSION_major_python//./}-darwin.so + verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/etree.cpython-${VERSION_major_python//./}-darwin.so + verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/lxml/objectify.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_packages() { @@ -75,7 +75,6 @@ function fix_paths_python_packages() { idle3 \ idle${VERSION_major_python} \ pyvenv \ - pyvenv-${VERSION_major_python} \ pydoc3 \ pydoc${VERSION_major_python} \ pyrcc5 \ @@ -87,12 +86,12 @@ function fix_paths_python_packages() { fix_exec_link $QGIS_DEPS_STAGE_PATH/bin/python3 python3 $BUNDLE_BIN_DIR/$i done - clean_path $BUNDLE_PYTHON_PACKAGES_DIR/_sysconfigdata_m_darwin_darwin.py + clean_path $BUNDLE_PYTHON_PACKAGES_DIR/_sysconfigdata__darwin_darwin.py clean_path $BUNDLE_PYTHON_SITE_PACKAGES_DIR/sipconfig.py } function fix_paths_python_packages_check() { verify_file_paths $BUNDLE_BIN_DIR/pyrcc5 - verify_file_paths $BUNDLE_PYTHON_PACKAGES_DIR/_sysconfigdata_m_darwin_darwin.py + verify_file_paths $BUNDLE_PYTHON_PACKAGES_DIR/_sysconfigdata__darwin_darwin.py verify_file_paths $BUNDLE_PYTHON_SITE_PACKAGES_DIR/sipconfig.py } \ No newline at end of file diff --git a/qgis_bundle/recipes/python_packages/ssl.py b/qgis_bundle/recipes/python_packages/ssl.py index 913209e7..b716b5c2 100644 --- a/qgis_bundle/recipes/python_packages/ssl.py +++ b/qgis_bundle/recipes/python_packages/ssl.py @@ -2,7 +2,7 @@ # this file is part of qgis/QGIS-Mac-Packager package # https://github.com/qgis/QGIS-Mac-Packager/issues/32 -# from QGIS*.app/Contents/MacOS/lib/python3.7/ -> QGIS*.app/Contents/Resources/certs/ +# from QGIS*.app/Contents/MacOS/lib/python3.x/ -> QGIS*.app/Contents/Resources/certs/ DIR1=os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), os.path.pardir, os.path.pardir, os.path.pardir, 'Resources', 'certs')) CERTS1=os.path.join(DIR1, 'certs.pem') if os.path.exists(CERTS1): diff --git a/qgis_bundle/recipes/python_pillow/recipe.sh b/qgis_bundle/recipes/python_pillow/recipe.sh index 134e8120..61ed8b79 100644 --- a/qgis_bundle/recipes/python_pillow/recipe.sh +++ b/qgis_bundle/recipes/python_pillow/recipe.sh @@ -17,13 +17,13 @@ function fix_binaries_python_pillow() { pillow_EGG=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/pillow-${VERSION_python_pillow}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg for i in \ - _imaging.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingcms.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingft.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingmath.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingmorph.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingtk.cpython-${VERSION_major_python//./}m-darwin.so \ - _webp.cpython-${VERSION_major_python//./}m-darwin.so + _imaging.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingcms.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingft.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingmath.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingmorph.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingtk.cpython-${VERSION_major_python//./}-darwin.so \ + _webp.cpython-${VERSION_major_python//./}-darwin.so do install_name_id @rpath/$i $pillow_EGG/PIL/$i done @@ -34,25 +34,25 @@ function fix_binaries_python_pillow() { $LINK_zlib \ $LINK_libtiff do - install_name_change $DEPS_LIB_DIR/$j @rpath/$j $pillow_EGG/PIL/_imaging.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$j @rpath/$j $pillow_EGG/PIL/_imaging.cpython-${VERSION_major_python//./}-darwin.so done - install_name_change $DEPS_LIB_DIR/$LINK_little_cms2 @rpath/$LINK_little_cms2 $pillow_EGG/PIL/_imagingcms.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_freetype @rpath/$LINK_freetype $pillow_EGG/PIL/_imagingft.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libwebp @rpath/$LINK_libwebp $pillow_EGG/PIL/_webp.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_little_cms2 @rpath/$LINK_little_cms2 $pillow_EGG/PIL/_imagingcms.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_freetype @rpath/$LINK_freetype $pillow_EGG/PIL/_imagingft.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libwebp @rpath/$LINK_libwebp $pillow_EGG/PIL/_webp.cpython-${VERSION_major_python//./}-darwin.so } function fix_binaries_python_pillow_check() { pillow_EGG=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/pillow-${VERSION_python_pillow}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg for i in \ - _imaging.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingcms.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingft.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingmath.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingmorph.cpython-${VERSION_major_python//./}m-darwin.so \ - _imagingtk.cpython-${VERSION_major_python//./}m-darwin.so \ - _webp.cpython-${VERSION_major_python//./}m-darwin.so + _imaging.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingcms.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingft.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingmath.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingmorph.cpython-${VERSION_major_python//./}-darwin.so \ + _imagingtk.cpython-${VERSION_major_python//./}-darwin.so \ + _webp.cpython-${VERSION_major_python//./}-darwin.so do verify_binary $pillow_EGG/PIL/$i done diff --git a/qgis_bundle/recipes/python_psycopg2/recipe.sh b/qgis_bundle/recipes/python_psycopg2/recipe.sh index 38598952..af6f4101 100644 --- a/qgis_bundle/recipes/python_psycopg2/recipe.sh +++ b/qgis_bundle/recipes/python_psycopg2/recipe.sh @@ -14,12 +14,12 @@ function fix_binaries_python_psycopg2() { $LINK_libcrypto \ $LINK_libpq do - install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_PYTHON_SITE_PACKAGES_DIR/psycopg2/_psycopg.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_PYTHON_SITE_PACKAGES_DIR/psycopg2/_psycopg.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_psycopg2_check() { - verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/psycopg2/_psycopg.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/psycopg2/_psycopg.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_psycopg2() { diff --git a/qgis_bundle/recipes/python_pymssql/recipe.sh b/qgis_bundle/recipes/python_pymssql/recipe.sh index dad6a152..564b7ee2 100644 --- a/qgis_bundle/recipes/python_pymssql/recipe.sh +++ b/qgis_bundle/recipes/python_pymssql/recipe.sh @@ -9,13 +9,13 @@ function bundle_python_pymssql() { } function fix_binaries_python_pymssql() { - install_name_change $DEPS_LIB_DIR/$LINK_sybdb @rpath/$LINK_sybdb $BUNDLE_PYTHON_SITE_PACKAGES_DIR/_mssql.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_sybdb @rpath/$LINK_sybdb $BUNDLE_PYTHON_SITE_PACKAGES_DIR/pymssql.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_sybdb @rpath/$LINK_sybdb $BUNDLE_PYTHON_SITE_PACKAGES_DIR/_mssql.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_sybdb @rpath/$LINK_sybdb $BUNDLE_PYTHON_SITE_PACKAGES_DIR/pymssql.cpython-${VERSION_major_python//./}-darwin.so } function fix_binaries_python_pymssql_check() { - verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/_mssql.cpython-${VERSION_major_python//./}m-darwin.so - verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/pymssql.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/_mssql.cpython-${VERSION_major_python//./}-darwin.so + verify_binary $BUNDLE_PYTHON_SITE_PACKAGES_DIR/pymssql.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_pymssql() { diff --git a/qgis_bundle/recipes/python_pyproj/_patch_proj_lib.py b/qgis_bundle/recipes/python_pyproj/_patch_proj_lib.py index b9801012..d4090e74 100644 --- a/qgis_bundle/recipes/python_pyproj/_patch_proj_lib.py +++ b/qgis_bundle/recipes/python_pyproj/_patch_proj_lib.py @@ -2,7 +2,7 @@ # this file is part of qgis/QGIS-Mac-Packager package if not os.getenv("PROJ_LIB"): - # from QGIS*.app/Contents/MacOS/lib/python3.7/site-packages/pyproj-*.egg/pyproj -> QGIS*.app/Contents/Resources/proj/ + # from QGIS*.app/Contents/MacOS/lib/python3.x/site-packages/pyproj-*.egg/pyproj -> QGIS*.app/Contents/Resources/proj/ PROJ_DIR_1=os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), os.path.pardir, os.path.pardir, os.path.pardir, os.path.pardir, os.path.pardir, os.path.pardir, "Resources", "proj")) if os.path.exists(PROJ_DIR_1): os.environ['PROJ_LIB'] = PROJ_DIR_1 diff --git a/qgis_bundle/recipes/python_pyproj/recipe.sh b/qgis_bundle/recipes/python_pyproj/recipe.sh index 1b4a7573..4d2cf919 100644 --- a/qgis_bundle/recipes/python_pyproj/recipe.sh +++ b/qgis_bundle/recipes/python_pyproj/recipe.sh @@ -19,13 +19,13 @@ function fix_binaries_python_pyproj() { _proj \ _transformer do - install_name_change $DEPS_LIB_DIR/$LINK_libproj @rpath/$LINK_libproj $PYPROJ_EGG/pyproj/$i.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libproj @rpath/$LINK_libproj $PYPROJ_EGG/pyproj/$i.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_pyproj_check() { - verify_binary $PYPROJ_EGG/pyproj/_proj.cpython-${VERSION_major_python//./}m-darwin.so - verify_binary $PYPROJ_EGG/pyproj/_datadir.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $PYPROJ_EGG/pyproj/_proj.cpython-${VERSION_major_python//./}-darwin.so + verify_binary $PYPROJ_EGG/pyproj/_datadir.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_pyproj() { diff --git a/qgis_bundle/recipes/python_rasterio/recipe.sh b/qgis_bundle/recipes/python_rasterio/recipe.sh index c6dfda07..5f3e12ab 100644 --- a/qgis_bundle/recipes/python_rasterio/recipe.sh +++ b/qgis_bundle/recipes/python_rasterio/recipe.sh @@ -26,14 +26,14 @@ function fix_binaries_python_rasterio() { _warp \ shutil do - install_name_change $DEPS_LIB_DIR/$LINK_gdal @rpath/$LINK_gdal $RASTERIO_EGG_DIR/rasterio/$i.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_gdal @rpath/$LINK_gdal $RASTERIO_EGG_DIR/rasterio/$i.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_rasterio_check() { RASTERIO_EGG_DIR=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/rasterio-${VERSION_python_rasterio}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg - verify_binary $RASTERIO_EGG_DIR/rasterio/_base.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $RASTERIO_EGG_DIR/rasterio/_base.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_rasterio() { diff --git a/qgis_bundle/recipes/python_rtree/core.py b/qgis_bundle/recipes/python_rtree/core.py index 9552b2be..8f32512d 100644 --- a/qgis_bundle/recipes/python_rtree/core.py +++ b/qgis_bundle/recipes/python_rtree/core.py @@ -1,6 +1,6 @@ import os # this file is part of qgis/QGIS-Mac-Packager package -# from QGIS*.app/Contents/MacOS/lib/python3.7/site-packages/RTree-*.egg/rtree -> QGIS*.app/Contents/MacOS/lib/ +# from QGIS*.app/Contents/MacOS/lib/python3.x/site-packages/RTree-*.egg/rtree -> QGIS*.app/Contents/MacOS/lib/ DIR1=os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), os.path.pardir, os.path.pardir, os.path.pardir, os.path.pardir)) SPATIALINDEX_C_LIBRARY_1=os.path.join(DIR1, 'libspatialindex_c.dylib') @@ -16,4 +16,4 @@ else: raise Exception("Unable to load spatialindex_c required by rtree in " + DIR1 + " nor " + DIR2) -from ._core import * \ No newline at end of file +from ._core import * diff --git a/qgis_bundle/recipes/python_scipy/recipe.sh b/qgis_bundle/recipes/python_scipy/recipe.sh index cd43aff9..a86ed265 100644 --- a/qgis_bundle/recipes/python_scipy/recipe.sh +++ b/qgis_bundle/recipes/python_scipy/recipe.sh @@ -51,9 +51,9 @@ function fix_binaries_python_scipy() { stats/statlib \ stats/mvn do - install_name_change $DEPS_LIB_DIR/$LINK_libquadmath @rpath/$LINK_libquadmath $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libgfortran @rpath/$LINK_libgfortran $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_gcc_s @rpath/$LINK_gcc_s $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libquadmath @rpath/$LINK_libquadmath $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libgfortran @rpath/$LINK_libgfortran $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_gcc_s @rpath/$LINK_gcc_s $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}-darwin.so done for i in \ @@ -82,15 +82,15 @@ function fix_binaries_python_scipy() { sparse/linalg/dsolve/_superlu \ spatial/qhull do - install_name_change $DEPS_LIB_DIR/$LINK_libopenblas @rpath/$LINK_libopenblas $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}m-darwin.so - install_name_change $DEPS_LIB_DIR/$LINK_libopenblasp @rpath/$LINK_libopenblasp $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}m-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libopenblas @rpath/$LINK_libopenblas $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}-darwin.so + install_name_change $DEPS_LIB_DIR/$LINK_libopenblasp @rpath/$LINK_libopenblasp $SCIPY_EGG_DIR/scipy/$i.cpython-${VERSION_major_python//./}-darwin.so done } function fix_binaries_python_scipy_check() { SCIPY_EGG_DIR=$BUNDLE_PYTHON_SITE_PACKAGES_DIR/scipy-${VERSION_python_scipy}-py${VERSION_major_python}-macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64.egg - verify_binary $SCIPY_EGG_DIR/scipy/odr/__odrpack.cpython-${VERSION_major_python//./}m-darwin.so + verify_binary $SCIPY_EGG_DIR/scipy/odr/__odrpack.cpython-${VERSION_major_python//./}-darwin.so } function fix_paths_python_scipy() { diff --git a/qgis_bundle/recipes/python_shapely/geos.py b/qgis_bundle/recipes/python_shapely/geos.py index a218c813..61bbd355 100644 --- a/qgis_bundle/recipes/python_shapely/geos.py +++ b/qgis_bundle/recipes/python_shapely/geos.py @@ -2,7 +2,7 @@ # this file is part of qgis/QGIS-Mac-Packager package # https://github.com/qgis/QGIS-Mac-Packager/issues/81 -# from QGIS*.app/Contents/MacOS/lib/python3.7/site-packages/shapely/ -> QGIS*.app/Contents/MacOS/lib +# from QGIS*.app/Contents/MacOS/lib/python3.x/site-packages/shapely/ -> QGIS*.app/Contents/MacOS/lib DIR1=os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), os.path.pardir, os.path.pardir, os.path.pardir)) GEOS_C_LIB_1=os.path.join(DIR1, 'libgeos_c.dylib') if os.path.exists(GEOS_C_LIB_1): @@ -17,8 +17,8 @@ raise Exception("Unable to load geos_c required by shapely from " + DIR1 + " nor " + DIR2) # fix: -# ImportError: dlopen(.../site-packages/Fiona-....egg/fiona/ogrext.cpython-37m-darwin.so, 2): Symbol not found: _GEOSArea -# Referenced from: .../stage/lib/libspatialite.7.dylib +# ImportError: dlopen(.../site-packages/Fiona-....egg/fiona/ogrext.cpython-3x-darwin.so, 2): Symbol not found: _GEOSArea +# Referenced from: .../stage/lib/libspatialite.x.dylib # Expected in: flat namespace import fiona diff --git a/qgis_bundle/recipes/qgis/find_mod_spatialite.py b/qgis_bundle/recipes/qgis/find_mod_spatialite.py index d626cb60..f1548dad 100644 --- a/qgis_bundle/recipes/qgis/find_mod_spatialite.py +++ b/qgis_bundle/recipes/qgis/find_mod_spatialite.py @@ -3,7 +3,7 @@ # https://github.com/qgis/QGIS-Mac-Packager/issues/79 def mod_spatialite_path(): - # from QGIS*.app/Contents/MacOS/lib/python3.7/qgis/ -> QGIS*.app/Contents/MacOS/lib + # from QGIS*.app/Contents/MacOS/lib/python3.x/qgis/ -> QGIS*.app/Contents/MacOS/lib DIR1=os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), os.path.pardir, os.path.pardir)) MOD_SPATIALITE_1=os.path.join(DIR1, 'mod_spatialite.so') if os.path.exists(MOD_SPATIALITE_1): diff --git a/qgis_bundle/recipes/xerces/recipe.sh b/qgis_bundle/recipes/xerces/recipe.sh index 4209647e..b465b090 100644 --- a/qgis_bundle/recipes/xerces/recipe.sh +++ b/qgis_bundle/recipes/xerces/recipe.sh @@ -10,6 +10,14 @@ function bundle_xerces() { function fix_binaries_xerces() { install_name_id @rpath/$LINK_libxerces_c $BUNDLE_LIB_DIR/$LINK_libxerces_c + + for i in \ + $LINK_libicuuc \ + $LINK_libicudata \ + $LINK_libcurl + do + install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_LIB_DIR/$LINK_libxerces_c + done } function fix_binaries_xerces_check() { diff --git a/qgis_deps/distribute.sh b/qgis_deps/distribute.sh index 4ae806da..7e5c0899 100755 --- a/qgis_deps/distribute.sh +++ b/qgis_deps/distribute.sh @@ -28,6 +28,7 @@ function pop_env() { export PIP=$OLD_PIP export QSPEC=$OLD_QSPEC export PKG_CONFIG_PATH=$OLD_PKG_CONFIG_PATH + unset DYLD_INSERT_LIBRARIES } ######################################################################################################### @@ -124,12 +125,22 @@ function check_file_configuration() { error "File $1 contains /usr/local/lib string <-- CMake picked some homebrew libs!" fi - if grep -q /usr/local/opt/*/lib $1 - then - info "Found: " - cat $1 | grep /usr/local/opt/*/lib - error "File $1 contains /usr/local/*/lib string <-- CMake picked some homebrew libs!" - fi + targets=( + openssl + openssl@1.1 + gettext + libunistring + xz + ) + for i in ${targets[*]} + do + if grep -q /usr/local/opt/$i/lib $1 + then + info "Found: " + cat $1 | grep /usr/local/opt/$i/lib + error "File $1 contains /usr/local/$i/lib string <-- CMake picked some homebrew libs!" + fi + done } function python_package_installed() { @@ -362,12 +373,10 @@ function check_linked_rpath() { libxml2 libsqlite3 libexpat - libexpat - libiconv liblzma - libarchive libbz2 libiodbc + libcurl ) for i in ${targets[*]} do diff --git a/qgis_deps/recipes/bison/recipe.sh b/qgis_deps/recipes/bison/recipe.sh index 45a76b24..27e0ceb7 100644 --- a/qgis_deps/recipes/bison/recipe.sh +++ b/qgis_deps/recipes/bison/recipe.sh @@ -3,8 +3,7 @@ DESC_bison="Parser generator" # version of your package -# 3.7.x is problem when compiling qtwebkit -> generated headers have suffix .hpp and not .h -VERSION_bison=3.5.4 +VERSION_bison=3.7.5 # dependencies of this recipe DEPS_bison=(gettext) @@ -13,7 +12,7 @@ DEPS_bison=(gettext) URL_bison=https://ftp.gnu.org/gnu/bison/bison-${VERSION_bison}.tar.xz # md5 of the package -MD5_bison=eca85fc68de0aa77b26963b0a30d995a +MD5_bison=9b762dc24a6723f86d14d957d3deeb90 # default build path BUILD_bison=$BUILD_PATH/bison/$(get_directory $URL_bison) @@ -48,7 +47,7 @@ function build_bison() { try rsync -a $BUILD_bison/ $BUILD_PATH/bison/build-$ARCH/ try cd $BUILD_PATH/bison/build-$ARCH push_env - which makeinfo + try ${CONFIGURE} --disable-dependency-tracking check_file_configuration config.status diff --git a/qgis_deps/recipes/boost/recipe.sh b/qgis_deps/recipes/boost/recipe.sh index 606d53af..52c85523 100644 --- a/qgis_deps/recipes/boost/recipe.sh +++ b/qgis_deps/recipes/boost/recipe.sh @@ -4,10 +4,10 @@ DESC_boost="Collection of portable C++ source libraries" # version of your package # version required by MySQL -VERSION_boost=1.70.0 +VERSION_boost=1.73.0 # dependencies of this recipe -DEPS_boost=(zlib python) +DEPS_boost=(zlib python libicu) # url of the package # URL_boost=https://sourceforge.net/projects/boost/files/boost/${VERSION_boost}/boost_${VERSION_boost//./_}.tar.bz2 @@ -17,7 +17,7 @@ URL_boost=https://dl.bintray.com/boostorg/release/${VERSION_boost}/source/boost_ # URL_boost=https://github.com/boostorg/boost/archive/boost-${VERSION_boost}.tar.gz # md5 of the package -MD5_boost=242ecc63507711d6706b9b0c0d0c7d4f +MD5_boost=9273c8c4576423562bbe84574b07b2bd # default build path BUILD_boost=$BUILD_PATH/boost/$(get_directory $URL_boost) @@ -55,19 +55,23 @@ function build_boost() { try ./bootstrap.sh \ --prefix="${STAGE_PATH}" \ --with-toolset=clang \ - --with-icu="${PREFIX}" \ - --with-python="${PYTHON}" \ - --with-python-root="${STAGE_PATH} : ${STAGE_PATH}/include/python${VERSION_major_python}m : ${STAGE_PATH}/include/python${VERSION_major_python}" + --with-icu="${STAGE_PATH}" \ + --with-python="$PYTHON" \ + --with-python-root="$PYTHON" \ + --with-python-version="$VERSION_major_python" try ./b2 -q \ variant=release \ + address-model="64" \ + architecture="arm" \ + binary-format="mach-o" \ debug-symbols=off \ threading=multi \ runtime-link=shared \ link=static,shared \ toolset=clang \ - python="${VERSION_major_python}" \ include="${STAGE_PATH}/include" \ + python="$VERSION_major_python" \ cxxflags="${CXXFLAGS}" \ linkflags="-L$${STAGE_PATH}/lib" \ --layout=system \ diff --git a/qgis_deps/recipes/fontconfig/recipe.sh b/qgis_deps/recipes/fontconfig/recipe.sh index 9690acd8..d13feb63 100644 --- a/qgis_deps/recipes/fontconfig/recipe.sh +++ b/qgis_deps/recipes/fontconfig/recipe.sh @@ -8,7 +8,7 @@ VERSION_fontconfig=2.13.92 LINK_fontconfig=libfontconfig.1.dylib # dependencies of this recipe -DEPS_fontconfig=(libtool gettext freetype) +DEPS_fontconfig=(libtool gettext freetype png) # url of the package URL_fontconfig=https://www.freedesktop.org/software/fontconfig/release/fontconfig-$VERSION_fontconfig.tar.gz diff --git a/qgis_deps/recipes/freetype/recipe.sh b/qgis_deps/recipes/freetype/recipe.sh index 3837bb80..55dfb6ee 100644 --- a/qgis_deps/recipes/freetype/recipe.sh +++ b/qgis_deps/recipes/freetype/recipe.sh @@ -7,7 +7,7 @@ VERSION_freetype=2.10.0 LINK_freetype=libfreetype.6.dylib # dependencies of this recipe -DEPS_freetype=() +DEPS_freetype=(png) # url of the package URL_freetype=https://download.savannah.gnu.org/releases/freetype/freetype-$VERSION_freetype.tar.gz diff --git a/qgis_deps/recipes/gdal/recipe.sh b/qgis_deps/recipes/gdal/recipe.sh index c3325bba..b1a08f93 100644 --- a/qgis_deps/recipes/gdal/recipe.sh +++ b/qgis_deps/recipes/gdal/recipe.sh @@ -4,12 +4,12 @@ DESC_gdal="Geospatial Data Abstraction Library" # version of your package # keep in SYNC with python_gdal receipt -VERSION_gdal=3.1.2 +VERSION_gdal=3.2.1 source $RECIPES_PATH/netcdf/recipe.sh source $RECIPES_PATH/xerces/recipe.sh -LINK_libgdal_version=27 +LINK_libgdal_version=28 LINK_gdal=libgdal.$LINK_libgdal_version.dylib # dependencies of this recipe @@ -35,13 +35,14 @@ DEPS_gdal=( pcre unixodbc spatialite + libcurl ) # url of the package URL_gdal=https://github.com/OSGeo/gdal/releases/download/v${VERSION_gdal}/gdal-${VERSION_gdal}.tar.gz # md5 of the package -MD5_gdal=68349526344ee45accf2773a1a6e71f2 +MD5_gdal=142dd8a1dc6a598b7e60c1e9e8a1b8ed # default build path BUILD_gdal=$BUILD_PATH/gdal/$(get_directory $URL_gdal) diff --git a/qgis_deps/recipes/geos/recipe.sh b/qgis_deps/recipes/geos/recipe.sh index 024a8c61..c2591a8e 100644 --- a/qgis_deps/recipes/geos/recipe.sh +++ b/qgis_deps/recipes/geos/recipe.sh @@ -3,7 +3,7 @@ DESC_geos="Geometry Engine" # version of your package -VERSION_geos=3.8.1 +VERSION_geos=3.9.1 LINK_libgeos_c=libgeos_c.1.dylib LINK_libgeos=libgeos.${VERSION_geos}.dylib @@ -15,7 +15,7 @@ DEPS_geos=() URL_geos=http://download.osgeo.org/geos/geos-${VERSION_geos}.tar.bz2 # md5 of the package -MD5_geos=9d25df02a2c4fcc5a59ac2fb3f0bd977 +MD5_geos=efc4ce81bdbaa5e5c1caefe6c9b8553c # default build path BUILD_geos=$BUILD_PATH/geos/$(get_directory $URL_geos) diff --git a/qgis_deps/recipes/gettext/recipe.sh b/qgis_deps/recipes/gettext/recipe.sh index 8d64aa7a..bcc84467 100644 --- a/qgis_deps/recipes/gettext/recipe.sh +++ b/qgis_deps/recipes/gettext/recipe.sh @@ -7,7 +7,7 @@ VERSION_gettext=0.21 LINK_libintl=libintl.8.dylib # dependencies of this recipe -DEPS_gettext=() +DEPS_gettext=(libcurl libxml2 libunistring) # url of the package URL_gettext=https://ftp.gnu.org/pub/gnu/gettext/gettext-$VERSION_gettext.tar.gz @@ -62,7 +62,8 @@ function build_gettext() { # function called after all the compile have been done function postbuild_gettext() { - verify_binary lib/libintl.8.dylib + verify_binary lib/$LINK_libintl + verify_binary lib/libgettextlib.dylib } # function to append information to config file diff --git a/qgis_deps/recipes/grass/recipe.sh b/qgis_deps/recipes/grass/recipe.sh index ebb4df25..2fa327d6 100644 --- a/qgis_deps/recipes/grass/recipe.sh +++ b/qgis_deps/recipes/grass/recipe.sh @@ -5,7 +5,7 @@ DESC_grass="Geographic Resources Analysis Support System" # version of your package VERSION_grass_major=7 VERSION_grass_minor=8 -VERSION_grass=${VERSION_grass_major}.${VERSION_grass_minor}.3 +VERSION_grass=${VERSION_grass_major}.${VERSION_grass_minor}.5 # dependencies of this recipe DEPS_grass=(python boost bison flex libtiff png sqlite geos zlib wxmac zstd zlib xz netcdf proj gdal libgeotiff python_pyqt5 mysql postgres openssl ) @@ -16,7 +16,7 @@ LINK_libgrass_version=26 URL_grass=https://github.com/OSGeo/grass/archive/${VERSION_grass}.tar.gz # md5 of the package -MD5_grass=2ca90dcddb0b5a21ac69b3faddc642ca +MD5_grass=91f4830a5164cea703384814cd89cdf9 # default build path BUILD_grass=$BUILD_PATH/grass/$(get_directory $URL_grass) @@ -34,12 +34,8 @@ function prebuild_grass() { return fi - # Usage of cc instead of clang (/usr/bin/cc -> clang) - try ${SED} "s;cc ;clang ;g" aclocal.m4 - # Usage of cc instead of clang patch_configure_file configure - try ${SED} "s;cc ;clang ;g" configure # Usage of /usr/local try ${SED} "s;/usr/local/lib' ;$STAGE_PATH/lib', '$STAGE_PATH/grass${VERSION_grass_major}${VERSION_grass_minor}/lib ;g" lib/python/ctypes/loader.py @@ -54,9 +50,6 @@ function prebuild_grass() { # missing space in gpde Makefile try ${SED} "s;EXTRA_LIBS=\$(GISLIB);EXTRA_LIBS = \$(GISLIB);g" lib/gpde/Makefile - # fix permissions - chmod 777 $STAGE_PATH/grass${VERSION_grass_major}${VERSION_grass_minor}/etc/colors/grass - touch .patched } @@ -154,6 +147,9 @@ function build_grass() { # very scary but compilation passes? # see https://github.com/OSGeo/grass/issues/474#issuecomment-609011006 + # fix permissions + chmod 777 $STAGE_PATH/grass${VERSION_grass_major}${VERSION_grass_minor}/etc/colors/grass + pop_env } diff --git a/qgis_deps/recipes/libcurl/recipe.sh b/qgis_deps/recipes/libcurl/recipe.sh new file mode 100644 index 00000000..5443808c --- /dev/null +++ b/qgis_deps/recipes/libcurl/recipe.sh @@ -0,0 +1,85 @@ +#!/bin/bash + +DESC_libcurl="Get a file from an HTTP, HTTPS or FTP server" + +# version of your package +VERSION_libcurl=7.75.0 + +LINK_libcurl=libcurl.4.dylib + +# dependencies of this recipe +DEPS_libcurl=(libtool openssl zstd zlib libssh2) + +# url of the package +URL_libcurl=https://curl.haxx.se/download/curl-$VERSION_libcurl.tar.bz2 + +# md5 of the package +MD5_libcurl=29472feb977cea2992ef9082c153698d + +# default build path +BUILD_libcurl=$BUILD_PATH/libcurl/$(get_directory $URL_libcurl) + +# default recipe path +RECIPE_libcurl=$RECIPES_PATH/libcurl + +# function called for preparing source code if needed +# (you can apply patch etc here.) +function prebuild_libcurl() { + cd $BUILD_libcurl + + # check marker + if [ -f .patched ]; then + return + fi + + patch_configure_file configure + + touch .patched +} + +function shouldbuild_libcurl() { + if [ ${STAGE_PATH}/lib/${LINK_libcurl} -nt $BUILD_libcurl/.patched ]; then + DO_BUILD=0 + fi +} + +# function called to build the source code +function build_libcurl() { + try rsync -a $BUILD_libcurl/ $BUILD_PATH/libcurl/build-$ARCH/ + try cd $BUILD_PATH/libcurl/build-$ARCH + push_env + + try ${CONFIGURE} \ + --disable-dependency-tracking \ + --disable-silent-rules \ + --with-ssl=${STAGE_PATH} \ + --without-ca-bundle \ + --without-ca-path \ + --with-ca-fallback \ + --with-secure-transport \ + --with-default-ssl-backend=openssl \ + --without-libpsl \ + --without-gssapi \ + --without-libmetalink \ + --without-librtmp \ + --with-libssh2 \ + --without-libidn2 \ + + check_file_configuration config.status + try $MAKESMP + try $MAKESMP install + + pop_env +} + +# function called after all the compile have been done +function postbuild_libcurl() { + verify_binary lib/$LINK_libcurl +} + +# function to append information to config file +function add_config_info_libcurl() { + append_to_config_file "# libcurl-${VERSION_libcurl}: ${DESC_libcurl}" + append_to_config_file "export VERSION_libcurl=${VERSION_libcurl}" + append_to_config_file "export LINK_libcurl=${LINK_libcurl}" +} \ No newline at end of file diff --git a/qgis_deps/recipes/libicu/recipe.sh b/qgis_deps/recipes/libicu/recipe.sh new file mode 100644 index 00000000..9f99bcb5 --- /dev/null +++ b/qgis_deps/recipes/libicu/recipe.sh @@ -0,0 +1,102 @@ +#!/bin/bash + +DESC_libicu="International Components for Unicode" + +# version of your package +VERSION_libicu_major=68 +VERSION_libicu_minor=2 +VERSION_libicu=VERSION_libicu_major.VERSION_libicu_minor + +LINK_libicudata=libicudata.${VERSION_libicu_major}.dylib +LINK_libicuuc=libicuuc.$VERSION_libicu_major.dylib +LINK_libicui18n=libicui18n.$VERSION_libicu_major.dylib +LINK_libicuio=libicuio.$VERSION_libicu_major.dylib +LINK_libicutu=libicutu.$VERSION_libicu_major.dylib + +# dependencies of this recipe +DEPS_libicu=(python) + +# url of the package +URL_libicu=https://github.com/unicode-org/icu/archive/release-$VERSION_libicu_major-$VERSION_libicu_minor.tar.gz + +# md5 of the package +MD5_libicu=ea591dfbcbc3aa44029ca66d6abf8070 + +# default build path +BUILD_libicu=$BUILD_PATH/libicu/$(get_directory $URL_libicu) + +# default recipe path +RECIPE_libicu=$RECIPES_PATH/libicu + +# function called for preparing source code if needed +# (you can apply patch etc here.) +function prebuild_libicu() { + cd $BUILD_libicu/icu4c/source + + # check marker + if [ -f .patched ]; then + return + fi + + patch_configure_file configure + + touch .patched +} + +function shouldbuild_libicu() { + if [ ${STAGE_PATH}/lib/${LINK_libicudata} -nt $BUILD_libicu/.patched ]; then + DO_BUILD=0 + fi +} + +# function called to build the source code +function build_libicu() { + try rsync -a $BUILD_libicu/ $BUILD_PATH/libicu/build-$ARCH/ + try cd $BUILD_PATH/libicu/build-$ARCH/icu4c/source + push_env + + try ${CONFIGURE} \ + --disable-samples \ + --disable-extras \ + --disable-layout \ + --disable-tests \ + + check_file_configuration config.status + try $MAKESMP + try $MAKESMP install + + targets=( + libicudata.$VERSION_libicu_major.dylib + libicui18n.$VERSION_libicu_major.dylib + libicuio.$VERSION_libicu_major.dylib + libicutu.$VERSION_libicu_major.dylib + libicuuc.$VERSION_libicu_major.dylib + ) + for i in ${targets[*]} + do + try install_name_tool -id $STAGE_PATH/lib/$i $STAGE_PATH/lib/$i + for j in ${targets[*]} + do + try install_name_tool -change $j $STAGE_PATH/lib/$j $STAGE_PATH/lib/$i + done + done + + pop_env +} + +# function called after all the compile have been done +function postbuild_libicu() { + verify_binary lib/$LINK_libicudata + verify_binary lib/$LINK_libicuuc +} + +# function to append information to config file +function add_config_info_libicu() { + append_to_config_file "# libicu-${VERSION_libicu}: ${DESC_libicu}" + append_to_config_file "export VERSION_libicu=${VERSION_libicu}" + append_to_config_file "export LINK_libicudata=${LINK_libicudata}" + append_to_config_file "export LINK_libicuuc=${LINK_libicuuc}" + append_to_config_file "export LINK_libicui18n=${LINK_libicui18n}" + append_to_config_file "export LINK_libicuio=${LINK_libicuio}" + append_to_config_file "export LINK_libicutu=${LINK_libicutu}" +} \ No newline at end of file diff --git a/qgis_deps/recipes/libssh2/recipe.sh b/qgis_deps/recipes/libssh2/recipe.sh new file mode 100644 index 00000000..af86ab10 --- /dev/null +++ b/qgis_deps/recipes/libssh2/recipe.sh @@ -0,0 +1,79 @@ +#!/bin/bash + +DESC_libssh2="SSH protocol" + +# version of your package +VERSION_libssh2=1.9.0 + +LINK_libssh2=libssh2.1.dylib + +# dependencies of this recipe +DEPS_libssh2=(openssl zlib) + + +# url of the package +URL_libssh2=https://libssh2.org/download/libssh2-$VERSION_libssh2.tar.gz + +# md5 of the package +MD5_libssh2=1beefafe8963982adc84b408b2959927 + +# default build path +BUILD_libssh2=$BUILD_PATH/libssh2/$(get_directory $URL_libssh2) + +# default recipe path +RECIPE_libssh2=$RECIPES_PATH/libssh2 + +# function called for preparing source code if needed +# (you can apply patch etc here.) +function prebuild_libssh2() { + cd $BUILD_libssh2 + + # check marker + if [ -f .patched ]; then + return + fi + + patch_configure_file configure + + touch .patched +} + +function shouldbuild_libssh2() { + if [ ${STAGE_PATH}/lib/${LINK_libssh2} -nt $BUILD_libssh2/.patched ]; then + DO_BUILD=0 + fi +} + +# function called to build the source code +function build_libssh2() { + try rsync -a $BUILD_libssh2/ $BUILD_PATH/libssh2/build-$ARCH/ + try cd $BUILD_PATH/libssh2/build-$ARCH + push_env + + try ${CONFIGURE} \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-silent-rules \ + --disable-examples-build \ + --with-openssl \ + --with-libz \ + --with-libssl-prefix=${STAGE_PATH} + + check_file_configuration config.status + try $MAKESMP + try $MAKESMP install + + pop_env +} + +# function called after all the compile have been done +function postbuild_libssh2() { + verify_binary lib/$LINK_libssh2 +} + +# function to append information to config file +function add_config_info_libssh2() { + append_to_config_file "# libssh2-${VERSION_libssh2}: ${DESC_libssh2}" + append_to_config_file "export VERSION_libssh2=${VERSION_libssh2}" + append_to_config_file "export LINK_libssh2=${LINK_libssh2}" +} \ No newline at end of file diff --git a/qgis_deps/recipes/libunistring/recipe.sh b/qgis_deps/recipes/libunistring/recipe.sh new file mode 100644 index 00000000..5b02030c --- /dev/null +++ b/qgis_deps/recipes/libunistring/recipe.sh @@ -0,0 +1,73 @@ +#!/bin/bash + +DESC_libunistring="C string library for manipulating Unicode strings" + +# version of your package +VERSION_libunistring=0.9.10 + +LINK_libunistring=libunistring.2.dylib + +# dependencies of this recipe +DEPS_libunistring=() + +# url of the package +URL_libunistring=https://ftp.gnu.org/gnu/libunistring/libunistring-$VERSION_libunistring.tar.xz + +# md5 of the package +MD5_libunistring=db08bb384e81968957f997ec9808926e + +# default build path +BUILD_libunistring=$BUILD_PATH/libunistring/$(get_directory $URL_libunistring) + +# default recipe path +RECIPE_libunistring=$RECIPES_PATH/libunistring + +# function called for preparing source code if needed +# (you can apply patch etc here.) +function prebuild_libunistring() { + cd $BUILD_libunistring + + # check marker + if [ -f .patched ]; then + return + fi + + patch_configure_file configure + + touch .patched +} + +function shouldbuild_libunistring() { + if [ ${STAGE_PATH}/lib/${LINK_libunistring} -nt $BUILD_libunistring/.patched ]; then + DO_BUILD=0 + fi +} + +# function called to build the source code +function build_libunistring() { + try rsync -a $BUILD_libunistring/ $BUILD_PATH/libunistring/build-$ARCH/ + try cd $BUILD_PATH/libunistring/build-$ARCH + push_env + + try ${CONFIGURE} \ + --disable-dependency-tracking \ + --disable-silent-rules + + check_file_configuration config.status + try $MAKESMP + try $MAKESMP install + + pop_env +} + +# function called after all the compile have been done +function postbuild_libunistring() { + verify_binary lib/$LINK_libunistring +} + +# function to append information to config file +function add_config_info_libunistring() { + append_to_config_file "# libunistring-${VERSION_libunistring}: ${DESC_libunistring}" + append_to_config_file "export VERSION_libunistring=${VERSION_libunistring}" + append_to_config_file "export LINK_libunistring=${LINK_libunistring}" +} \ No newline at end of file diff --git a/qgis_deps/recipes/mysql/recipe.sh b/qgis_deps/recipes/mysql/recipe.sh index 7f7a069c..957248ae 100644 --- a/qgis_deps/recipes/mysql/recipe.sh +++ b/qgis_deps/recipes/mysql/recipe.sh @@ -3,7 +3,7 @@ DESC_mysql="Open source relational database management system" # version of your package -VERSION_mysql=8.0.19 +VERSION_mysql=8.0.23 LINK_libmysqlclient=libmysqlclient.21.dylib # dependencies of this recipe @@ -13,7 +13,7 @@ DEPS_mysql=(openssl protobuf boost zstd zlib) URL_mysql=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${VERSION_mysql}.tar.gz # md5 of the package -MD5_mysql=1e42b9bd431059430c7617f24608609a +MD5_mysql=27cfcf24fc754b592acd69fd32a3940a # default build path BUILD_mysql=$BUILD_PATH/mysql/$(get_directory $URL_mysql) @@ -32,6 +32,8 @@ function prebuild_mysql() { fi touch .patched + + exit 1 } function shouldbuild_mysql() { diff --git a/qgis_deps/recipes/netcdf/recipe.sh b/qgis_deps/recipes/netcdf/recipe.sh index 17b575a2..5b8e605c 100644 --- a/qgis_deps/recipes/netcdf/recipe.sh +++ b/qgis_deps/recipes/netcdf/recipe.sh @@ -7,7 +7,7 @@ VERSION_netcdf=4.7.3 LINK_netcdf=libnetcdf.15.dylib # dependencies of this recipe -DEPS_netcdf=() +DEPS_netcdf=(libcurl) # url of the package URL_netcdf=https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${VERSION_netcdf}.tar.gz diff --git a/qgis_deps/recipes/pdal/recipe.sh b/qgis_deps/recipes/pdal/recipe.sh index 30a04f3a..d871a2c5 100644 --- a/qgis_deps/recipes/pdal/recipe.sh +++ b/qgis_deps/recipes/pdal/recipe.sh @@ -19,6 +19,7 @@ DEPS_pdal=( xz hdf5 zlib + libcurl ) # url of the package diff --git a/qgis_deps/recipes/poppler/recipe.sh b/qgis_deps/recipes/poppler/recipe.sh index 706ee17b..dba3a0de 100644 --- a/qgis_deps/recipes/poppler/recipe.sh +++ b/qgis_deps/recipes/poppler/recipe.sh @@ -19,6 +19,7 @@ DEPS_poppler=( libtiff little_cms2 openjpeg + libcurl ) # url of the package @@ -36,8 +37,6 @@ RECIPE_poppler=$RECIPES_PATH/poppler # function called for preparing source code if needed # (you can apply patch etc here.) function prebuild_poppler() { - install_name_tool -id $STAGE_PATH/lib/$LINK_poppler $STAGE_PATH/lib/$LINK_poppler - cd $BUILD_poppler # check marker diff --git a/qgis_deps/recipes/python/recipe.sh b/qgis_deps/recipes/python/recipe.sh index 48b02f69..13453837 100644 --- a/qgis_deps/recipes/python/recipe.sh +++ b/qgis_deps/recipes/python/recipe.sh @@ -5,16 +5,16 @@ DESC_python="Interpreted, interactive, object-oriented programming language" # version of your package (set in config.conf) VERSION_minor_python=7 VERSION_python=${VERSION_major_python}.${VERSION_minor_python} -LINK_python=libpython3.7m.dylib +LINK_python=libpython${VERSION_major_python}.dylib # dependencies of this recipe -DEPS_python=( openssl xz libffi zlib libzip sqlite expat unixodbc bz2 gettext ) +DEPS_python=(openssl xz libffi zlib libzip sqlite expat unixodbc bz2 gettext libcurl) # url of the package URL_python=https://www.python.org/ftp/python/${VERSION_python}/Python-${VERSION_python}.tar.xz # md5 of the package -MD5_python=172c650156f7bea68ce31b2fd01fa766 +MD5_python=60fe018fffc7f33818e6c340d29e2db9 # default build path BUILD_python=$BUILD_PATH/python/$(get_directory $URL_python) @@ -29,9 +29,8 @@ REQUIREMENTS_python=( wheel==https://files.pythonhosted.org/packages/75/28/521c6dc7fef23a68368efefdcd682f5b3d1d58c2b90b06dc1d0b805b51ae/wheel-0.34.2.tar.gz==ce2a27f99c130a927237b5da1ff5ceaf ) -install_default_packages () { - for i in ${REQUIREMENTS_python[*]} - do +install_default_packages() { + for i in ${REQUIREMENTS_python[*]}; do arr=(${i//==/ }) NAME=${arr[0]} URL=${arr[1]} @@ -48,20 +47,20 @@ install_default_packages () { export DYLD_LIBRARY_PATH=$STAGE_PATH/lib if [ "X$NAME" == "Xsetuptools" ]; then - try $PYTHON bootstrap.py + try $PYTHON bootstrap.py fi - echo `pwd` + echo $(pwd) try $PYTHON \ - -s setup.py \ - --no-user-cfg install \ - --force \ - --verbose \ - --install-scripts=$STAGE_PATH/bin \ - --install-lib=$QGIS_SITE_PACKAGES_PATH \ - --single-version-externally-managed \ - --record=installed.txt + -s setup.py \ + --no-user-cfg install \ + --force \ + --verbose \ + --install-scripts=$STAGE_PATH/bin \ + --install-lib=$QGIS_SITE_PACKAGES_PATH \ + --single-version-externally-managed \ + --record=installed.txt pop_env @@ -113,19 +112,19 @@ function install_python() { export CXXFLAGS="${CFLAGS}" try ${CONFIGURE} \ - --enable-ipv6 \ - --datarootdir=$STAGE_PATH/share \ - --datadir=$STAGE_PATH/share \ - --without-gcc \ - --with-openssl=$STAGE_PATH \ - --enable-optimizations \ - --enable-shared \ - --with-system-expat \ - --with-system-ffi \ - --with-ensurepip=no \ - --with-ssl-default-suites=openssl \ - --enable-loadable-sqlite-extensions \ - --with-system-ffi + --enable-ipv6 \ + --datarootdir=$STAGE_PATH/share \ + --datadir=$STAGE_PATH/share \ + --without-gcc \ + --with-openssl=$STAGE_PATH \ + --enable-optimizations \ + --enable-shared \ + --with-system-expat \ + --with-system-ffi \ + --with-ensurepip=no \ + --with-ssl-default-suites=openssl \ + --enable-loadable-sqlite-extensions \ + --with-system-ffi check_file_configuration config.status @@ -137,18 +136,22 @@ function install_python() { # function called to build the source code function build_python() { - install_python - install_default_packages + install_python + install_default_packages } # function called after all the compile have been done function postbuild_python() { - verify_binary bin/python3 - verify_binary lib/$LINK_python + verify_binary bin/python3 + verify_binary lib/$LINK_python - if ! python_package_installed bz2; then - error "Missing python bz2, probably libbz2 was not picked by compilation of python" - fi + if ! python_package_installed bz2; then + error "Missing python bz2, probably libbz2 was not picked by compilation of python" + fi +} + +function postbuild_wheel() { + : } # function to append information to config file @@ -156,4 +159,4 @@ function add_config_info_python() { append_to_config_file "# python-${VERSION_python}: ${DESC_python}" append_to_config_file "export VERSION_python=${VERSION_python}" append_to_config_file "export LINK_python=${LINK_python}" -} \ No newline at end of file +} diff --git a/qgis_deps/recipes/python_cftime/recipe.sh b/qgis_deps/recipes/python_cftime/recipe.sh new file mode 100644 index 00000000..2cbe802f --- /dev/null +++ b/qgis_deps/recipes/python_cftime/recipe.sh @@ -0,0 +1,73 @@ +#!/bin/bash + +DESC_python_cftime="Python binding of HDF5" + +# version of your package +# need to keep in sync with compatible version of netcdf lib +VERSION_python_cftime=1.2.1 + +# dependencies of this recipe +DEPS_python_cftime=(python python_packages netcdf hdf5 python_numpy libcurl) + +# url of the package +URL_python_cftime=https://files.pythonhosted.org/packages/0b/e6/2508d15ffa91c512ff9f6c9d9070c675c7fc2d6866adef6f44292623b09d/cftime-${VERSION_python_cftime}.tar.gz + +# md5 of the package +MD5_python_cftime=0952f5f0952bc606f73ddc5228d04d0e + +# default build path +BUILD_python_cftime=$BUILD_PATH/python_cftime/$(get_directory $URL_python_cftime) + +# function called for preparing source code if needed +# (you can apply patch etc here.) +function prebuild_python_cftime() { + mkdir -p $BUILD_python_cftime + cd $BUILD_python_cftime + + # check marker + if [ -f .patched ]; then + return + fi + + touch .patched +} + +function shouldbuild_python_cftime() { + # If lib is newer than the sourcecode skip build + if python_package_installed cftime; then + DO_BUILD=0 + fi +} + +# function called to build the source code +function build_python_cftime() { + try rsync -a $BUILD_python_cftime/ $BUILD_PATH/python_cftime/build-$ARCH/ + try cd $BUILD_PATH/python_cftime/build-$ARCH + + push_env + + export HDF5_DIR=$STAGE_PATH + export NETCDF4_DIR=$STAGE_PATH + export CURL_DIR=$STAGE_PATH + + DYLD_LIBRARY_PATH=$STAGE_PATH/lib try $PYTHON setup.py install + + unset HDF5_DIR + unset NETCDF4_DIR + unset CURL_DIR + + pop_env +} + +# function called after all the compile have been done +function postbuild_python_cftime() { + if ! python_package_installed_verbose cftime; then + error "Missing python package cftime" + fi +} + +# function to append information to config file +function add_config_info_python_cftime() { + append_to_config_file "# python_cftime-${VERSION_python_cftime}: ${DESC_python_cftime}" + append_to_config_file "export VERSION_python_cftime=${VERSION_python_cftime}" +} \ No newline at end of file diff --git a/qgis_deps/recipes/python_gdal/recipe.sh b/qgis_deps/recipes/python_gdal/recipe.sh index c4ea1693..233cc02b 100644 --- a/qgis_deps/recipes/python_gdal/recipe.sh +++ b/qgis_deps/recipes/python_gdal/recipe.sh @@ -1,6 +1,6 @@ #!/bin/bash -DESC_python_gdal="Proj binding for python" +DESC_python_gdal="GDAL binding for python" # version of your package # keep in SYNC with gdal receipt @@ -37,7 +37,7 @@ function prebuild_python_gdal() { function shouldbuild_python_gdal() { # If lib is newer than the sourcecode skip build - if python_package_installed gdal; then + if python_package_installed osgeo; then DO_BUILD=0 fi } @@ -58,8 +58,8 @@ function build_python_gdal() { # function called after all the compile have been done function postbuild_python_gdal() { - if ! python_package_installed_verbose gdal; then - error "Missing python package gdal" + if ! python_package_installed_verbose osgeo; then + error "Missing python package osgeo" fi } diff --git a/qgis_deps/recipes/python_netcdf4/recipe.sh b/qgis_deps/recipes/python_netcdf4/recipe.sh index 890dc39b..7d65a705 100644 --- a/qgis_deps/recipes/python_netcdf4/recipe.sh +++ b/qgis_deps/recipes/python_netcdf4/recipe.sh @@ -4,16 +4,16 @@ DESC_python_netcdf4="Python binding of HDF5" # version of your package # need to keep in sync with compatible version of netcdf lib -VERSION_python_netcdf4=1.5.3 +VERSION_python_netcdf4=1.5.4 # dependencies of this recipe -DEPS_python_netcdf4=(python python_packages netcdf hdf5 python_numpy) +DEPS_python_netcdf4=(python python_packages netcdf hdf5 python_numpy libcurl python_cftime) # url of the package URL_python_netcdf4=https://github.com/Unidata/netcdf4-python/archive/v${VERSION_python_netcdf4}rel.tar.gz # md5 of the package -MD5_python_netcdf4=8c44711c6d078ee70c5df9a55be1b42e +MD5_python_netcdf4=eddb60fddd0f018da33111931fe49d33 # default build path BUILD_python_netcdf4=$BUILD_PATH/python_netcdf4/$(get_directory $URL_python_netcdf4) @@ -45,13 +45,16 @@ function build_python_netcdf4() { try cd $BUILD_PATH/python_netcdf4/build-$ARCH push_env + export HDF5_DIR=$STAGE_PATH export NETCDF4_DIR=$STAGE_PATH - try $PYTHON setup.py build - try $PYTHON setup.py install + export CURL_DIR=$STAGE_PATH + + DYLD_LIBRARY_PATH=$STAGE_PATH/lib try $PYTHON setup.py install unset HDF5_DIR unset NETCDF4_DIR + unset CURL_DIR pop_env } diff --git a/qgis_deps/recipes/python_numpy/recipe.sh b/qgis_deps/recipes/python_numpy/recipe.sh index e0e3efa9..1df1320f 100644 --- a/qgis_deps/recipes/python_numpy/recipe.sh +++ b/qgis_deps/recipes/python_numpy/recipe.sh @@ -3,8 +3,7 @@ DESC_python_numpy="python numpy" # version of your package -# keep in SYNC with proj receipt -VERSION_python_numpy=1.19.1 +VERSION_python_numpy=1.20.1 # dependencies of this recipe DEPS_python_numpy=(python python_packages openblas) @@ -13,7 +12,7 @@ DEPS_python_numpy=(python python_packages openblas) URL_python_numpy=https://github.com/numpy/numpy/archive/v${VERSION_python_numpy}.tar.gz # md5 of the package -MD5_python_numpy=df258dde5dace1d43d152ecfbb812088 +MD5_python_numpy=a8414e2eebac83a4d5b6a945063c4fff # default build path BUILD_python_numpy=$BUILD_PATH/python_numpy/$(get_directory $URL_python_numpy) diff --git a/qgis_deps/recipes/python_packages/recipe.sh b/qgis_deps/recipes/python_packages/recipe.sh index 5cc3c852..b66db420 100644 --- a/qgis_deps/recipes/python_packages/recipe.sh +++ b/qgis_deps/recipes/python_packages/recipe.sh @@ -115,6 +115,9 @@ REQUIREMENTS_python_packages=( importlib-metadata==1.7.0 zipp==3.1.0 rasterstats==0.15.0 + clipboard==0.0.4 + pyperclip==1.8.1 + pyvenv=0.2.2 ) IMPORTS_python_packages=( diff --git a/qgis_deps/recipes/qtkeychain/recipe.sh b/qgis_deps/recipes/qtkeychain/recipe.sh index d967bfbf..0fc48487 100644 --- a/qgis_deps/recipes/qtkeychain/recipe.sh +++ b/qgis_deps/recipes/qtkeychain/recipe.sh @@ -3,7 +3,7 @@ DESC_qtkeychain="Platform-independent Qt API for storing passwords securely" # version of your package -VERSION_qtkeychain=0.10.0 +VERSION_qtkeychain=0.12.0 LINK_qtkeychain=libqt5keychain.1.dylib @@ -14,7 +14,7 @@ DEPS_qtkeychain=() URL_qtkeychain=https://github.com/frankosterfeld/qtkeychain/archive/v${VERSION_qtkeychain}.tar.gz # md5 of the package -MD5_qtkeychain=00856441d995146b11fb8cfab87b8bc6 +MD5_qtkeychain=474f172b42017872dd50eec6c9981fed # default build path BUILD_qtkeychain=$BUILD_PATH/qtkeychain/$(get_directory $URL_qtkeychain) @@ -50,7 +50,8 @@ function build_qtkeychain() { try ${CMAKE} \ -DQTKEYCHAIN_STATIC=OFF \ - -DBUILD_WITH_QT4=OFF \ + -DBUILD_WITH_QT6=OFF \ + -DBUILD_TEST_APPLICATION=ON \ -DBUILD_TRANSLATIONS=OFF \ $BUILD_qtkeychain diff --git a/qgis_deps/recipes/qtwebkit/patches/bison37.patch b/qgis_deps/recipes/qtwebkit/patches/bison37.patch new file mode 100644 index 00000000..b7dd7ec8 --- /dev/null +++ b/qgis_deps/recipes/qtwebkit/patches/bison37.patch @@ -0,0 +1,29 @@ +--- a/Source/WebCore/css/makegrammar.pl 2021-02-10 09:43:39.000000000 +0100 ++++ b/Source/WebCore/css/makegrammar.pl 2021-02-10 09:44:24.000000000 +0100 +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { + } + + my $fileBase = File::Spec->join($outputDir, $filename); +-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); + push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. + system(@bisonCommand) == 0 or die; +- +-open HEADER, ">$fileBase.h" or die; +-print HEADER << "EOF"; +-#ifndef CSSGRAMMAR_H +-#define CSSGRAMMAR_H +-EOF +- +-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; +-while () { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- diff --git a/qgis_deps/recipes/qtwebkit/recipe.sh b/qgis_deps/recipes/qtwebkit/recipe.sh index 39b0f8ac..9d9e3a0a 100644 --- a/qgis_deps/recipes/qtwebkit/recipe.sh +++ b/qgis_deps/recipes/qtwebkit/recipe.sh @@ -6,7 +6,7 @@ DESC_qtwebkit="WebKit extension for QT5" VERSION_qtwebkit=${VERSION_qt} # dependencies of this recipe -DEPS_qtwebkit=( sqlite bison webp zlib libxslt jpeg png libtiff ) +DEPS_qtwebkit=( sqlite bison webp zlib libxslt jpeg png libtiff libicu ) # url of the package URL_qtwebkit=https://github.com/qt/qtwebkit/archive/v5.212.0-alpha4.tar.gz @@ -30,6 +30,9 @@ function prebuild_qtwebkit() { return fi + #https://github.com/qtwebkit/qtwebkit/pull/1012/files + try patch --verbose --forward -p1 < $RECIPE_qtwebkit/patches/bison37.patch + # Ambiguous Handle (also in MacPorts.h) try ${SED} 's;isReachableFromOpaqueRoots(Handle;isReachableFromOpaqueRoots(JSC::Handle;g' Source/JavaScriptCore/jsc.cpp @@ -54,6 +57,9 @@ function build_qtwebkit() { -DENABLE_TOOLS=FALSE \ -DENABLE_API_TESTS=FALSE \ -DSHOULD_INSTALL_JS_SHELL=FALSE \ + -DUSE_LIBHYPHEN=OFF \ + -DMACOS_USE_SYSTEM_ICU=OFF \ + -DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF \ -DQT_INSTALL_PREFIX=$QT_BASE/clang_64 \ $BUILD_qtwebkit diff --git a/qgis_deps/recipes/xerces/recipe.sh b/qgis_deps/recipes/xerces/recipe.sh index eb620de3..1a0a1e54 100644 --- a/qgis_deps/recipes/xerces/recipe.sh +++ b/qgis_deps/recipes/xerces/recipe.sh @@ -7,7 +7,7 @@ VERSION_xerces=3.2.3 LINK_libxerces_c=libxerces-c-3.2.dylib # dependencies of this recipe -DEPS_xerces=(expat) +DEPS_xerces=(expat libcurl libicu) # url of the package URL_xerces=https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${VERSION_xerces}.tar.gz