Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update QGIS to the 3.34 branch #4744

Merged
merged 1 commit into from
Nov 10, 2023
Merged

Update QGIS to the 3.34 branch #4744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmake/qgis-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ if(TRUE) # Should possibly have a "static only" check

_qgis_core_add_dependency(GDAL::GDAL GDAL)

_qgis_core_add_dependency(draco::draco draco)
_qgis_core_add_dependency(exiv2lib exiv2)
_qgis_core_add_dependency(exiv2-xmp exiv2)
_qgis_core_add_dependency(libzip::zip libzip)
Expand Down
13 changes: 0 additions & 13 deletions vcpkg/overlay/qgis-qt6/auth_awss3_qt66.patch
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions vcpkg/overlay/qgis-qt6/exif_orientation_fix.patch
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions vcpkg/overlay/qgis-qt6/exiv2-0.28.patch
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions vcpkg/overlay/qgis-qt6/gdal.patch
View file
Open in desktop

This file was deleted.

90 changes: 0 additions & 90 deletions vcpkg/overlay/qgis-qt6/layout_fix.patch
View file
Open in desktop

This file was deleted.

17 changes: 3 additions & 14 deletions vcpkg/overlay/qgis-qt6/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(QGIS_REF final-3_32_2)
set(QGIS_SHA512 689d6b17166fe5c91f91c801b93f384e9539f56708cf90aa8dda93bc3b69005ccc279e1a82b4a850116c34851989afe71f17acdbe468dbc0814c7e3003538180)
set(QGIS_REF 664a8cfb8dc2ed756c81eee36e1f5d59556d94fa)
set(QGIS_SHA512 81023a824c6063fd653c2d737cf7257fa3d3ccb857df63ab84e8f6fd528785fb308e7a63f0dac877622b8ad24f7a21ecf4d0e9b87640dd655033357c86b0b44b)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
Expand All @@ -10,25 +10,13 @@ vcpkg_from_github(
PATCHES
# Make qgis support python's debug library
qgspython.patch
gdal.patch
keychain.patch
libxml2.patch
exiv2.patch
crssync.patch
bigobj.patch
poly2tri.patch
mesh.patch
project_load.patch
vectortilelabels.patch # Remove when updating to QGIS 3.34
version.patch # Remove when updating to QGIS 3.34
snapping_properties.patch # Remove when updating to QGIS 3.34
exiv2-0.28.patch # Remove when updating to QGIS 3.34
profiler.patch # Remove when updating to QGIS 3.34
exif_orientation_fix.patch # Remove when updating to QGIS 3.34.1
layout_fix.patch # Remove when updating to QGIS 3.34
qsharedmemory_android.patch # Qt 6.6 removed dummy QSharedMemory implementation on Android
wcs_capabilities_qt66.patch # Qt 6.6 compilation fix
auth_awss3_qt66.patch # Qt 6.6 compilation fix
)

file(REMOVE ${SOURCE_PATH}/cmake/FindQtKeychain.cmake)
Expand All @@ -48,6 +36,7 @@ list(APPEND QGIS_OPTIONS "-DWITH_GRASS7:BOOL=OFF")
list(APPEND QGIS_OPTIONS "-DWITH_SPATIALITE:BOOL=ON")
list(APPEND QGIS_OPTIONS "-DWITH_QSPATIALITE:BOOL=OFF")
list(APPEND QGIS_OPTIONS "-DWITH_PDAL:BOOL=OFF")
list(APPEND QGIS_OPTIONS "-DWITH_DRACO:BOOL=ON")

list(APPEND QGIS_OPTIONS "-DBISON_EXECUTABLE=${BISON}")
list(APPEND QGIS_OPTIONS "-DFLEX_EXECUTABLE=${FLEX}")
Expand Down
Loading
Loading