gentoo auto-resync : 23:02:2023 - 09:44:00

3 files changed, 31 insertions, 4 deletions

diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 46f9c6a5c513..2cfde7ec3339 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,8 @@
 AUX owncloud-client-3.1.0.9872-no_cmake_fetch.patch 893 BLAKE2B ae76eca7b84cb04147d7f38ab9a3b3029805267508dce721437f14722fe39e14ebc5e9a3e91efb68553ebcd21da622aec135a528d4892660d8d10be08b6a8d57 SHA512 e8a89809aea2ebbf39a7b7f8df0258b7d7f1f3fd7698fc0ec9e6269c20ab9dec744caef230fa5d7a850a0887938193014b29a583ac0bdfc311b3cff5ea482028
+AUX owncloud-client-3.2.0.10193-no_fortify_override.patch 683 BLAKE2B e235c7c80e1907f5d546ba2e27ab3c8317deedc846f290a060e35f182e1081a704dd84ccafe3da47098c239b077d9ee7b715269ce2aeb60a87bc7caa94d68cf9 SHA512 e7091d32a9cb933eca87b72f16478340f82217e564a9e57a5114ee5ec244dd888ca1992efcdddab1e6d11e28d32e7286c73021aba3f4988c37cb18af0926799a
 DIST libregraphapi-1.0.1.tar.gz 105266 BLAKE2B b5122ca5bb757c58bba0f29eaf119685c0ed119a9a72951f4098d8180e5bf05332b36fa6c884ca29b0414051c9c6d6ca081e3c7eeb7b9810202f11c1a70c5190 SHA512 aaa710642c36b4038dc61e7df4fc904a82a2ab6c34da03c3f5328075e41ab319f6616866b7f9ae472ff256b421751f8f5ce7ce0a6d3451bda75cfa3b307df082
-DIST ownCloud-2.11.1.8946.tar.xz 5654496 BLAKE2B 6b5b82730460071ae590b35d653824f4e56d506d87929c5d4ebb31eef921d0cb0141a44d7f0c996b8d1afffa5874d3e4dda75feaba740e652df2939633475fcd SHA512 b44f72e22c539a731901d9c146f00edbf0a4dabb992d6cde06be1b50506d5bc4a8aa861c6ea0207eed72aaea8c8af8651ce07f9e9154e6e44ccdecdd27e35b75
 DIST ownCloud-3.1.0.9872.tar.xz 5682584 BLAKE2B 174ffd7d441883f61817a6ab63decdd0238b9eb05d4e9cf0d5d18e69e6d2b08ad7836f7396383888f6f7d2f0d1be740c58413cd876780dba12446c6918921a47 SHA512 ca64af7c6ece1f26778a58088fcceaa68cddf1856ad7f1f5f24ee85691c813aed58339690ded1d0c535c131b2cf0343a03fe53289914bf36fa5ad4034f223b3e
-EBUILD owncloud-client-2.11.1.8946.ebuild 1471 BLAKE2B 8b0bebeef3dff9609718def2874b50fc5b9dfc35dbf23566795e691adfc303f2a36e2aae339efc29a410816bd8c436cde16895e1da1076d5f8caffa964e54953 SHA512 7b0ee28e36695a373a029aad89d40c8eef5e0cc1cac3325e9f862bcb69effc1809d76258d4f6314c3bea72231c3b177233918e8c88f73a829f3e599170dabe2e
+DIST ownCloud-3.2.0.10193.tar.xz 5686248 BLAKE2B 8589c05a373b76dc87b3269395a46cfc9f433eeaa9b0498f6df50b8c400cc14dd3e64926aa050efed3a2f7e1a1e06f776208652655119e0705dd97de13020291 SHA512 0910769b3e2226ab11525f2d503d18c146380822e9d322c87150b13babd76325647207b2979dfc1f2efe71d34106bcb14eb459d076412cf402eda01854cfa8e8
 EBUILD owncloud-client-3.1.0.9872.ebuild 1802 BLAKE2B 837d23e145b33fa51dfae3aeec7c697aa43dd0810168e74671ef5b10caed01bf9f9596fef58048b5c342f7baba297e45ba563a17a8318f48c81568983c8b0a45 SHA512 3f5698e9d8a8829cf24e9d97a19eb61c7a6808d83e64b058cb8bef6a0f16d97092b1f33029c31f7fc48e064112db6086fb119871c9a1fac612be5893af3b6ea0
