summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2023-02-01 19:08:57 +0100
committerBernard Cafarelli <voyageur@gentoo.org>2023-02-01 19:10:31 +0100
commit87019ef29c52e9de8029d0f2d58345c68bce52ee (patch)
tree91b67203389a153fecc3e9bf096b29f644c76693 /net-misc/owncloud-client
parentx11-themes/gtk-engines-adwaita: Add remote-id (diff)
downloadgentoo-87019ef29c52e9de8029d0f2d58345c68bce52ee.tar.gz
gentoo-87019ef29c52e9de8029d0f2d58345c68bce52ee.tar.bz2
gentoo-87019ef29c52e9de8029d0f2d58345c68bce52ee.zip
net-misc/owncloud-client: do not git fetch extra files in cmake
Closes: https://bugs.gentoo.org/892798 Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
Diffstat (limited to 'net-misc/owncloud-client')
-rw-r--r--net-misc/owncloud-client/Manifest1
-rw-r--r--net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch17
-rw-r--r--net-misc/owncloud-client/owncloud-client-3.1.0.9872.ebuild10
3 files changed, 27 insertions, 1 deletions
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 719551d3da8f..625b31b00f80 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,2 +1,3 @@
+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
diff --git a/net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch b/net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch
new file mode 100644
index 000000000000..d9762292e881
--- /dev/null
+++ b/net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch
@@ -0,0 +1,17 @@
+Index: ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt
+--- ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt.orig
++++ ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt
+@@ -3,12 +3,7 @@ set(LibreGraphAPIVersion v0.13.2)
+ find_package(LibreGraphAPI QUIET)
+ if (NOT TARGET OpenAPI::LibreGraphAPI)
+ message(WARNING "Failed to find system OpenAPI::LibreGraphAPI: fetching ${LibreGraphAPIVersion}")
+- include(FetchContent)
+- FetchContent_Populate(LibreGraphAPISrc
+- QUIET
+- GIT_REPOSITORY https://github.com/owncloud/libre-graph-api-cpp-qt-client.git
+- GIT_TAG ${LibreGraphAPIVersion})
+- add_subdirectory(${libregraphapisrc_SOURCE_DIR}/client ${libregraphapisrc_BINARY_DIR}/client EXCLUDE_FROM_ALL)
++ add_subdirectory(libregraphapisrc-src/client libregraphapisrc-src/client EXCLUDE_FROM_ALL)
+ endif()
+
+ set(libsync_SRCS
diff --git a/net-misc/owncloud-client/owncloud-client-3.1.0.9872.ebuild b/net-misc/owncloud-client/owncloud-client-3.1.0.9872.ebuild
index 1eed40954de2..76e9098aa16a 100644
--- a/net-misc/owncloud-client/owncloud-client-3.1.0.9872.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-3.1.0.9872.ebuild
@@ -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,12 @@ BDEPEND="
dev-qt/linguist-tools:5
kde-frameworks/extra-cmake-modules"
+PATCHES=( "${FILESDIR}"/${PN}-3.1.0.9872-no_cmake_fetch.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