From b0d69befb9223b8ca013e1d0cf2a9c50f826d2c9 Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz <A.Wacknitz@gmx.de> Date: Mon, 25 Mar 2024 22:42:41 +0100 Subject: [PATCH] gnutls: update to 3.8.4 --- components/developer/cmake/patches/02-usr-local.patch | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/developer/cmake/patches/02-usr-local.patch b/components/developer/cmake/patches/02-usr-local.patch index 5330b01..9dc114b 100644 --- a/components/developer/cmake/patches/02-usr-local.patch +++ b/components/developer/cmake/patches/02-usr-local.patch @@ -69,17 +69,6 @@ list(APPEND ice_slice_suffixes "Ice-${Ice_VERSION_SLICE2CPP_FULL}/slice" "Ice-${Ice_VERSION_SLICE2CPP_SHORT}/slice" ---- cmake-3.11.3/Modules/CMakeGenericSystem.cmake.orig 2018-06-04 19:20:00.932406860 +0000 -+++ cmake-3.11.3/Modules/CMakeGenericSystem.cmake 2018-06-04 19:20:17.905182457 +0000 -@@ -163,7 +163,7 @@ - - # Choose a default install prefix for this platform. - if(CMAKE_HOST_UNIX) -- set(CMAKE_INSTALL_PREFIX "/usr/local" -+ set(CMAKE_INSTALL_PREFIX "/usr" - CACHE PATH "Install path prefix, prepended onto install directories.") - else() - GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) --- cmake-3.11.3/Modules/FindQt.cmake.orig 2018-06-04 19:13:02.531675148 +0000 +++ cmake-3.11.3/Modules/FindQt.cmake 2018-06-04 19:38:29.010903484 +0000 @@ -105,10 +105,8 @@ @@ -139,3 +128,14 @@ if(CMAKE_UNAME) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "AIX") execute_process(COMMAND ${CMAKE_UNAME} -v +--- cmake-3.29.0/Modules/CMakeGenericSystem.cmake.orig 2024-03-21 14:32:22.000000000 +0100 ++++ cmake-3.29.0/Modules/CMakeGenericSystem.cmake 2024-03-25 10:57:38.641790129 +0100 +@@ -189,7 +189,7 @@ + # If CMAKE_INSTALL_PREFIX env variable is not set, + # choose a default install prefix for this platform. + if(CMAKE_HOST_UNIX) +- set(CMAKE_INSTALL_PREFIX "/usr/local" ++ set(CMAKE_INSTALL_PREFIX "/usr" + CACHE PATH "Install path prefix, prepended onto install directories.") + else() + GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) -- Gitblit v1.9.3