diff --git a/srcpkgs/proj/patches/fix-cmake-deps.patch b/srcpkgs/proj/patches/fix-cmake-deps.patch new file mode 100644 index 00000000000..2569f835090 --- /dev/null +++ b/srcpkgs/proj/patches/fix-cmake-deps.patch @@ -0,0 +1,33 @@ +--- a/cmake/project-config.cmake.in ++++ b/cmake/project-config.cmake.in +@@ -19,30 +19,6 @@ include(CMakeFindDependencyMacro) + # Cf https://gitlab.kitware.com/cmake/cmake/-/issues/17612 + cmake_policy(PUSH) + cmake_policy(SET CMP0012 NEW) +-if("@ENABLE_TIFF@") +- set(PROJ_CONFIG_FIND_TIFF_DEP ON) +-endif() +-if("@CURL_ENABLED@") +- set(PROJ_CONFIG_FIND_CURL_DEP ON) +-endif() +-cmake_policy(POP) +- +-if(DEFINED PROJ_CONFIG_FIND_TIFF_DEP) +- find_dependency(TIFF) +-endif() +- +-if(DEFINED PROJ_CONFIG_FIND_CURL_DEP) +- # Chainload CURL usage requirements +- find_dependency(CURL) +- # Target CURL::libcurl only defined since CMake 3.12 +- if(NOT TARGET CURL::libcurl) +- add_library(CURL::libcurl INTERFACE IMPORTED) +- set_target_properties(CURL::libcurl PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}" +- INTERFACE_LINK_LIBRARIES "${CURL_LIBRARIES}" +- ) +- endif() +-endif() + + function(set_variable_from_rel_or_absolute_path var root rel_or_abs_path) + if(IS_ABSOLUTE "${rel_or_abs_path}") diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template index 50fd8fc17b9..9578c782001 100644 --- a/srcpkgs/proj/template +++ b/srcpkgs/proj/template @@ -1,7 +1,7 @@ # Template file for 'proj' pkgname=proj version=9.2.1 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="python3" @@ -18,7 +18,7 @@ post_install() { } proj-devel_package() { - depends="${sourcepkg}-${version}_${revision} libcurl-devel" + depends="${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include