+EBUILD owncloud-client-3.2.0.10193.ebuild 1862 BLAKE2B bb4c5b6219cfbbb097eb07a14bbc7560e31e9489357ffdd4edeb2778416d07e9cf582cef0959f868678d34e8e8e18689a06123523f1d10e7f0432438af5bdca3 SHA512 52cbde798c54d324a42fbea7db22f5f924707751ed12a09c82ae0b0e6c39d03e10f42f6a1c36dd35510b737fbae5216c4627b370bd0c8406e945621e69458928
 MISC metadata.xml 432 BLAKE2B 1009c05cb07872e37fa6f8113a0586840454e09e07a8c7c40c9c4f879577e3ba1d36a7832f0789ae77fe8b882f9ccc8d2346de40c13ea77cc1404e78e8b15e6d SHA512 9f1c221258a82d7b1e6311b51cdbd5a72ff9cf4c80fdc075b3219581cd008a6a83f4066868f014ed33640bbfad68a4f4504cd9efb65119dcd176d34dc07e6ee9
diff --git a/net-misc/owncloud-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch b/net-misc/owncloud-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch
new file mode 100644
index 000000000000..266596b7bd54
--- /dev/null
+++ b/net-misc/owncloud-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch
@@ -0,0 +1,16 @@
+diff -Naur ownCloud-3.2.0.10193.orig/src/CMakeLists.txt ownCloud-3.2.0.10193/src/CMakeLists.txt
+--- ownCloud-3.2.0.10193.orig/src/CMakeLists.txt	2023-02-15 18:27:55.000000000 +0100
++++ ownCloud-3.2.0.10193/src/CMakeLists.txt	2023-02-22 22:55:29.352847663 +0100
+@@ -16,12 +16,6 @@
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+     endif()
+   endif()
+-
+-  string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+-  if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
+-  endif()
+ endif()
+ 
+ if(WIN32)
diff --git a/net-misc/owncloud-client/owncloud-client-2.11.1.8946.ebuild b/net-misc/owncloud-client/owncloud-client-3.2.0.10193.ebuild
index ef87f857f8d3..f97d3b64e42c 100644
--- a/net-misc/owncloud-client/owncloud-client-2.11.1.8946.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-3.2.0.10193.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,9 +6,12 @@ EAPI=8
 inherit cmake xdg
 
 MY_PN="ownCloud"
+REGRAPHAPI_PV="1.0.1"
 DESCRIPTION="Synchronize files from ownCloud Server with your computer"
 HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
+SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz
+	https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/refs/tags/v${REGRAPHAPI_PV}.tar.gz
+		-> libregraphapi-${REGRAPHAPI_PV}.tar.gz"
 S=${WORKDIR}/${MY_PN}-${PV}
 
 LICENSE="CC-BY-3.0 GPL-2"
@@ -44,7 +47,14 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 	kde-frameworks/extra-cmake-modules"
 
+PATCHES=( "${FILESDIR}"/${PN}-3.1.0.9872-no_cmake_fetch.patch
+	"${FILESDIR}"/${PN}-3.2.0.10193-no_fortify_override.patch
+	)
+
 src_prepare() {
+	mv ../libre-graph-api-cpp-qt-client-${REGRAPHAPI_PV} \
+		src/libsync/libregraphapisrc-src || die
+
 	# Keep tests in ${T}
 	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die