fix build of pyqt5 and pyscintilla

qgis · Apr 3, 2020 · 3060872 · 3060872
1 parent 21789aa
commit 3060872
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/qgis_deps/create_package.bash b/qgis_deps/create_package.bash
@@ -20,6 +20,8 @@ if [ ! -d $ROOT_OUT_PATH ]; then
   error "The root output directory '$ROOT_OUT_PATH' not found."
 fi
 
+echo "Create packages for qgis-deps-${RELEASE_VERSION}"
+
 ##############################################
 # Create install script
 INSTALL_SCRIPT=$ROOT_OUT_PATH/install_qgis_deps-${RELEASE_VERSION}.bash

diff --git a/qgis_deps/recipes/python_pyqt5/recipe.sh b/qgis_deps/recipes/python_pyqt5/recipe.sh
@@ -53,7 +53,7 @@ function prebuild_python_pyqt5() {
 }
 
 function shouldbuild_python_pyqt5() {
-  if python_package_installed PyQt5; then
+  if python_package_installed PyQt5.QtCore; then
     DO_BUILD=0
   fi
 }
@@ -87,8 +87,8 @@ function build_python_pyqt5() {
 }
 
 function postbuild_python_pyqt5() {
-   if ! python_package_installed PyQt5; then
-      error "Missing python package PyQt5"
+   if ! python_package_installed PyQt5.QtCore; then
+      error "Missing python package PyQt5.QtCore.QtCore"
    fi
 }
 

diff --git a/qgis_deps/recipes/python_qscintilla/recipe.sh b/qgis_deps/recipes/python_qscintilla/recipe.sh
@@ -8,7 +8,7 @@ VERSION_python_qscintilla=2.11.4
 
 # dependencies of this recipe
 # depends on PyQt5
-DEPS_python_qscintilla=(python qscintilla python_sip python_qscintilla)
+DEPS_python_qscintilla=(python qscintilla python_sip python_pyqt5)
 
 # url of the package
 URL_python_qscintilla=https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION_python_qscintilla}/QScintilla-${VERSION_python_qscintilla}.tar.gz