diff options
author | Oliver Freyermuth <o.freyermuth@googlemail.com> | 2023-06-26 19:30:44 +0200 |
---|---|---|
committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2023-06-26 19:39:09 +0200 |
commit | f4c276075ea102834dbe7946552089ae300c97f3 (patch) | |
tree | 1dd2398e2e6c3ae28af318d04e185ebf09a62b50 /net-misc | |
parent | dev-python/pybind11-stubgen: add py3.11 (diff) | |
download | sci-f4c276075ea102834dbe7946552089ae300c97f3.tar.gz sci-f4c276075ea102834dbe7946552089ae300c97f3.tar.bz2 sci-f4c276075ea102834dbe7946552089ae300c97f3.zip |
net-misc/cernbox-client: add 3.2.0.10193
Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com>
Closes: https://github.com/gentoo/sci/pull/1196
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'net-misc')
6 files changed, 204 insertions, 1 deletions
diff --git a/net-misc/cernbox-client/Manifest b/net-misc/cernbox-client/Manifest index 272a624dd..c4991bc83 100644 --- a/net-misc/cernbox-client/Manifest +++ b/net-misc/cernbox-client/Manifest @@ -1,2 +1,5 @@ DIST cernbox-client-2.9.2-6339.src.rpm 6243132 BLAKE2B c73c3c338f9d3fb7fa7b22efe9b6ff1380d80f3804e2e732873f5804ed31d98fb04f9dbcdc0f614136c08081bea825d70948f94a6c0c9dddfe20eca66e41c4c1 SHA512 ec0edff177a5b77144eef173e4e3f5d549762faa6682618124f5c64e37f657c3aa00f639723cf2c48b6c4d1049373cd24b41d347cd9bf3c7bb291ab3340d6b2a +DIST cernbox-client-3.2.1-10562.src.rpm 6224824 BLAKE2B 43059724f0ed48304b79c38c08f076aca3cae46e8de69ac0ab01b21a33caa94e1cefb4b678c7e819f2d5f68e33b0f32bc36178a066b007f0d50d17fe0502ccea SHA512 997d6f757ed3f3c966795704fc9daf232a12a28a6dd81f2b750c62cce3d3daf57f36e89b946338bc6344e643fe6c0dccc3c2104e839c400d418164f03f96d1f4 +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.2.0.10193.tar.xz 5686248 BLAKE2B 8589c05a373b76dc87b3269395a46cfc9f433eeaa9b0498f6df50b8c400cc14dd3e64926aa050efed3a2f7e1a1e06f776208652655119e0705dd97de13020291 SHA512 0910769b3e2226ab11525f2d503d18c146380822e9d322c87150b13babd76325647207b2979dfc1f2efe71d34106bcb14eb459d076412cf402eda01854cfa8e8 diff --git a/net-misc/cernbox-client/cernbox-client-3.2.0.10193.ebuild b/net-misc/cernbox-client/cernbox-client-3.2.0.10193.ebuild new file mode 100644 index 000000000..476c2838e --- /dev/null +++ b/net-misc/cernbox-client/cernbox-client-3.2.0.10193.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake rpm xdg + +DESCRIPTION="Synchronize files from CERNBox EOS with your computer" + +# Origin is classic owncloud-client, branded for CERN during compilation. +ORIGIN_PN="ownCloud" +BRANDED_P="cernbox" +BRANDED_PV="3.2.1" +BRANDED_REL="10562" +REGRAPHAPI_PV="1.0.1" +HOMEPAGE="https://cernbox.cern.ch/" +SRC_URI="https://download.owncloud.com/desktop/${ORIGIN_PN}/stable/${PV}/source/${ORIGIN_PN}-${PV}.tar.xz + https://cernboxdistr.web.cern.ch/cernboxdistr/Linux/repo.future/Fedora_37/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm + https://cern.ch/ofreyerm/gentoo/cernbox/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm + https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/refs/tags/v${REGRAPHAPI_PV}.tar.gz + -> libregraphapi-${REGRAPHAPI_PV}.tar.gz" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dolphin keyring nautilus test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-db/sqlite-3.4:3 + dev-libs/qtkeychain[keyring?,qt5(+)] + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sys-fs/inotify-tools + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python )" + +DEPEND="${RDEPEND} + test? ( + dev-util/cmocka + dev-qt/qttest:5 + )" + +BDEPEND=" + dev-qt/linguist-tools:5 + kde-frameworks/extra-cmake-modules" + +S=${WORKDIR}/${ORIGIN_PN}-${PV} + +src_unpack() { + rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm || die "failed to extract branding RPM" + mv ${PN%-*}-${BRANDED_PV}.${BRANDED_REL}/branding "${S}" || die "failed to extract branding" +} + +PATCHES=( + "${FILESDIR}"/owncloud-client-3.1.0.9872-no_cmake_fetch.patch + "${FILESDIR}"/owncloud-client-3.2.0.10193-no_fortify_override.patch + "${FILESDIR}"/owncloud-client-3.2.0.10193-fix-mirall.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 + + if ! use nautilus; then + pushd shell_integration > /dev/null || die + cmake_comment_add_subdirectory nautilus + popd > /dev/null || die + fi + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} diff --git a/net-misc/cernbox-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch b/net-misc/cernbox-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch new file mode 100644 index 000000000..d9762292e --- /dev/null +++ b/net-misc/cernbox-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/cernbox-client/files/owncloud-client-3.2.0.10193-fix-mirall.patch b/net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-fix-mirall.patch new file mode 100644 index 000000000..f276d232e --- /dev/null +++ b/net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-fix-mirall.patch @@ -0,0 +1,73 @@ +From: Fabian Müller <fmueller@owncloud.com> +Bug: https://github.com/owncloud/client/pull/10969 + +Fix installation of branded client in parallel to unbranded client. + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9b33b555f..f6c8ddd5c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -52,10 +52,12 @@ endif(NOT BUILD_LIBRARIES_ONLY) + + add_subdirectory(plugins) + +-install(EXPORT ownCloudConfig DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/ownCloud" NAMESPACE ownCloud::) ++install(EXPORT ${APPLICATION_SHORTNAME}Config DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/${APPLICATION_SHORTNAME}" NAMESPACE ownCloud::) + +-ecm_setup_version(PROJECT VARIABLE_PREFIX ownCloud +- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/ownCloudConfigVersion.cmake" +- SOVERSION ${MIRALL_SOVERSION}) ++ecm_setup_version(PROJECT ++ VARIABLE_PREFIX ${APPLICATION_SHORTNAME} ++ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}ConfigVersion.cmake" ++ SOVERSION ${MIRALL_SOVERSION} ++) + +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ownCloudConfigVersion.cmake" DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/ownCloud") ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}ConfigVersion.cmake" DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/${APPLICATION_SHORTNAME}") +diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt +index 17bbec855..eec545c21 100644 +--- a/src/csync/CMakeLists.txt ++++ b/src/csync/CMakeLists.txt +@@ -92,10 +92,10 @@ INSTALL( + ../common/filesystembase.h + ../common/utility.h + DESTINATION +- ${INCLUDE_INSTALL_DIR}/ownCloud/common ++ ${INCLUDE_INSTALL_DIR}/${APPLICATION_SHORTNAME}/common + ) + +-INSTALL(TARGETS csync EXPORT ownCloudConfig ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ++INSTALL(TARGETS csync EXPORT ${APPLICATION_SHORTNAME}Config ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + + configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h) + +diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt +index c709acc0b..bd285c46e 100644 +--- a/src/libsync/CMakeLists.txt ++++ b/src/libsync/CMakeLists.txt +@@ -87,7 +87,7 @@ INSTALL( + ${CMAKE_CURRENT_BINARY_DIR}/owncloudlib.h + logger.h + accessmanager.h +- DESTINATION ${INCLUDE_INSTALL_DIR}/ownCloud/libsync ++ DESTINATION ${INCLUDE_INSTALL_DIR}/${APPLICATION_SHORTNAME}/libsync + ) + + add_library(libsync SHARED ${libsync_SRCS}) +@@ -138,4 +138,4 @@ set_target_properties(libsync PROPERTIES + VERSION ${MIRALL_VERSION} + SOVERSION ${MIRALL_SOVERSION} + ) +-install(TARGETS libsync EXPORT ownCloudConfig ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS libsync EXPORT ${APPLICATION_SHORTNAME}Config ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt +index 4f6fe1b0e..2905f55e6 100644 +--- a/src/resources/CMakeLists.txt ++++ b/src/resources/CMakeLists.txt +@@ -40,4 +40,4 @@ if(Qt5LinguistTools_FOUND) + ) + endif() + +-install(TARGETS owncloudResources ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS owncloudResources EXPORT ${APPLICATION_SHORTNAME}Config ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch b/net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch new file mode 100644 index 000000000..266596b7b --- /dev/null +++ b/net-misc/cernbox-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/cernbox-client/metadata.xml b/net-misc/cernbox-client/metadata.xml index c67ea7b66..e8384eb02 100644 --- a/net-misc/cernbox-client/metadata.xml +++ b/net-misc/cernbox-client/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>o.freyermuth@googlemail.com</email> @@ -26,5 +26,7 @@ </use> <upstream> <doc>https://cernbox.web.cern.ch/cernbox/</doc> + <remote-id type="github">owncloud/client</remote-id> + <remote-id type="github">owncloud/libre-graph-api-cpp-qt-client</remote-id> </upstream> </pkgmetadata> |