diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index a2be71c3..8fcac605 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,36 +8,68 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython + linux_64_libprotobuf3.21python3.10.____cpython: + CONFIG: linux_64_libprotobuf3.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.11.____cpython: - CONFIG: linux_64_python3.11.____cpython + linux_64_libprotobuf3.21python3.11.____cpython: + CONFIG: linux_64_libprotobuf3.21python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython + linux_64_libprotobuf3.21python3.8.____cpython: + CONFIG: linux_64_libprotobuf3.21python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + linux_64_libprotobuf3.21python3.9.____cpython: + CONFIG: linux_64_libprotobuf3.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.10.____cpython: - CONFIG: linux_aarch64_python3.10.____cpython + linux_64_libprotobuf4.23.2python3.10.____cpython: + CONFIG: linux_64_libprotobuf4.23.2python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.11.____cpython: - CONFIG: linux_aarch64_python3.11.____cpython + linux_64_libprotobuf4.23.2python3.11.____cpython: + CONFIG: linux_64_libprotobuf4.23.2python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.8.____cpython: - CONFIG: linux_aarch64_python3.8.____cpython + linux_64_libprotobuf4.23.2python3.8.____cpython: + CONFIG: linux_64_libprotobuf4.23.2python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.9.____cpython: - CONFIG: linux_aarch64_python3.9.____cpython + linux_64_libprotobuf4.23.2python3.9.____cpython: + CONFIG: linux_64_libprotobuf4.23.2python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_libprotobuf3.21python3.10.____cpython: + CONFIG: linux_aarch64_libprotobuf3.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_libprotobuf3.21python3.11.____cpython: + CONFIG: linux_aarch64_libprotobuf3.21python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_libprotobuf3.21python3.8.____cpython: + CONFIG: linux_aarch64_libprotobuf3.21python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_libprotobuf3.21python3.9.____cpython: + CONFIG: linux_aarch64_libprotobuf3.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_libprotobuf4.23.2python3.10.____cpython: + CONFIG: linux_aarch64_libprotobuf4.23.2python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_libprotobuf4.23.2python3.11.____cpython: + CONFIG: linux_aarch64_libprotobuf4.23.2python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_libprotobuf4.23.2python3.8.____cpython: + CONFIG: linux_aarch64_libprotobuf4.23.2python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_libprotobuf4.23.2python3.9.____cpython: + CONFIG: linux_aarch64_libprotobuf4.23.2python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 052ccf05..2b166d4f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,29 +8,53 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython + osx_64_libprotobuf3.21python3.10.____cpython: + CONFIG: osx_64_libprotobuf3.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.11.____cpython: - CONFIG: osx_64_python3.11.____cpython + osx_64_libprotobuf3.21python3.11.____cpython: + CONFIG: osx_64_libprotobuf3.21python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_libprotobuf3.21python3.8.____cpython: + CONFIG: osx_64_libprotobuf3.21python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + osx_64_libprotobuf3.21python3.9.____cpython: + CONFIG: osx_64_libprotobuf3.21python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.10.____cpython: - CONFIG: osx_arm64_python3.10.____cpython + osx_64_libprotobuf4.23.2python3.10.____cpython: + CONFIG: osx_64_libprotobuf4.23.2python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.11.____cpython: - CONFIG: osx_arm64_python3.11.____cpython + osx_64_libprotobuf4.23.2python3.11.____cpython: + CONFIG: osx_64_libprotobuf4.23.2python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_64_libprotobuf4.23.2python3.8.____cpython: + CONFIG: osx_64_libprotobuf4.23.2python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.9.____cpython: - CONFIG: osx_arm64_python3.9.____cpython + osx_64_libprotobuf4.23.2python3.9.____cpython: + CONFIG: osx_64_libprotobuf4.23.2python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf3.21python3.10.____cpython: + CONFIG: osx_arm64_libprotobuf3.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf3.21python3.11.____cpython: + CONFIG: osx_arm64_libprotobuf3.21python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf3.21python3.8.____cpython: + CONFIG: osx_arm64_libprotobuf3.21python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf3.21python3.9.____cpython: + CONFIG: osx_arm64_libprotobuf3.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf4.23.2python3.10.____cpython: + CONFIG: osx_arm64_libprotobuf4.23.2python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf4.23.2python3.11.____cpython: + CONFIG: osx_arm64_libprotobuf4.23.2python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf4.23.2python3.8.____cpython: + CONFIG: osx_arm64_libprotobuf4.23.2python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf4.23.2python3.9.____cpython: + CONFIG: osx_arm64_libprotobuf4.23.2python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index e67c2f4a..a21535d5 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,29 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython + win_64_libprotobuf3.21python3.10.____cpython: + CONFIG: win_64_libprotobuf3.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.11.____cpython: - CONFIG: win_64_python3.11.____cpython + win_64_libprotobuf3.21python3.11.____cpython: + CONFIG: win_64_libprotobuf3.21python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpython: - CONFIG: win_64_python3.8.____cpython + win_64_libprotobuf3.21python3.8.____cpython: + CONFIG: win_64_libprotobuf3.21python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython + win_64_libprotobuf3.21python3.9.____cpython: + CONFIG: win_64_libprotobuf3.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' + win_64_libprotobuf4.23.2python3.10.____cpython: + CONFIG: win_64_libprotobuf4.23.2python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_libprotobuf4.23.2python3.11.____cpython: + CONFIG: win_64_libprotobuf4.23.2python3.11.____cpython + UPLOAD_PACKAGES: 'True' + win_64_libprotobuf4.23.2python3.8.____cpython: + CONFIG: win_64_libprotobuf4.23.2python3.8.____cpython + UPLOAD_PACKAGES: 'True' + win_64_libprotobuf4.23.2python3.9.____cpython: + CONFIG: win_64_libprotobuf4.23.2python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_libprotobuf3.21python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.10.____cpython.yaml rename to .ci_support/linux_64_libprotobuf3.21python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_libprotobuf3.21python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.11.____cpython.yaml rename to .ci_support/linux_64_libprotobuf3.21python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_libprotobuf3.21python3.8.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_libprotobuf3.21python3.8.____cpython.yaml diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_libprotobuf3.21python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_libprotobuf3.21python3.9.____cpython.yaml diff --git a/.ci_support/linux_64_libprotobuf4.23.2python3.10.____cpython.yaml b/.ci_support/linux_64_libprotobuf4.23.2python3.10.____cpython.yaml new file mode 100644 index 00000000..04b1b359 --- /dev/null +++ b/.ci_support/linux_64_libprotobuf4.23.2python3.10.____cpython.yaml @@ -0,0 +1,59 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.10.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_64_libprotobuf4.23.2python3.11.____cpython.yaml b/.ci_support/linux_64_libprotobuf4.23.2python3.11.____cpython.yaml new file mode 100644 index 00000000..c5b9c519 --- /dev/null +++ b/.ci_support/linux_64_libprotobuf4.23.2python3.11.____cpython.yaml @@ -0,0 +1,59 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.11.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_64_libprotobuf4.23.2python3.8.____cpython.yaml b/.ci_support/linux_64_libprotobuf4.23.2python3.8.____cpython.yaml new file mode 100644 index 00000000..9f9ce4a3 --- /dev/null +++ b/.ci_support/linux_64_libprotobuf4.23.2python3.8.____cpython.yaml @@ -0,0 +1,59 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.8.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_64_libprotobuf4.23.2python3.9.____cpython.yaml b/.ci_support/linux_64_libprotobuf4.23.2python3.9.____cpython.yaml new file mode 100644 index 00000000..99669aa8 --- /dev/null +++ b/.ci_support/linux_64_libprotobuf4.23.2python3.9.____cpython.yaml @@ -0,0 +1,59 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.9.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_libprotobuf3.21python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_libprotobuf3.21python3.10.____cpython.yaml diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_libprotobuf3.21python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_libprotobuf3.21python3.11.____cpython.yaml diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_libprotobuf3.21python3.8.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_libprotobuf3.21python3.8.____cpython.yaml diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_libprotobuf3.21python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_libprotobuf3.21python3.9.____cpython.yaml diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2python3.10.____cpython.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2python3.10.____cpython.yaml new file mode 100644 index 00000000..321a4c8a --- /dev/null +++ b/.ci_support/linux_aarch64_libprotobuf4.23.2python3.10.____cpython.yaml @@ -0,0 +1,63 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.10.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2python3.11.____cpython.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2python3.11.____cpython.yaml new file mode 100644 index 00000000..ac65841a --- /dev/null +++ b/.ci_support/linux_aarch64_libprotobuf4.23.2python3.11.____cpython.yaml @@ -0,0 +1,63 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.11.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2python3.8.____cpython.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2python3.8.____cpython.yaml new file mode 100644 index 00000000..777f0f23 --- /dev/null +++ b/.ci_support/linux_aarch64_libprotobuf4.23.2python3.8.____cpython.yaml @@ -0,0 +1,63 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.8.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2python3.9.____cpython.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2python3.9.____cpython.yaml new file mode 100644 index 00000000..c8d9ae64 --- /dev/null +++ b/.ci_support/linux_aarch64_libprotobuf4.23.2python3.9.____cpython.yaml @@ -0,0 +1,63 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.9.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/migrations/protobuf423.yaml b/.ci_support/migrations/protobuf423.yaml new file mode 100644 index 00000000..d3a462bc --- /dev/null +++ b/.ci_support/migrations/protobuf423.yaml @@ -0,0 +1,11 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 2 +libgrpc: +- '1.54' +- '1.55' +libprotobuf: +- '3.21' +- '4.23.2' +migrator_ts: 1684932016.2362208 diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_libprotobuf3.21python3.10.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_libprotobuf3.21python3.10.____cpython.yaml diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_libprotobuf3.21python3.11.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.11.____cpython.yaml rename to .ci_support/osx_64_libprotobuf3.21python3.11.____cpython.yaml diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_libprotobuf3.21python3.8.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_libprotobuf3.21python3.8.____cpython.yaml diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_libprotobuf3.21python3.9.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_libprotobuf3.21python3.9.____cpython.yaml diff --git a/.ci_support/osx_64_libprotobuf4.23.2python3.10.____cpython.yaml b/.ci_support/osx_64_libprotobuf4.23.2python3.10.____cpython.yaml new file mode 100644 index 00000000..b7899405 --- /dev/null +++ b/.ci_support/osx_64_libprotobuf4.23.2python3.10.____cpython.yaml @@ -0,0 +1,61 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '10.15' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.10.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_libprotobuf4.23.2python3.11.____cpython.yaml b/.ci_support/osx_64_libprotobuf4.23.2python3.11.____cpython.yaml new file mode 100644 index 00000000..15889c04 --- /dev/null +++ b/.ci_support/osx_64_libprotobuf4.23.2python3.11.____cpython.yaml @@ -0,0 +1,61 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '10.15' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.11.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_libprotobuf4.23.2python3.8.____cpython.yaml b/.ci_support/osx_64_libprotobuf4.23.2python3.8.____cpython.yaml new file mode 100644 index 00000000..e4e47fcf --- /dev/null +++ b/.ci_support/osx_64_libprotobuf4.23.2python3.8.____cpython.yaml @@ -0,0 +1,61 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '10.15' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.8.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_libprotobuf4.23.2python3.9.____cpython.yaml b/.ci_support/osx_64_libprotobuf4.23.2python3.9.____cpython.yaml new file mode 100644 index 00000000..d71cb7c0 --- /dev/null +++ b/.ci_support/osx_64_libprotobuf4.23.2python3.9.____cpython.yaml @@ -0,0 +1,61 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '10.15' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.9.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_libprotobuf3.21python3.10.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.10.____cpython.yaml rename to .ci_support/osx_arm64_libprotobuf3.21python3.10.____cpython.yaml diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_libprotobuf3.21python3.11.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.11.____cpython.yaml rename to .ci_support/osx_arm64_libprotobuf3.21python3.11.____cpython.yaml diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_libprotobuf3.21python3.8.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_libprotobuf3.21python3.8.____cpython.yaml diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_libprotobuf3.21python3.9.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.9.____cpython.yaml rename to .ci_support/osx_arm64_libprotobuf3.21python3.9.____cpython.yaml diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2python3.10.____cpython.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2python3.10.____cpython.yaml new file mode 100644 index 00000000..f84314cd --- /dev/null +++ b/.ci_support/osx_arm64_libprotobuf4.23.2python3.10.____cpython.yaml @@ -0,0 +1,59 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.10.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2python3.11.____cpython.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2python3.11.____cpython.yaml new file mode 100644 index 00000000..bc32cf1c --- /dev/null +++ b/.ci_support/osx_arm64_libprotobuf4.23.2python3.11.____cpython.yaml @@ -0,0 +1,59 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.11.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2python3.8.____cpython.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2python3.8.____cpython.yaml new file mode 100644 index 00000000..48a60e3f --- /dev/null +++ b/.ci_support/osx_arm64_libprotobuf4.23.2python3.8.____cpython.yaml @@ -0,0 +1,59 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.8.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2python3.9.____cpython.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2python3.9.____cpython.yaml new file mode 100644 index 00000000..8130f3aa --- /dev/null +++ b/.ci_support/osx_arm64_libprotobuf4.23.2python3.9.____cpython.yaml @@ -0,0 +1,59 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.9.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_libprotobuf3.21python3.10.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.10.____cpython.yaml rename to .ci_support/win_64_libprotobuf3.21python3.10.____cpython.yaml diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_libprotobuf3.21python3.11.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.11.____cpython.yaml rename to .ci_support/win_64_libprotobuf3.21python3.11.____cpython.yaml diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_libprotobuf3.21python3.8.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.8.____cpython.yaml rename to .ci_support/win_64_libprotobuf3.21python3.8.____cpython.yaml diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_libprotobuf3.21python3.9.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.9.____cpython.yaml rename to .ci_support/win_64_libprotobuf3.21python3.9.____cpython.yaml diff --git a/.ci_support/win_64_libprotobuf4.23.2python3.10.____cpython.yaml b/.ci_support/win_64_libprotobuf4.23.2python3.10.____cpython.yaml new file mode 100644 index 00000000..df2618af --- /dev/null +++ b/.ci_support/win_64_libprotobuf4.23.2python3.10.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.10.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- win-64 diff --git a/.ci_support/win_64_libprotobuf4.23.2python3.11.____cpython.yaml b/.ci_support/win_64_libprotobuf4.23.2python3.11.____cpython.yaml new file mode 100644 index 00000000..1e5b0699 --- /dev/null +++ b/.ci_support/win_64_libprotobuf4.23.2python3.11.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.11.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- win-64 diff --git a/.ci_support/win_64_libprotobuf4.23.2python3.8.____cpython.yaml b/.ci_support/win_64_libprotobuf4.23.2python3.8.____cpython.yaml new file mode 100644 index 00000000..064e3339 --- /dev/null +++ b/.ci_support/win_64_libprotobuf4.23.2python3.8.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.8.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- win-64 diff --git a/.ci_support/win_64_libprotobuf4.23.2python3.9.____cpython.yaml b/.ci_support/win_64_libprotobuf4.23.2python3.9.____cpython.yaml new file mode 100644 index 00000000..39567829 --- /dev/null +++ b/.ci_support/win_64_libprotobuf4.23.2python3.9.____cpython.yaml @@ -0,0 +1,48 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +exiv2: +- '0.27' +expat: +- '2' +gdal: +- '3.7' +geos: +- 3.11.2 +gsl: +- '2.7' +icu: +- '72' +libgdal: +- '3.7' +libprotobuf: +- 4.23.2 +libspatialindex: +- 1.9.3 +libzip: +- '1' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '15' +proj: +- 9.2.0 +pyqt: +- '5.15' +python: +- 3.9.* *_cpython +qt_main: +- '5.15' +qtkeychain: +- '0.14' +sqlite: +- '3' +target_platform: +- win-64 diff --git a/README.md b/README.md index 05ee532c..6f727913 100644 --- a/README.md +++ b/README.md @@ -38,143 +38,283 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipe/0001-use-protobuf-dlls.patch b/recipe/0001-use-protobuf-dlls.patch index 3f72c391..94f5eeb7 100644 --- a/recipe/0001-use-protobuf-dlls.patch +++ b/recipe/0001-use-protobuf-dlls.patch @@ -1,27 +1,43 @@ -From f5397398a0d697bcefb10d7be589fc215f3abc6a Mon Sep 17 00:00:00 2001 -From: Ista Zahn -Date: Mon, 19 Sep 2022 06:32:25 -0400 -Subject: [PATCH] use protobuf dlls - ---- - src/core/CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 7537413..8eed55d 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -1813,6 +1813,10 @@ if (NOT MSVC) +diff -ru qgis-3.32.0-orig/CMakeLists.txt qgis-3.32.0/CMakeLists.txt +--- qgis-3.32.0-orig/CMakeLists.txt 2023-06-29 08:45:13.083130699 +1000 ++++ qgis-3.32.0/CMakeLists.txt 2023-06-29 17:57:49.676081552 +1000 +@@ -363,7 +363,16 @@ + message (SEND_ERROR "sqlite3 dependency was not found!") + endif() + +- find_package(Protobuf REQUIRED) # for decoding of vector tiles in MVT format ++ if(MSVC) ++ # for some reason on Windows we need to do this so abseil ++ # gets linked in (along with the protobuf::libprotobuf-lite change) ++ # but this breaks Unix. ++ # (see https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/4075) ++ set(protobuf_MODULE_COMPATIBLE TRUE CACHE INTERNAL "") ++ find_package(Protobuf CONFIG) ++ else() ++ find_package(Protobuf REQUIRED) # for decoding of vector tiles in MVT format ++ endif() + message(STATUS "Found Protobuf: ${Protobuf_LIBRARIES}") + if (NOT Protobuf_PROTOC_EXECUTABLE) + message (SEND_ERROR "Protobuf library's 'protoc' tool was not found!") +diff -ru qgis-3.32.0-orig/src/core/CMakeLists.txt qgis-3.32.0/src/core/CMakeLists.txt +--- qgis-3.32.0-orig/src/core/CMakeLists.txt 2023-06-29 08:45:13.555301061 +1000 ++++ qgis-3.32.0/src/core/CMakeLists.txt 2023-06-29 08:55:37.311270163 +1000 +@@ -2029,6 +2029,9 @@ set_source_files_properties(${VECTOR_TILE_PROTO_SRCS} PROPERTIES COMPILE_FLAGS -w) endif() -+if (MSVC) -+ set_source_files_properties(${VECTOR_TILE_PROTO_SRCS} vectortile/qgsvectortilemvtdecoder.cpp vectortile/qgsvectortilemvtencoder.cpp vectortile/qgsvectortilewriter.cpp PROPERTIES COMPILE_DEFINITIONS PROTOBUF_USE_DLLS) -+endif() ++# now on all platforms (see https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/4075) ++set_source_files_properties(${VECTOR_TILE_PROTO_SRCS} vectortile/qgsvectortilemvtdecoder.cpp vectortile/qgsvectortilemvtencoder.cpp vectortile/qgsvectortilewriter.cpp PROPERTIES COMPILE_DEFINITIONS PROTOBUF_USE_DLLS) + # install headers # install qgsconfig.h and plugin.h here so they can get into # the OS X framework target --- -2.37.3 - +@@ -2375,7 +2378,7 @@ + ${EXPAT_LIBRARY} + ${SQLITE3_LIBRARY} + ${LIBZIP_LIBRARY} +- ${Protobuf_LITE_LIBRARY} ++ protobuf::libprotobuf-lite + ${ZLIB_LIBRARIES} + ${EXIV2_LIBRARY} + ) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 78294319..d5c158a3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,14 +8,15 @@ source: url: https://qgis.org/downloads/qgis-{{ version }}.tar.bz2 sha256: dfc90a6103a3c6020d005dbb68c81caf9a4c11fca4be53bfe070226813f87a9a patches: - - 0001-use-protobuf-dlls.patch # [win] + # now need define on all platforms + - 0001-use-protobuf-dlls.patch - 0002-skip-dot-in-path.patch # [win] # remove when https://github.com/conda-forge/pyqt-feedstock/pull/129 merged - 0003-workaround-multi-pyqt5.patch # [win] - 0004-wrench_threads.patch build: - number: 0 + number: 1 #skip: true # [(not win) or (not py==39)] skip: true # [py2k or py<38]
VariantStatus
linux_64_python3.10.____cpythonlinux_64_libprotobuf3.21python3.10.____cpython - variant + variant
linux_64_python3.11.____cpythonlinux_64_libprotobuf3.21python3.11.____cpython - variant + variant
linux_64_python3.8.____cpythonlinux_64_libprotobuf3.21python3.8.____cpython - variant + variant
linux_64_python3.9.____cpythonlinux_64_libprotobuf3.21python3.9.____cpython - variant + variant
linux_aarch64_python3.10.____cpythonlinux_64_libprotobuf4.23.2python3.10.____cpython - variant + variant
linux_aarch64_python3.11.____cpythonlinux_64_libprotobuf4.23.2python3.11.____cpython - variant + variant
linux_aarch64_python3.8.____cpythonlinux_64_libprotobuf4.23.2python3.8.____cpython - variant + variant
linux_aarch64_python3.9.____cpythonlinux_64_libprotobuf4.23.2python3.9.____cpython - variant + variant
osx_64_python3.10.____cpythonlinux_aarch64_libprotobuf3.21python3.10.____cpython - variant + variant
osx_64_python3.11.____cpythonlinux_aarch64_libprotobuf3.21python3.11.____cpython - variant + variant
osx_64_python3.8.____cpythonlinux_aarch64_libprotobuf3.21python3.8.____cpython - variant + variant
osx_64_python3.9.____cpythonlinux_aarch64_libprotobuf3.21python3.9.____cpython - variant + variant
osx_arm64_python3.10.____cpythonlinux_aarch64_libprotobuf4.23.2python3.10.____cpython - variant + variant
osx_arm64_python3.11.____cpythonlinux_aarch64_libprotobuf4.23.2python3.11.____cpython - variant + variant
osx_arm64_python3.8.____cpythonlinux_aarch64_libprotobuf4.23.2python3.8.____cpython - variant + variant
osx_arm64_python3.9.____cpythonlinux_aarch64_libprotobuf4.23.2python3.9.____cpython - variant + variant
win_64_python3.10.____cpythonosx_64_libprotobuf3.21python3.10.____cpython - variant + variant
win_64_python3.11.____cpythonosx_64_libprotobuf3.21python3.11.____cpython - variant + variant
win_64_python3.8.____cpythonosx_64_libprotobuf3.21python3.8.____cpython - variant + variant
win_64_python3.9.____cpythonosx_64_libprotobuf3.21python3.9.____cpython - variant + variant + +
osx_64_libprotobuf4.23.2python3.10.____cpython + + variant + +
osx_64_libprotobuf4.23.2python3.11.____cpython + + variant + +
osx_64_libprotobuf4.23.2python3.8.____cpython + + variant + +
osx_64_libprotobuf4.23.2python3.9.____cpython + + variant + +
osx_arm64_libprotobuf3.21python3.10.____cpython + + variant + +
osx_arm64_libprotobuf3.21python3.11.____cpython + + variant + +
osx_arm64_libprotobuf3.21python3.8.____cpython + + variant + +
osx_arm64_libprotobuf3.21python3.9.____cpython + + variant + +
osx_arm64_libprotobuf4.23.2python3.10.____cpython + + variant + +
osx_arm64_libprotobuf4.23.2python3.11.____cpython + + variant + +
osx_arm64_libprotobuf4.23.2python3.8.____cpython + + variant + +
osx_arm64_libprotobuf4.23.2python3.9.____cpython + + variant + +
win_64_libprotobuf3.21python3.10.____cpython + + variant + +
win_64_libprotobuf3.21python3.11.____cpython + + variant + +
win_64_libprotobuf3.21python3.8.____cpython + + variant + +
win_64_libprotobuf3.21python3.9.____cpython + + variant + +
win_64_libprotobuf4.23.2python3.10.____cpython + + variant + +
win_64_libprotobuf4.23.2python3.11.____cpython + + variant + +
win_64_libprotobuf4.23.2python3.8.____cpython + + variant + +
win_64_libprotobuf4.23.2python3.9.____cpython + + variant