* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/, net-misc/cernbox-client/files/
@ 2021-01-03 19:21 Horea Christian
0 siblings, 0 replies; 5+ messages in thread
From: Horea Christian @ 2021-01-03 19:21 UTC (permalink / raw
To: gentoo-commits
commit: b734240e8c728c2fdf8569fcb88ea50263a9447d
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sat Jan 2 20:07:08 2021 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Sun Jan 3 19:20:47 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b734240e
net-misc/cernbox-client: Drop old version.
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
Closes: https://github.com/gentoo/sci/pull/1030
.../cernbox-client-2.6.3.14058.ebuild | 101 ---------------------
.../files/owncloud-client-2.6.3.14058-qt515.patch | 11 ---
2 files changed, 112 deletions(-)
diff --git a/net-misc/cernbox-client/cernbox-client-2.6.3.14058.ebuild b/net-misc/cernbox-client/cernbox-client-2.6.3.14058.ebuild
deleted file mode 100644
index 5cb28eec0..000000000
--- a/net-misc/cernbox-client/cernbox-client-2.6.3.14058.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake rpm xdg
-
-DESCRIPTION="Synchronize files from CERNBox EOS with your computer"
-
-# Origin is classic owncloud-client, branded for CERN during compilation.
-ORIGIN_P="owncloud-client"
-BRANDED_P="cernbox"
-BRANDED_PV="2.5.4"
-BRANDED_REL="2719.1"
-BRANDED_TS="202002062027"
-HOMEPAGE="https://cernbox.cern.ch/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${ORIGIN_P/-}-${PV}.tar.xz
- https://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin gnome-keyring nautilus test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[gnome-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 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- doc? (
- dev-python/sphinx
- dev-tex/latexmk
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- dolphin? ( kde-frameworks/extra-cmake-modules )
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/owncloudclient-${PV}
-
-PATCHES=( "${FILESDIR}"/${ORIGIN_P}-${PV}-qt515.patch )
-
-src_unpack() {
- rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm || die "failed to extract branding RPM"
- mv ${PN/-}-${BRANDED_PV}.${BRANDED_TS}/cernbox "${S}" || die "failed to extract branding"
- rm -rf "${S}/theme" || die "failed to remove vanilla theme"
- mv ${PN/-}-${BRANDED_PV}.${BRANDED_TS}/theme "${S}" || die "failed to extract branding"
-}
-
-src_prepare() {
- # 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=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
- -DBUILD_TESTING=$(usex test)
- -DOEM_THEME_DIR=${PWD}/${BRANDED_P}/syncclient
- )
-
- 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-2.6.3.14058-qt515.patch b/net-misc/cernbox-client/files/owncloud-client-2.6.3.14058-qt515.patch
deleted file mode 100644
index 57dd20938..000000000
--- a/net-misc/cernbox-client/files/owncloud-client-2.6.3.14058-qt515.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp
---- owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp 2020-06-12 14:35:04.000000000 +0200
-+++ owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp 2020-06-13 11:18:28.822842347 +0200
-@@ -31,6 +31,7 @@
- #include <QJsonObject>
- #ifndef TOKEN_AUTH_ONLY
- #include <QPainter>
-+#include <QPainterPath>
- #endif
-
- #include "networkjobs.h"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/, net-misc/cernbox-client/files/
@ 2021-10-26 10:44 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-10-26 10:44 UTC (permalink / raw
To: gentoo-commits
commit: 2d0d3f4ff85978975d360f96969e323f129c5d53
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sat Oct 23 18:54:16 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 10:30:32 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2d0d3f4f
net-misc/cernbox-client: Bump to 2.9.1.5500.
Requires a small patch to the CERNBox theme
due to ownCloud upstream changes to themeing.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/sci/pull/1116
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../cernbox-client-2.9.1.5500.ebuild | 83 ++++++++++++++++++++++
.../cernbox-client/files/cernbox-theme-2.9.1.patch | 11 +++
2 files changed, 94 insertions(+)
diff --git a/net-misc/cernbox-client/cernbox-client-2.9.1.5500.ebuild b/net-misc/cernbox-client/cernbox-client-2.9.1.5500.ebuild
new file mode 100644
index 000000000..482b29c54
--- /dev/null
+++ b/net-misc/cernbox-client/cernbox-client-2.9.1.5500.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="2.7.1"
+BRANDED_REL="2596"
+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"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dolphin gnome-keyring nautilus test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+ dev-libs/qtkeychain[gnome-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 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/linguist-tools:5
+ kde-frameworks/extra-cmake-modules
+ test? (
+ dev-util/cmocka
+ dev-qt/qttest:5
+ )"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${ORIGIN_PN}-${PV}
+
+PATCHES=( "${FILESDIR}"/cernbox-theme-2.9.1.patch )
+
+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"
+}
+
+src_prepare() {
+ # 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=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ -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/cernbox-theme-2.9.1.patch b/net-misc/cernbox-client/files/cernbox-theme-2.9.1.patch
new file mode 100644
index 000000000..c2ccbcc5e
--- /dev/null
+++ b/net-misc/cernbox-client/files/cernbox-theme-2.9.1.patch
@@ -0,0 +1,11 @@
+--- a/branding/cernbox-theme.h 2021-10-21 13:10:22.832842670 +0200
++++ b/branding/cernbox-theme.h 2021-10-21 13:14:57.394479817 +0200
+@@ -62,7 +62,7 @@
+
+
+ QString about() const {
+- QString devString = tr("<p>Version %1. For more information visit <a href=\"%2\">https://%3</a></p>").arg(Utility::escape(QStringLiteral(MIRALL_VERSION_STRING)), Utility::escape(QStringLiteral("https://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))), Utility::escape(QStringLiteral(MIRALL_STRINGIFY(APPLICATION_DOMAIN))));
++ QString devString = tr("<p>Version %1. For more information visit <a href=\"%2\">https://%3</a></p>").arg(Utility::escape(QStringLiteral(MIRALL_VERSION_STRING)), Utility::escape(QStringLiteral("https://" APPLICATION_DOMAIN)), Utility::escape(QStringLiteral(APPLICATION_DOMAIN)));
+
+
+ return devString;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/, net-misc/cernbox-client/files/
@ 2021-12-17 10:44 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-12-17 10:44 UTC (permalink / raw
To: gentoo-commits
commit: bec520e1f0e156f7f2bbb32604592892370bd1a1
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu Dec 16 18:49:35 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 10:44:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bec520e1
net-misc/cernbox-client: Drop old.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/sci/pull/1128
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../cernbox-client-2.8.2.4246.ebuild | 98 ----------------------
...cloud-client-2.8.2.4246-qtcore-5.15.2-r10.patch | 13 ---
2 files changed, 111 deletions(-)
diff --git a/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild b/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild
deleted file mode 100644
index 61be5a734..000000000
--- a/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="2.7.1"
-BRANDED_REL="2596"
-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"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin gnome-keyring nautilus test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[gnome-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 )"
-
-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
- )
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${ORIGIN_PN}-${PV}
-
-PATCHES=( "${FILESDIR}"/owncloud-client-${PV}-qtcore-5.15.2-r10.patch )
-
-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"
-}
-
-src_prepare() {
- # 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=(
- -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-2.8.2.4246-qtcore-5.15.2-r10.patch b/net-misc/cernbox-client/files/owncloud-client-2.8.2.4246-qtcore-5.15.2-r10.patch
deleted file mode 100644
index 3cb002355..000000000
--- a/net-misc/cernbox-client/files/owncloud-client-2.8.2.4246-qtcore-5.15.2-r10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
-index 820fed7fb..4a103a0f9 100644
---- a/src/csync/csync_exclude.cpp
-+++ b/src/csync/csync_exclude.cpp
-@@ -486,7 +486,7 @@ QString ExcludedFiles::convertToRegexpSyntax(QString exclude, bool wildcardsMatc
- // Translate [! to [^
- QString bracketExpr = exclude.mid(i, j - i + 1);
- if (bracketExpr.startsWith(QLatin1String("[!")))
-- bracketExpr[1] = '^';
-+ bracketExpr[1] = QLatin1Char('^');
- regex.append(bracketExpr);
- i = j;
- break;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/, net-misc/cernbox-client/files/
@ 2023-08-16 11:29 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2023-08-16 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 1382a96c067045e9f4c4c01c74cd32a51d514415
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Fri Aug 4 18:34:57 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 11:20:14 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1382a96c
net-misc/cernbox-client: add 4.1.0.11250
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../cernbox-client-4.1.0.11250.ebuild | 92 ++++++++++++++++++++++
.../owncloud-client-4.1.0.11250-fix-mirall.patch | 73 +++++++++++++++++
2 files changed, 165 insertions(+)
diff --git a/net-misc/cernbox-client/cernbox-client-4.1.0.11250.ebuild b/net-misc/cernbox-client/cernbox-client-4.1.0.11250.ebuild
new file mode 100644
index 000000000..741aa66f1
--- /dev/null
+++ b/net-misc/cernbox-client/cernbox-client-4.1.0.11250.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="4.1.0"
+BRANDED_REL="11373"
+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_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="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-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
+
+ 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-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})
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/, net-misc/cernbox-client/files/
@ 2023-08-28 7:26 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2023-08-28 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 198799d5c4b4b124f95e784aaa489e5fb7e83ae1
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sat Aug 26 17:55:49 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 07:21:23 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=198799d5
net-misc/cernbox-client: drop 3.2.0.10193
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/sci/pull/1214
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../cernbox-client-3.2.0.10193.ebuild | 92 ----------------------
.../owncloud-client-3.2.0.10193-fix-mirall.patch | 73 -----------------
2 files changed, 165 deletions(-)
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
deleted file mode 100644
index 476c2838e..000000000
--- a/net-misc/cernbox-client/cernbox-client-3.2.0.10193.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.2.0.10193-fix-mirall.patch b/net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-fix-mirall.patch
deleted file mode 100644
index f276d232e..000000000
--- a/net-misc/cernbox-client/files/owncloud-client-3.2.0.10193-fix-mirall.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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})
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-28 7:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-03 19:21 [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/, net-misc/cernbox-client/files/ Horea Christian
-- strict thread matches above, loose matches on Subject: below --
2021-10-26 10:44 Andrew Ammerlaan
2021-12-17 10:44 Andrew Ammerlaan
2023-08-16 11:29 Andrew Ammerlaan
2023-08-28 7:26 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox