Skip to content

Commit

Permalink
Update deps (#112)
Browse files Browse the repository at this point in the history
updates: gdal, grass, ... and package libcurl!
  • Loading branch information
PeterPetrik authored Feb 11, 2021
1 parent 40ca7e8 commit 7e64944
Show file tree
Hide file tree
Showing 64 changed files with 862 additions and 200 deletions.
1 change: 0 additions & 1 deletion config/defaults.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion config/dev.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions config/ltr.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion config/nightly.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions config/pr.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion qgis_bundle/recipes/fontconfig/recipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion qgis_bundle/recipes/freetype/recipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions qgis_bundle/recipes/gdal/recipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ function bundle_gdal() {
gdalmanage \
gdalmdiminfo \
gdalmdimtranslate \
gdalserver \
gdalsrsinfo \
gdaltindex \
gdaltransform \
Expand Down Expand Up @@ -103,7 +102,6 @@ function fix_binaries_gdal() {
bin/_gdalmanage \
bin/_gdalmdiminfo \
bin/_gdalmdimtranslate \
bin/_gdalserver \
bin/_gdalsrsinfo \
bin/_gdaltindex \
bin/_gdaltransform \
Expand All @@ -123,6 +121,7 @@ function fix_binaries_gdal() {
$LINK_libtiff \
$LINK_libxml2 \
$LINK_libcrypto \
$LINK_libssl \
$LINK_libpng \
$LINK_libpq \
$LINK_libproj \
Expand All @@ -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
Expand All @@ -169,7 +170,6 @@ function fix_binaries_gdal() {
bin/_gdalmanage \
bin/_gdalmdiminfo \
bin/_gdalmdimtranslate \
bin/_gdalserver \
bin/_gdalsrsinfo \
bin/_gdaltindex \
bin/_gdaltransform \
Expand Down
36 changes: 36 additions & 0 deletions qgis_bundle/recipes/libcurl/recipe.sh
Original file line number Diff line number Diff line change
@@ -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() {
:
}
54 changes: 54 additions & 0 deletions qgis_bundle/recipes/libicu/recipe.sh
Original file line number Diff line number Diff line change
@@ -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() {
:
}
36 changes: 36 additions & 0 deletions qgis_bundle/recipes/libssh2/recipe.sh
Original file line number Diff line number Diff line change
@@ -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() {
:
}
28 changes: 28 additions & 0 deletions qgis_bundle/recipes/libunistring/recipe.sh
Original file line number Diff line number Diff line change
@@ -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() {
:
}
3 changes: 2 additions & 1 deletion qgis_bundle/recipes/netcdf/recipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions qgis_bundle/recipes/pdal/recipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion qgis_bundle/recipes/poppler/recipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
43 changes: 21 additions & 22 deletions qgis_bundle/recipes/python/recipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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
}
verify_file_paths $BUNDLE_PYTHON_PACKAGES_DIR/config-${VERSION_major_python}-darwin/python-config.py
}
26 changes: 26 additions & 0 deletions qgis_bundle/recipes/python_cftime/recipe.sh
Original file line number Diff line number Diff line change
@@ -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() {
:
}
Loading

0 comments on commit 7e64944

Please sign in to comment.