diff options
Diffstat (limited to 'net-misc/cernbox-client')
-rw-r--r-- | net-misc/cernbox-client/Manifest | 7 | ||||
-rw-r--r-- | net-misc/cernbox-client/cernbox-client-4.1.0.11250.ebuild (renamed from net-misc/cernbox-client/cernbox-client-2.7.6.3261.ebuild) | 58 | ||||
-rw-r--r-- | net-misc/cernbox-client/cernbox-client-4.2.0.11670.ebuild (renamed from net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild) | 58 | ||||
-rw-r--r-- | net-misc/cernbox-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch | 17 | ||||
-rw-r--r-- | net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch | 16 | ||||
-rw-r--r-- | net-misc/cernbox-client/files/owncloud-client-4.1.0.11250-fix-mirall.patch | 73 | ||||
-rw-r--r-- | net-misc/cernbox-client/metadata.xml | 4 |
7 files changed, 167 insertions, 66 deletions
diff --git a/net-misc/cernbox-client/Manifest b/net-misc/cernbox-client/Manifest index d826df9fb..5916259b7 100644 --- a/net-misc/cernbox-client/Manifest +++ b/net-misc/cernbox-client/Manifest @@ -1,3 +1,4 @@ -DIST cernbox-client-2.7.1-2596.src.rpm 15434250 BLAKE2B 3ef3fcc4010b3f292aee9b6bba7b5f9a72e4fbca1236e1e85e6523cd4e38d980fe4542c5f019647a19040be64628159651630a61ee8894cb7bcf4b69d342ccd0 SHA512 e329b84fc7aa62068f934bf8a9f47432709094adc618274c1b8ddbf7331094cb71b6208d3a777150ee426141301e0279cb219d65b123335f2e198a9b87980e5d -DIST ownCloud-2.7.6.3261.tar.xz 14237692 BLAKE2B 914b069b10fa2f169677768e1578c5b8569836eb574889c72c0ea1ca3e16e6b7c65bcdd1f4a5ce4259eab6ec56110e3b45799d010921e47c7f64ccfd0ed545bf SHA512 1f647dd0b33472e31719651fa22b5864867d98fa1e2f11f9eadb6ce15382f5f97ac49d726af079716b6fac573367485a6f11a5b2e5e5c95d4d063f6caab51dcd -DIST ownCloud-2.8.2.4246.tar.xz 15044652 BLAKE2B ee1ee412667266273a9a9722940559562c6c43213b013fe7c21328e04ac967afb16f460e6fa711f37d1d4ea7d0fc15fc398d835cf6a939f4c8dfd54cd4846fed SHA512 0ab2ef72191cc2d5c2621c97c09cb1d25472a30f511235a190465e246a8312f13a255011abb9690c481887f2f15094414c87ce594252eb8debcb39b9cbc8a178 +DIST cernbox-client-4.1.0-11373.src.rpm 4621882 BLAKE2B db5106e4e214cee38f729543017adc45a7f4a00e95e57953c6d18b5272e6db88a7d5d820e68272e17d80c3ce962ad3ce689f053a2cff5fe0b7ec2788885cc0d8 SHA512 2deb9c19cbfffd7c37ac06c244c94e996a369ac511d4d71634b7f86f16093cfe7e6d44a97446bcf919924ded392669903344ea38da8bb70cc47317729d355cee +DIST libregraphapi-1.0.1.tar.gz 105266 BLAKE2B b5122ca5bb757c58bba0f29eaf119685c0ed119a9a72951f4098d8180e5bf05332b36fa6c884ca29b0414051c9c6d6ca081e3c7eeb7b9810202f11c1a70c5190 SHA512 aaa710642c36b4038dc61e7df4fc904a82a2ab6c34da03c3f5328075e41ab319f6616866b7f9ae472ff256b421751f8f5ce7ce0a6d3451bda75cfa3b307df082 +DIST ownCloud-4.1.0.11250.tar.xz 4122856 BLAKE2B 63bdd6047a75e07f6097fec37fb8092675ede50aada272bb8817e0d6ac1aa690cb7257a3d984bac58ed6320543f038cd2c89c49d9161d70ec8a3268997c42af3 SHA512 5f8f43cc8e3ceb2beeebe11fd93937df54e66ce9020a628da232523176815968364667a093cdea6bdf44dca9e1b67878ef76f38c48287327efc0fc3f85f22fb5 +DIST ownCloud-4.2.0.11670.tar.xz 4126004 BLAKE2B 60a5855239b32bfb6769d38de3eced3dcb6c642d702fa33439dfebdc97947dfaed1f0081d2ec8913edc7ab8688872115abd739e21eae7d06e96cbcd92abb5565 SHA512 277d18581155f663c0c18b44a6c0fb9b31c84695e0980da486028b91c1d1c9f5a7ba956afbc11fb2e7fc4679e46a30c2d737667208f5c0599a39bf91a109ce99 diff --git a/net-misc/cernbox-client/cernbox-client-2.7.6.3261.ebuild b/net-misc/cernbox-client/cernbox-client-4.1.0.11250.ebuild index 2eb01cf8e..741aa66f1 100644 --- a/net-misc/cernbox-client/cernbox-client-2.7.6.3261.ebuild +++ b/net-misc/cernbox-client/cernbox-client-4.1.0.11250.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake rpm xdg @@ -10,20 +10,24 @@ 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="2.7.1" -BRANDED_REL="2596" +BRANDED_PV="4.1.0" +BRANDED_REL="11373" +REGRAPHAPI_PV="1.0.1" HOMEPAGE="https://cernbox.cern.ch/" -SRC_URI="http://download.owncloud.com/desktop/${ORIGIN_PN}/stable/${PV}/source/${ORIGIN_PN}-${PV}.tar.xz - https://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm - https://cern.ch/ofreyerm/gentoo/cernbox/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm" +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_38/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="doc dolphin gnome-keyring nautilus test" +IUSE="dolphin keyring nautilus test" +RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - dev-libs/qtkeychain[gnome-keyring?,qt5(+)] +RDEPEND=">=dev-db/sqlite-3.4:3 + dev-libs/qtkeychain[keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -39,22 +43,15 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3 ) nautilus? ( dev-python/nautilus-python )" -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules - doc? ( - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - virtual/latex-base - ) +DEPEND="${RDEPEND} test? ( dev-util/cmocka dev-qt/qttest:5 )" -RESTRICT="!test? ( test )" +BDEPEND=" + dev-qt/linguist-tools:5 + kde-frameworks/extra-cmake-modules" S=${WORKDIR}/${ORIGIN_PN}-${PV} @@ -63,7 +60,16 @@ src_unpack() { 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-4.1.0.11250-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 @@ -77,20 +83,10 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) -DBUILD_TESTING=$(usex test) ) cmake_src_configure } - -pkg_postinst() { - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi - xdg_pkg_postinst -} diff --git a/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild b/net-misc/cernbox-client/cernbox-client-4.2.0.11670.ebuild index 2eb01cf8e..741aa66f1 100644 --- a/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild +++ b/net-misc/cernbox-client/cernbox-client-4.2.0.11670.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake rpm xdg @@ -10,20 +10,24 @@ 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="2.7.1" -BRANDED_REL="2596" +BRANDED_PV="4.1.0" +BRANDED_REL="11373" +REGRAPHAPI_PV="1.0.1" HOMEPAGE="https://cernbox.cern.ch/" -SRC_URI="http://download.owncloud.com/desktop/${ORIGIN_PN}/stable/${PV}/source/${ORIGIN_PN}-${PV}.tar.xz - https://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm - https://cern.ch/ofreyerm/gentoo/cernbox/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm" +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_38/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="doc dolphin gnome-keyring nautilus test" +IUSE="dolphin keyring nautilus test" +RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - dev-libs/qtkeychain[gnome-keyring?,qt5(+)] +RDEPEND=">=dev-db/sqlite-3.4:3 + dev-libs/qtkeychain[keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -39,22 +43,15 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3 ) nautilus? ( dev-python/nautilus-python )" -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules - doc? ( - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - virtual/latex-base - ) +DEPEND="${RDEPEND} test? ( dev-util/cmocka dev-qt/qttest:5 )" -RESTRICT="!test? ( test )" +BDEPEND=" + dev-qt/linguist-tools:5 + kde-frameworks/extra-cmake-modules" S=${WORKDIR}/${ORIGIN_PN}-${PV} @@ -63,7 +60,16 @@ src_unpack() { 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-4.1.0.11250-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 @@ -77,20 +83,10 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) -DBUILD_TESTING=$(usex test) ) cmake_src_configure } - -pkg_postinst() { - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi - xdg_pkg_postinst -} 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-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/files/owncloud-client-4.1.0.11250-fix-mirall.patch b/net-misc/cernbox-client/files/owncloud-client-4.1.0.11250-fix-mirall.patch new file mode 100644 index 000000000..5e00e23aa --- /dev/null +++ b/net-misc/cernbox-client/files/owncloud-client-4.1.0.11250-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 4d73f2cc3..49228dbb6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -54,10 +54,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 fcf665e44..15c0a8130 100644 +--- a/src/csync/CMakeLists.txt ++++ b/src/csync/CMakeLists.txt +@@ -98,10 +98,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 3995bcfe9..eeaef8450 100644 +--- a/src/libsync/CMakeLists.txt ++++ b/src/libsync/CMakeLists.txt +@@ -85,7 +85,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 6f50bf3be..7e0ff05b7 100644 +--- a/src/resources/CMakeLists.txt ++++ b/src/resources/CMakeLists.txt +@@ -42,4 +42,4 @@ if(Qt5LinguistTools_FOUND) + ) + endif() + +-install(TARGETS owncloudResources EXPORT ownCloudConfig ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS owncloudResources EXPORT ${APPLICATION_SHORTNAME}Config ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) 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> |