gentoo auto-resync : 12:02:2023 - 09:56:54

3 files changed, 37 insertions, 1 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 08f9eb991b7c..043d728352fa 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,8 +1,9 @@
 AUX nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch 1640 BLAKE2B de9db48474db68effda44643d102f68435eb907a450a1b674db8059f84c40bb47fd428fc08979ccddec3610a46d907d232da5bd3ad035c2628df6ef8ad9fc46b SHA512 40e40b93b71d9236b325527a63c96a52cc05b10032911faacc3e2c33bd9d990b911a4c783b99b7ba91d95ee54a6945132dd1b93ea7a5d4f041783eecd6accd89
+AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a1206a0a0027aa9c59e07b6d81174428aaaf90fba5706e9c7a2f076753a4b2f364ffa0f22dabf785d58832dde1aeba61e3cb3cc92feffa8b4b614c5d65 SHA512 808c10f8ea1905d54f62f895b2089c2acb602e838143f6a4268a5ab1e966ffe6ff01f132b8b65e0eebde21435a859cc7fb4f868a2ca81da4dcaa02292a337ed7
 DIST nextcloud-client-3.6.1.tar.gz 15346135 BLAKE2B 116a2632ad1c653bb1dbf184c6156ebc469ed8c0bfe209282e8239d4113c46b761f4049daa6833d23d5179c0b2a3f9dd94f506e63c401775da419c92104a069f SHA512 444062440570efd82b8cd9acf85dcc5826552c86c31edc19ae2f87d9fdf23afa501aac03e4b8135bb037feb523fdcbc230339387acbf56c0ca6e5df3e7bae583
 DIST nextcloud-client-3.6.4.tar.gz 15451930 BLAKE2B 47b379513927d0f7fa20d41be67f75196ffbae6318d947d759f69d9561e27641d71e9a0accd197673f995d4aab90fa30dd1f1faa4dee446545f586ca28599cff SHA512 7a9378e78e1e678e72898d1cca2188ba9f5488f565c72db49d70e9d3d6d8124c8fae7856226fb3b47edcb37cacaadc8f0fbc5ff3b6914e4ebb777a4ebd633513
 DIST nextcloud-client-3.6.6.tar.gz 15497450 BLAKE2B 904f6f2a71a8c556fb4b9cb3710d09fff9888a7ea7c923d6dd7b42bd69bb2900a63525e5331bba893cb92663be7bdeaa228047a7af28bb3cdde7edb64f342c6c SHA512 b9fe96f9f8ac70c4c586b58f1b460e293d73e979d6b849d232112c7601463fd48608e8a093f3a8b0c2dc5a417e20e8aff3c2c3582eb7bce0fcb9f15e3d909327
 EBUILD nextcloud-client-3.6.1-r1.ebuild 2459 BLAKE2B 21080df548cb532e266696205edf08892909d66b4d5c2998f97455d1220189b542260e90598ae890a51db40ea744e1f815d34ac0f854f03cf9ed134c6b43bcc3 SHA512 c613b5733b2d21e9916cb69c76915ed5c29bb65128bf2a010b06227e57d19ea88e3dcaf29a34ecf8f82b3365c060e207f73a23b3a9351883385463e05633cc91
 EBUILD nextcloud-client-3.6.4-r3.ebuild 2511 BLAKE2B a54abc08d7664c5bbdd35de19bc11a5a3207296163c7ac1cfbdbe2bcc807e567878c019503f6c7613cc874b0157c14e95930c5445106ddeb6d7e7d0cbf446e88 SHA512 90800d9c2dc4166a40429506c726fd49dda2130667ce9a4b3ba20b96fefbcae0c5af03238f13b5152e546fa4ec46566229eb2d7be3f43410b06625d3a66abb91
-EBUILD nextcloud-client-3.6.6.ebuild 2376 BLAKE2B c624f33ac65d2563da07b05e9cedf3a445197d9c1d401d4ceaa4601a189d797d7923315acfccd0d7c494e3ae80a3e18b0ee71c0332ed3ab8eeb9bf252b500ccf SHA512 1b16c4fe364b0edbce2da25d5ce52c9dc4e86dd7ec8dd164c56e9adc5bff0726070bf8dccb97f4cf35cdf7d868804fade2dced84d0f2f23f3777e8582622a462
+EBUILD nextcloud-client-3.6.6.ebuild 2449 BLAKE2B 3903c3b5c3347748cdb3c150a7555a00fe243ca1ac1eea9f54bd4db1029a25b2c901298f237cc1bb2538ad98e9d5c5478516bb6cf00cec2af2bfb38800d103be SHA512 45fde1f02621f56962c86346a383d1c41d52cb91cca52b91efe287d3c5b58f9a33c18a41584468e7b66f3d6f884c0c600a0b50ce1af61b46cbd01ff7cd836cea
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch
new file mode 100644
index 000000000000..2c3d23c1ff35
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch
@@ -0,0 +1,31 @@
+Gentoo's toolchain always sets F_S (level 2 at minimum) by default.
+
+https://bugs.gentoo.org/890072
+--- a/cmake/modules/DefineCompilerFlags.cmake
++++ b/cmake/modules/DefineCompilerFlags.cmake
+@@ -47,12 +47,6 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+ 
+     if (CMAKE_BUILD_TYPE)
+         string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+-        if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND (NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]"))
+-            check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
+-            if (WITH_FORTIFY_SOURCE)
+-                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+-            endif (WITH_FORTIFY_SOURCE)
+-        endif()
+     endif()
+ endif (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -31,10 +31,6 @@ if(NOT MSVC)
+   endif()
+ 
+   string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+-  if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND ((NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]") AND (NOT ${CMAKE_CXX_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]")))
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
+-  endif()
+ 
+   if (CMAKE_CXX_COMPILER MATCHES "Clang")
+     # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
index 8496954d4804..943bb9b77797 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
@@ -61,6 +61,10 @@ BDEPEND="
 	dolphin? ( kde-frameworks/extra-cmake-modules )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+)
+
 src_prepare() {
 	# Keep tests in ${T}
 	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die