diff options
Diffstat (limited to 'graphics/qgis-ltr/files')
4 files changed, 14 insertions, 160 deletions
diff --git a/graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake b/graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake index 415c694ffa28..7d3cbb86b66c 100644 --- a/graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake +++ b/graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake @@ -1,33 +1,17 @@ ---- cmake/FindGRASS.cmake.orig 2023-12-22 12:04:30 UTC +--- cmake/FindGRASS.cmake.orig 2023-10-29 01:48:21 UTC +++ cmake/FindGRASS.cmake -@@ -158,19 +158,17 @@ IF (UNIX) - ENDIF (WIN32) +@@ -159,11 +159,9 @@ IF (UNIX) IF (UNIX) -- IF (GRASS_FIND_VERSION EQUAL 7) -- IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -- FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0) -- LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR}) -- ENDFOREACH(VERSION_MINOR) -- ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -- FOREACH (PATH /usr/lib64 /usr/lib) -- FOREACH (VERSION grass76, grass74, grass72, grass70) -- LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}") -- ENDFOREACH (VERSION) -- ENDFOREACH (PATH) -- ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -- ENDIF (GRASS_FIND_VERSION EQUAL 7) -+ IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0) -+ LIST (APPEND GRASS_PATHS %%LOCALBASE%%/grass${GRASS_FIND_VERSION}${VERSION_MINOR}) -+ ENDFOREACH(VERSION_MINOR) -+ ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0) -+ FOREACH (PATH /usr/lib64 /usr/lib) -+ LIST(APPEND GRASS_PATHS "${PATH}/grass${GRASS_FIND_VERSION}${VERSION_MINOR}") -+ ENDFOREACH (PATH) -+ ENDFOREACH (VERSION_MINOR) -+ ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - ENDIF (UNIX) - - IF (APPLE) + IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +- IF (GRASS_FIND_VERSION EQUAL 7) +- FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0) +- LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR}) +- ENDFOREACH(VERSION_MINOR) +- ENDIF (GRASS_FIND_VERSION EQUAL 7) ++ FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0) ++ LIST (APPEND GRASS_PATHS %%LOCALBASE%%/grass${GRASS_FIND_VERSION}${VERSION_MINOR}) ++ ENDFOREACH(VERSION_MINOR) + ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0) + FOREACH (PATH /usr/lib64 /usr/lib) diff --git a/graphics/qgis-ltr/files/patch-cmake_FindPDAL.cmake b/graphics/qgis-ltr/files/patch-cmake_FindPDAL.cmake deleted file mode 100644 index 8e3ebf2b787e..000000000000 --- a/graphics/qgis-ltr/files/patch-cmake_FindPDAL.cmake +++ /dev/null @@ -1,83 +0,0 @@ ---- cmake/FindPDAL.cmake.orig 2024-02-22 21:12:12 UTC -+++ cmake/FindPDAL.cmake -@@ -7,8 +7,7 @@ - # CMake module to search for PDAL library - # - # If it's found it sets PDAL_FOUND to TRUE --# and following variables are set: --# PDAL_INCLUDE_DIR -+# and adds the following variable containing library target(s): - # PDAL_LIBRARIES - - # FIND_PATH and FIND_LIBRARY normally search standard locations -@@ -18,6 +17,28 @@ - # locations. When an earlier FIND_* succeeds, subsequent FIND_*s - # searching for the same item do nothing. - -+find_package(PDAL CONFIG) -+ -+if(PDAL_FOUND) -+ if(NOT PDAL_FIND_QUIETLY) -+ message(STATUS "Found PDAL: ${PDAL_LIBRARIES} (${PDAL_VERSION})") -+ endif() -+ -+ if(PDAL_VERSION VERSION_LESS "1.7.0") -+ message(FATAL_ERROR "PDAL version is too old (${PDAL_VERSION}). Use 1.7 or higher.") -+ endif() -+ -+ if(MSVC) -+ foreach(PDAL_TARG ${PDAL_LIBRARIES}) -+ target_compile_definitions(${PDAL_TARG} INTERFACE WIN32_LEAN_AND_MEAN) -+ endforeach() -+ endif() -+ -+ return() -+endif() -+ -+# Fallback for systems where PDAL's config-file package is not present. -+# It is not adapted for PDAL 2.6+ (where pdal_util library is removed). - FIND_PATH(PDAL_INCLUDE_DIR pdal/pdal.hpp - "$ENV{LIB_DIR}/include" - "/usr/include" -@@ -50,7 +71,7 @@ IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTI - - IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN) - SET(PDAL_FOUND TRUE) -- SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY} ${PDAL_UTIL_LIBRARY}) -+ SET(PDAL_LIBRARIES pdalcpp pdal_util) - ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN) - - IF (PDAL_FOUND) -@@ -60,8 +81,8 @@ IF (PDAL_FOUND) - OUTPUT_VARIABLE PDAL_VERSION_OUT ) - STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\1" PDAL_VERSION_MAJOR "${PDAL_VERSION_OUT}") - STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\2" PDAL_VERSION_MINOR "${PDAL_VERSION_OUT}") -- STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\3" PDAL_VERSION_MICRO "${PDAL_VERSION_OUT}") -- STRING(CONCAT PDAL_VERSION ${PDAL_VERSION_MAJOR} "." ${PDAL_VERSION_MINOR} "." ${PDAL_VERSION_MICRO}) -+ STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\3" PDAL_VERSION_PATCH "${PDAL_VERSION_OUT}") -+ STRING(CONCAT PDAL_VERSION ${PDAL_VERSION_MAJOR} "." ${PDAL_VERSION_MINOR} "." ${PDAL_VERSION_PATCH}) - - IF (NOT PDAL_FIND_QUIETLY) - MESSAGE(STATUS "Found PDAL: ${PDAL_LIBRARIES} (${PDAL_VERSION})") -@@ -70,6 +91,21 @@ IF (PDAL_FOUND) - IF ((PDAL_VERSION_MAJOR EQUAL 1) AND (PDAL_VERSION_MINOR LESS 7)) - MESSAGE (FATAL_ERROR "PDAL version is too old (${PDAL_VERSION}). Use 1.7 or higher.") - ENDIF() -+ -+ add_library(pdalcpp UNKNOWN IMPORTED) -+ target_link_libraries(pdalcpp INTERFACE ${PDAL_CPP_LIBRARY}) -+ target_include_directories(pdalcpp INTERFACE ${PDAL_INCLUDE_DIR}) -+ set_target_properties(pdalcpp PROPERTIES IMPORTED_LOCATION ${PDAL_CPP_LIBRARY}) -+ -+ add_library(pdal_util UNKNOWN IMPORTED) -+ target_link_libraries(pdal_util INTERFACE ${PDAL_UTIL_LIBRARY}) -+ target_include_directories(pdal_util INTERFACE ${PDAL_INCLUDE_DIR}) -+ set_target_properties(pdal_util PROPERTIES IMPORTED_LOCATION ${PDAL_UTIL_LIBRARY}) -+ -+ if(MSVC) -+ target_compile_definitions(pdalcpp INTERFACE WIN32_LEAN_AND_MEAN) -+ target_compile_definitions(pdal_util INTERFACE WIN32_LEAN_AND_MEAN) -+ endif() - - ELSE (PDAL_FOUND) - IF (PDAL_FIND_REQUIRED) diff --git a/graphics/qgis-ltr/files/patch-python_plugins_sagaprovider_SagaAlgorithmProvider.py b/graphics/qgis-ltr/files/patch-python_plugins_sagaprovider_SagaAlgorithmProvider.py deleted file mode 100644 index bd193d00865d..000000000000 --- a/graphics/qgis-ltr/files/patch-python_plugins_sagaprovider_SagaAlgorithmProvider.py +++ /dev/null @@ -1,27 +0,0 @@ ---- python/plugins/sagaprovider/SagaAlgorithmProvider.py.orig 2021-06-21 15:09:09 UTC -+++ python/plugins/sagaprovider/SagaAlgorithmProvider.py -@@ -78,13 +78,13 @@ class SagaAlgorithmProvider(QgsProcessingProvider): - version is not None - and ( - version.startswith(REQUIRED_VERSION) -- or version.startswith(BETA_SUPPORT_VERSION) -+ or version >= BETA_SUPPORT_VERSION - ) - ) - - def warningMessage(self): - version = SagaUtils.getInstalledVersion(True) -- if version is not None and version.startswith(BETA_SUPPORT_VERSION): -+ if version is not None and version >= BETA_SUPPORT_VERSION: - return self.tr('SAGA version {} is not officially supported - algorithms may encounter issues').format(version) - return '' - -@@ -95,7 +95,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): - self.tr('Processing'), Qgis.Critical) - return - -- if not version.startswith(REQUIRED_VERSION) and not version.startswith(BETA_SUPPORT_VERSION): -+ if not version.startswith(REQUIRED_VERSION) and not version >= BETA_SUPPORT_VERSION: - QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION), - self.tr('Processing'), - Qgis.Critical) diff --git a/graphics/qgis-ltr/files/patch-src_core_raster_qgsexiftools.cpp b/graphics/qgis-ltr/files/patch-src_core_raster_qgsexiftools.cpp deleted file mode 100644 index 1abd7207b853..000000000000 --- a/graphics/qgis-ltr/files/patch-src_core_raster_qgsexiftools.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/core/raster/qgsexiftools.cpp.orig 2023-05-26 12:01:31 UTC -+++ src/core/raster/qgsexiftools.cpp -@@ -94,7 +94,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex - case Exiv2::signedLong: - case Exiv2::unsignedLongLong: - case Exiv2::signedLongLong: -- val = QVariant::fromValue( it->toLong() ); -+ val = QVariant::fromValue( it->toInt64() ); - break; - - case Exiv2::tiffDouble: -@@ -108,7 +108,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex - case Exiv2::signedByte: - case Exiv2::tiffIfd: - case Exiv2::tiffIfd8: -- val = QVariant::fromValue( static_cast< int >( it->toLong() ) ); -+ val = QVariant::fromValue( static_cast< int >( it->toInt64() ) ); - break; - - case Exiv2::date: |