From 9b783a22e6e4c04553236d32b260129ee8883e2b Mon Sep 17 00:00:00 2001 From: hxbb00 Date: Fri, 28 Feb 2025 17:16:18 +0800 Subject: [PATCH 1/2] fix: build local can pass environment when vs/windows kits not on drive c --- scripts/build-helpers | 17 ++++++++++++----- src/qgis-dev/osgeo4w/package.sh | 4 ++-- src/qgis-ltr-dev/osgeo4w/package.sh | 4 ++-- src/qgis-ltr-qt6/osgeo4w/package.sh | 4 ++-- src/qgis-ltr/osgeo4w/package.sh | 4 ++-- src/qgis-qt6-dev/osgeo4w/package.sh | 4 ++-- src/qgis-qt6-ltr-dev/osgeo4w/package.sh | 4 ++-- src/qgis-qt6-rel-dev/osgeo4w/package.sh | 4 ++-- src/qgis-qt6/osgeo4w/package.sh | 4 ++-- src/qgis-rel-dev/osgeo4w/package.sh | 4 ++-- src/qgis/osgeo4w/package.sh | 4 ++-- 11 files changed, 32 insertions(+), 25 deletions(-) diff --git a/scripts/build-helpers b/scripts/build-helpers index 78cfc216..afdf765a 100644 --- a/scripts/build-helpers +++ b/scripts/build-helpers @@ -11,6 +11,13 @@ export MASTER_SCP=upload.osgeo.org:/osgeo/download/$MASTER_BASE export OSGEO4W_SCRIPTS=$(cygpath -a "$( dirname "${BASH_SOURCE[0]}" )") export OSGEO4W_PWD=$PWD +: ${WINDOWS_KITS_ROOT:=c/Program Files (x86)/Windows Kits} +: ${MSVS2022_ROOT:=$PROGRAMFILES} +: ${MSVS2019_ROOT:=$PROGRAMFILES (x86)} +export WINDOWS_KITS_ROOT +export MSVS2022_ROOT +export MSVS2019_ROOT + export CCACHE_CACHE_SIZE=50G : ${PYTHON:=Python312} @@ -179,7 +186,7 @@ vs2019env() { vcdir= for e in Community Professional Enterprise; do - d=$(cygpath "$PROGRAMFILES (x86)\\Microsoft Visual Studio\\2019\\$e") + d=$(cygpath "$MSVS2019_ROOT\\Microsoft Visual Studio\\2019\\$e") if [ -d "$d" ]; then vcdir=$d break @@ -233,7 +240,7 @@ vs2022env() { vcdir= for e in Community Professional Enterprise; do - d=$(cygpath "$PROGRAMFILES\\Microsoft Visual Studio\\2022\\$e") + d=$(cygpath "$MSVS2022_ROOT\\Microsoft Visual Studio\\2022\\$e") if [ -d "$d" ]; then vcdir=$d break @@ -265,7 +272,7 @@ vs2022env() { VCSDK=10.0.22621.0 fi - local dhd="/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/dbghelp.dll" + local dhd="/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/dbghelp.dll" # make sure we have a dbghelp version, that works on Windows 8 using brute force if ! [ -f "$dhd" ]; then @@ -280,7 +287,7 @@ vs2022env() { v=$(fileversion "$dhd") case $v in - 10.0.19041.*) + 10.0.19041.*|10.0.22621.*) ;; *) log Replacing $dhd $v @@ -365,7 +372,7 @@ ninjaenv() { if ! [ -x "$OSGEO4W_SCRIPTS/ninja.exe" ]; then ( cd /tmp - curl --remote-name -L https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip + curl --remote-name -L https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip cd $OSGEO4W_SCRIPTS unzip /tmp/ninja-win.zip diff --git a/src/qgis-dev/osgeo4w/package.sh b/src/qgis-dev/osgeo4w/package.sh index d3435051..377d3682 100644 --- a/src/qgis-dev/osgeo4w/package.sh +++ b/src/qgis-dev/osgeo4w/package.sh @@ -185,7 +185,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -285,7 +285,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" qgis.bat >install/bin/$P.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" process.bat >install/bin/qgis_process-$P.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mkdir -p install/apps/$P/python cp "$PYTHONHOME/Lib/site-packages/PyQt5/uic/widget-plugins/qgis_customwidgets.py" install/apps/$P/python diff --git a/src/qgis-ltr-dev/osgeo4w/package.sh b/src/qgis-ltr-dev/osgeo4w/package.sh index bb19254e..5e490083 100644 --- a/src/qgis-ltr-dev/osgeo4w/package.sh +++ b/src/qgis-ltr-dev/osgeo4w/package.sh @@ -201,7 +201,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -301,7 +301,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" qgis.bat >install/bin/$P.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" process.bat >install/bin/qgis_process-$P.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mkdir -p install/apps/$P/python cp "$PYTHONHOME/Lib/site-packages/PyQt5/uic/widget-plugins/qgis_customwidgets.py" install/apps/$P/python diff --git a/src/qgis-ltr-qt6/osgeo4w/package.sh b/src/qgis-ltr-qt6/osgeo4w/package.sh index d4524849..0dbbeee8 100644 --- a/src/qgis-ltr-qt6/osgeo4w/package.sh +++ b/src/qgis-ltr-qt6/osgeo4w/package.sh @@ -136,7 +136,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -240,7 +240,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" postinstall-grass.bat >install/etc/postinstall/$P-grass-plugin.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" preremove-grass.bat >install/etc/preremove/$P-grass-plugin.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mv install/apps/$P/bin/qgis.exe install/bin/$P-bin.exe cp qgis.vars install/bin/$P-bin.vars diff --git a/src/qgis-ltr/osgeo4w/package.sh b/src/qgis-ltr/osgeo4w/package.sh index f12264a6..f6471765 100644 --- a/src/qgis-ltr/osgeo4w/package.sh +++ b/src/qgis-ltr/osgeo4w/package.sh @@ -132,7 +132,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -236,7 +236,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" postinstall-grass.bat >install/etc/postinstall/$P-grass-plugin.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" preremove-grass.bat >install/etc/preremove/$P-grass-plugin.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mv install/apps/$P/bin/qgis.exe install/bin/$P-bin.exe cp qgis.vars install/bin/$P-bin.vars diff --git a/src/qgis-qt6-dev/osgeo4w/package.sh b/src/qgis-qt6-dev/osgeo4w/package.sh index 52553fd3..c498a0b6 100644 --- a/src/qgis-qt6-dev/osgeo4w/package.sh +++ b/src/qgis-qt6-dev/osgeo4w/package.sh @@ -193,7 +193,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -293,7 +293,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" qgis.bat >install/bin/$P.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" process.bat >install/bin/qgis_process-$P.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mkdir -p install/apps/$P/python cp "$PYTHONHOME/Lib/site-packages/PyQt6/uic/widget-plugins/qgis_customwidgets.py" install/apps/$P/python diff --git a/src/qgis-qt6-ltr-dev/osgeo4w/package.sh b/src/qgis-qt6-ltr-dev/osgeo4w/package.sh index ac12ffac..1e8c06f0 100644 --- a/src/qgis-qt6-ltr-dev/osgeo4w/package.sh +++ b/src/qgis-qt6-ltr-dev/osgeo4w/package.sh @@ -209,7 +209,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -309,7 +309,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" qgis.bat >install/bin/$P.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" process.bat >install/bin/qgis_process-$P.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mkdir -p install/apps/$P/python cp "$PYTHONHOME/Lib/site-packages/PyQt6/uic/widget-plugins/qgis_customwidgets.py" install/apps/$P/python diff --git a/src/qgis-qt6-rel-dev/osgeo4w/package.sh b/src/qgis-qt6-rel-dev/osgeo4w/package.sh index 766d56c7..36a1ece2 100644 --- a/src/qgis-qt6-rel-dev/osgeo4w/package.sh +++ b/src/qgis-qt6-rel-dev/osgeo4w/package.sh @@ -201,7 +201,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -301,7 +301,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" qgis.bat >install/bin/$P.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" process.bat >install/bin/qgis_process-$P.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mkdir -p install/apps/$P/python cp "$PYTHONHOME/Lib/site-packages/PyQt6/uic/widget-plugins/qgis_customwidgets.py" install/apps/$P/python diff --git a/src/qgis-qt6/osgeo4w/package.sh b/src/qgis-qt6/osgeo4w/package.sh index bae3808e..6136ed7a 100644 --- a/src/qgis-qt6/osgeo4w/package.sh +++ b/src/qgis-qt6/osgeo4w/package.sh @@ -137,7 +137,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -241,7 +241,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" postinstall-grass.bat >install/etc/postinstall/$P-grass-plugin.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" preremove-grass.bat >install/etc/preremove/$P-grass-plugin.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mv install/apps/$P/bin/qgis.exe install/bin/$P-bin.exe cp qgis.vars install/bin/$P-bin.vars diff --git a/src/qgis-rel-dev/osgeo4w/package.sh b/src/qgis-rel-dev/osgeo4w/package.sh index fce08f53..1fe45bee 100644 --- a/src/qgis-rel-dev/osgeo4w/package.sh +++ b/src/qgis-rel-dev/osgeo4w/package.sh @@ -193,7 +193,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -293,7 +293,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" qgis.bat >install/bin/$P.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" -e "s/@grasspath@/$(basename $GRASS_PREFIX)/g" -e "s/@grassmajor@/${GRASS_VERSION%%.*}/" process.bat >install/bin/qgis_process-$P.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mkdir -p install/apps/$P/python cp "$PYTHONHOME/Lib/site-packages/PyQt5/uic/widget-plugins/qgis_customwidgets.py" install/apps/$P/python diff --git a/src/qgis/osgeo4w/package.sh b/src/qgis/osgeo4w/package.sh index 518cfdf6..5492c5f8 100644 --- a/src/qgis/osgeo4w/package.sh +++ b/src/qgis/osgeo4w/package.sh @@ -133,7 +133,7 @@ nextbinary -D WITH_CUSTOM_WIDGETS=TRUE \ -D CMAKE_BUILD_TYPE=$BUILDCONF \ -D CMAKE_CONFIGURATION_TYPES="$BUILDCONF" \ - -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/c/Program Files (x86)/Windows Kits/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ + -D SETUPAPI_LIBRARY="$(cygpath -am "/cygdrive/$WINDOWS_KITS_ROOT/10/Lib/$UCRTVersion/um/x64/SetupAPI.Lib")" \ -D PROJ_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D POSTGRES_INCLUDE_DIR=$(cygpath -am $O4W_ROOT/include) \ -D GEOS_LIBRARY=$(cygpath -am "$O4W_ROOT/lib/geos_c.lib") \ @@ -237,7 +237,7 @@ nextbinary sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" postinstall-grass.bat >install/etc/postinstall/$P-grass-plugin.bat sed -e "s/@package@/$P/g" -e "s/@version@/$v/g" -e "s/@grassversion@/$GRASS_VERSION/g" preremove-grass.bat >install/etc/preremove/$P-grass-plugin.bat - cp "/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P + cp "/cygdrive/$WINDOWS_KITS_ROOT/10/Debuggers/x64/"{dbghelp.dll,symsrv.dll} install/apps/$P mv install/apps/$P/bin/qgis.exe install/bin/$P-bin.exe cp qgis.vars install/bin/$P-bin.vars From 8f6d4fa1df82e54f15146a24965421da1a66b9d1 Mon Sep 17 00:00:00 2001 From: hxbb00 Date: Fri, 28 Feb 2025 18:00:46 +0800 Subject: [PATCH 2/2] fix: add miss deps --- src/qgis-dev/osgeo4w/package.sh | 2 +- src/qgis-ltr-dev/osgeo4w/package.sh | 2 +- src/qgis-ltr-qt6/osgeo4w/package.sh | 2 +- src/qgis-ltr/osgeo4w/package.sh | 2 +- src/qgis-qt6-dev/osgeo4w/package.sh | 2 +- src/qgis-qt6-ltr-dev/osgeo4w/package.sh | 2 +- src/qgis-qt6-rel-dev/osgeo4w/package.sh | 2 +- src/qgis-qt6/osgeo4w/package.sh | 2 +- src/qgis-rel-dev/osgeo4w/package.sh | 2 +- src/qgis/osgeo4w/package.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qgis-dev/osgeo4w/package.sh b/src/qgis-dev/osgeo4w/package.sh index 377d3682..b0ae68c3 100644 --- a/src/qgis-dev/osgeo4w/package.sh +++ b/src/qgis-dev/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis-dev export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel gdal-dev-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel gdal-dev-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib python3-jinja2 python3-owslib" export PACKAGES="qgis-dev qgis-dev-deps qgis-dev-full qgis-dev-full-free qgis-dev-pdb" : ${REPO:=https://github.com/qgis/QGIS.git} diff --git a/src/qgis-ltr-dev/osgeo4w/package.sh b/src/qgis-ltr-dev/osgeo4w/package.sh index 5e490083..bff86a49 100644 --- a/src/qgis-ltr-dev/osgeo4w/package.sh +++ b/src/qgis-ltr-dev/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis-ltr-dev export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib gdal-devel" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib python3-jinja2 python3-owslib gdal-devel" export PACKAGES="qgis-ltr-dev qgis-ltr-dev-deps qgis-ltr-dev-full qgis-ltr-dev-full-free qgis-ltr-dev-pdb" : ${REPO:=https://github.com/qgis/QGIS.git} diff --git a/src/qgis-ltr-qt6/osgeo4w/package.sh b/src/qgis-ltr-qt6/osgeo4w/package.sh index 0dbbeee8..16edd4d6 100644 --- a/src/qgis-ltr-qt6/osgeo4w/package.sh +++ b/src/qgis-ltr-qt6/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis-ltr-qt6 export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel python3-oauthlib gdal-devel" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel python3-oauthlib python3-jinja2 python3-owslib gdal-devel" export PACKAGES="qgis-ltr-qt6 qgis-ltr-qt6-common qgis-ltr-qt6-deps qgis-ltr-qt6-devel qgis-ltr-qt6-full qgis-ltr-qt6-full-free qgis-ltr-qt6-grass-plugin qgis-ltr-qt6-oracle-provider qgis-ltr-qt6-pdb qgis-ltr-qt6-server" : ${REPO:=https://github.com/qgis/QGIS.git} diff --git a/src/qgis-ltr/osgeo4w/package.sh b/src/qgis-ltr/osgeo4w/package.sh index f6471765..a36f48dc 100644 --- a/src/qgis-ltr/osgeo4w/package.sh +++ b/src/qgis-ltr/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis-ltr export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel gdal-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel python3-oauthlib" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel gdal-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel python3-oauthlib python3-jinja2 python3-owslib" export PACKAGES="qgis-ltr qgis-ltr-common qgis-ltr-deps qgis-ltr-devel qgis-ltr-full qgis-ltr-full-free qgis-ltr-grass-plugin qgis-ltr-oracle-provider qgis-ltr-pdb qgis-ltr-server" : ${REPO:=https://github.com/qgis/QGIS.git} diff --git a/src/qgis-qt6-dev/osgeo4w/package.sh b/src/qgis-qt6-dev/osgeo4w/package.sh index c498a0b6..96bac611 100644 --- a/src/qgis-qt6-dev/osgeo4w/package.sh +++ b/src/qgis-qt6-dev/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis-qt6-dev export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib gdal-dev-devel" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib python3-jinja2 python3-owslib gdal-dev-devel" export PACKAGES="qgis-qt6-dev qgis-qt6-dev-deps qgis-qt6-dev-full qgis-qt6-dev-full-free qgis-qt6-dev-pdb" : ${REPO:=https://github.com/qgis/QGIS.git} diff --git a/src/qgis-qt6-ltr-dev/osgeo4w/package.sh b/src/qgis-qt6-ltr-dev/osgeo4w/package.sh index 1e8c06f0..3d1e2e76 100644 --- a/src/qgis-qt6-ltr-dev/osgeo4w/package.sh +++ b/src/qgis-qt6-ltr-dev/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis-qt6-ltr-dev export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib gdal-devel" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib python3-jinja2 python3-owslib gdal-devel" export PACKAGES="qgis-qt6-ltr-dev qgis-qt6-ltr-dev-deps qgis-qt6-ltr-dev-full qgis-qt6-ltr-dev-full-free qgis-qt6-ltr-dev-pdb" : ${REPO:=https://github.com/qgis/QGIS.git} diff --git a/src/qgis-qt6-rel-dev/osgeo4w/package.sh b/src/qgis-qt6-rel-dev/osgeo4w/package.sh index 36a1ece2..ccbf8266 100644 --- a/src/qgis-qt6-rel-dev/osgeo4w/package.sh +++ b/src/qgis-qt6-rel-dev/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis-qt6-rel-dev export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib gdal-devel" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib python3-jinja2 python3-owslib gdal-devel" export PACKAGES="qgis-qt6-rel-dev qgis-qt6-rel-dev-deps qgis-qt6-rel-dev-full qgis-qt6-rel-dev-full-free qgis-qt6-rel-dev-pdb" : ${REPO:=https://github.com/qgis/QGIS.git} diff --git a/src/qgis-qt6/osgeo4w/package.sh b/src/qgis-qt6/osgeo4w/package.sh index 6136ed7a..9730cfc6 100644 --- a/src/qgis-qt6/osgeo4w/package.sh +++ b/src/qgis-qt6/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis-qt6 export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel python3-oauthlib gdal-devel" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel qt6-qml qt6-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt6 python3-sip python3-pyqt-builder python3-devel python3-pyqt6-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-qt6-devel qscintilla-qt6-devel qt6-devel qwt-qt6-devel libspatialite-devel oci-devel qtkeychain-qt6-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel python3-oauthlib python3-jinja2 python3-owslib gdal-devel" export PACKAGES="qgis-qt6 qgis-qt6-common qgis-qt6-deps qgis-qt6-devel qgis-qt6-full qgis-qt6-full-free qgis-qt6-grass-plugin qgis-qt6-oracle-provider qgis-qt6-pdb qgis-qt6-server" : ${REPO:=https://github.com/qgis/QGIS.git} diff --git a/src/qgis-rel-dev/osgeo4w/package.sh b/src/qgis-rel-dev/osgeo4w/package.sh index 1fe45bee..e5aa16b3 100644 --- a/src/qgis-rel-dev/osgeo4w/package.sh +++ b/src/qgis-rel-dev/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis-rel-dev export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel gdal-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel gdal-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel transifex-cli python3-oauthlib python3-jinja2 python3-owslib" export PACKAGES="qgis-rel-dev qgis-rel-dev-deps qgis-rel-dev-full qgis-rel-dev-full-free qgis-rel-dev-pdb" : ${REPO:=https://github.com/qgis/QGIS.git} diff --git a/src/qgis/osgeo4w/package.sh b/src/qgis/osgeo4w/package.sh index 5492c5f8..24cbdf92 100644 --- a/src/qgis/osgeo4w/package.sh +++ b/src/qgis/osgeo4w/package.sh @@ -2,7 +2,7 @@ export P=qgis export V=tbd export B=tbd export MAINTAINER=JuergenFischer -export BUILDDEPENDS="expat-devel fcgi-devel proj-devel gdal-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel python3-oauthlib" +export BUILDDEPENDS="expat-devel fcgi-devel proj-devel gdal-devel qt5-oci sqlite3-devel geos-devel gsl-devel libiconv-devel libzip-devel libspatialindex-devel python3-pip python3-pyqt5 python3-sip python3-pyqt-builder python3-devel python3-qscintilla python3-nose2 python3-future python3-pyyaml python3-mock python3-six qca-devel qscintilla-devel qt5-devel qwt-devel libspatialite-devel oci-devel qtkeychain-devel zlib-devel opencl-devel exiv2-devel protobuf-devel python3-setuptools zstd-devel qtwebkit-devel libpq-devel libxml2-devel hdf5-devel hdf5-tools netcdf-devel pdal pdal-devel grass draco-devel libtiff-devel python3-oauthlib python3-jinja2 python3-owslib" export PACKAGES="qgis qgis-common qgis-deps qgis-devel qgis-full qgis-full-free qgis-grass-plugin qgis-oracle-provider qgis-pdb qgis-server" : ${REPO:=https://github.com/qgis/QGIS.git}