public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/files/, net-misc/cernbox-client/
@ 2016-10-12  6:30 Marius Brehler
  0 siblings, 0 replies; 6+ messages in thread
From: Marius Brehler @ 2016-10-12  6:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3d951ef32f14fb38b544571708b948d8d0e8092b
Author:     olifre <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Oct  2 10:13:42 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Sun Oct  2 10:13:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3d951ef3

net-misc/cernbox-client: Bump to 2.2.4, drop old. (#689)

Remove dolphin-integration patch, applied upstream,
update nautilus-integration patch to upstream's version.

Package-Manager: portage-2.3.1

 ...nt-2.2.3.ebuild => cernbox-client-2.2.4.ebuild} |  3 +-
 .../files/shell-integration-dolphin.patch          | 36 ----------------------
 .../files/shell-integration-nautilus.patch         | 18 +++++++++--
 3 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/net-misc/cernbox-client/cernbox-client-2.2.3.ebuild b/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild
similarity index 96%
rename from net-misc/cernbox-client/cernbox-client-2.2.3.ebuild
rename to net-misc/cernbox-client/cernbox-client-2.2.4.ebuild
index 5f5693a..a741a9f 100644
--- a/net-misc/cernbox-client/cernbox-client-2.2.3.ebuild
+++ b/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild
@@ -88,8 +88,7 @@ src_prepare() {
 		popd > /dev/null || die
 	fi
 
-	eapply 	"${FILESDIR}"/shell-integration-nautilus.patch \
-		"${FILESDIR}"/shell-integration-dolphin.patch
+	eapply 	"${FILESDIR}"/shell-integration-nautilus.patch
 
 	default
 }

diff --git a/net-misc/cernbox-client/files/shell-integration-dolphin.patch b/net-misc/cernbox-client/files/shell-integration-dolphin.patch
deleted file mode 100644
index 69631b8..0000000
--- a/net-misc/cernbox-client/files/shell-integration-dolphin.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From acdcc9ee50db0e010dbda185356868d65a231070 Mon Sep 17 00:00:00 2001
-From: Klaas Freitag <freitag@owncloud.com>
-Date: Mon, 12 Sep 2016 13:50:41 +0200
-Subject: [PATCH] Dolphin Plugin: Use the Application name for the socket path
-
-do not hardcode.
-
-This should fix #5165
----
- shell_integration/dolphin/ownclouddolphinpluginhelper.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp b/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
-index 027e0e6..68c2a9c 100644
---- a/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
-+++ b/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
-@@ -21,6 +21,7 @@
- #include <qcoreevent.h>
- #include <QFile>
- #include "ownclouddolphinpluginhelper.h"
-+#include "config.h"
- 
- OwncloudDolphinPluginHelper* OwncloudDolphinPluginHelper::instance()
- {
-@@ -67,7 +68,10 @@ void OwncloudDolphinPluginHelper::tryConnect()
-         return;
-     }
-     QString runtimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
--    QString socketPath = runtimeDir + QLatin1String("/ownCloud/socket");
-+    runtimeDir.append( QChar('/'));
-+    runtimeDir.append( QLatin1String(APPLICATION_SHORTNAME) );
-+
-+    const QString socketPath = runtimeDir + QLatin1String("/socket");
-     _socket.connectToServer(socketPath);
- }
- 

diff --git a/net-misc/cernbox-client/files/shell-integration-nautilus.patch b/net-misc/cernbox-client/files/shell-integration-nautilus.patch
index 67aee02..45cc39e 100644
--- a/net-misc/cernbox-client/files/shell-integration-nautilus.patch
+++ b/net-misc/cernbox-client/files/shell-integration-nautilus.patch
@@ -1,6 +1,18 @@
---- a/shell_integration/nautilus/CMakeLists.txt	2016-08-08 15:42:39.000000000 +0200
-+++ b/shell_integration/nautilus/CMakeLists.txt	2016-09-10 18:01:22.387950249 +0200
-@@ -19,8 +19,8 @@
+From 5f2b1999f6c22b293cb8aa91835b53cedc2dec94 Mon Sep 17 00:00:00 2001
+From: Christian Kamm <mail@ckamm.de>
+Date: Wed, 28 Sep 2016 13:09:15 +0200
+Subject: [PATCH] Package: Fix nautilus plugin name collision when branded
+
+As suggested by @olifre in #5183
+---
+ shell_integration/nautilus/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/shell_integration/nautilus/CMakeLists.txt b/shell_integration/nautilus/CMakeLists.txt
+index 6c1e9f7..3391102 100644
+--- a/shell_integration/nautilus/CMakeLists.txt
++++ b/shell_integration/nautilus/CMakeLists.txt
+@@ -19,8 +19,8 @@ if( UNIX AND NOT APPLE )
                      ERROR_VARIABLE errors OUTPUT_VARIABLE out)
  
                                          


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/files/, net-misc/cernbox-client/
@ 2016-10-12  6:30 Marius Brehler
  0 siblings, 0 replies; 6+ messages in thread
From: Marius Brehler @ 2016-10-12  6:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a9bccaa1c26c489dd3dd3f7405d04d0c1ee0240b
Author:     olifre <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Mon Sep 26 11:00:36 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Mon Sep 26 11:00:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a9bccaa1

net-misc/cernbox-client: Branded net-misc/owncloud-client for CERN. (#673)

* net-misc/cernbox-client: Branded net-misc/owncloud-client for CERN.

The branding contains themeing and several special default settings
for the special ownCloud instance of CERN.

Package-Manager: portage-2.3.0

* net-misc/cernbox-client: Use eapply instead of epatch,
adapt patch.

Package-Manager: portage-2.3.1

 .../cernbox-client/cernbox-client-2.2.3.ebuild     | 119 +++++++++++++++++++++
 .../files/shell-integration-dolphin.patch          |  36 +++++++
 .../files/shell-integration-nautilus.patch         |  13 +++
 net-misc/cernbox-client/metadata.xml               |  27 +++++
 4 files changed, 195 insertions(+)

diff --git a/net-misc/cernbox-client/cernbox-client-2.2.3.ebuild b/net-misc/cernbox-client/cernbox-client-2.2.3.ebuild
new file mode 100644
index 0000000..5f5693a
--- /dev/null
+++ b/net-misc/cernbox-client/cernbox-client-2.2.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils rpm
+
+DESCRIPTION="Synchronize files from CERNbox EOS with your computer"
+
+# Origin is classic owncloud-client, branded for CERN during compilation.
+ORIGIN_P="owncloudclient"
+BRANDED_P="cernbox"
+BRANDED_PV="2.1.1"
+BRANDED_REL="1.1"
+
+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 nautilus samba +sftp test qt4 +qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )
+	dolphin? ( qt5 )"
+
+RDEPEND=">=dev-db/sqlite-3.4:3
+	sys-fs/inotify-tools
+	virtual/libiconv
+	dolphin? (
+		>=kde-frameworks/kcoreaddons-5.16:5
+		>=kde-frameworks/kio-5.16:5 )
+	nautilus? ( dev-python/nautilus-python )
+	qt4? (
+		dev-libs/qtkeychain[qt4]
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4
+		dev-qt/qtwebkit:4
+		net-libs/neon[ssl]
+	)
+	qt5? (
+		dev-libs/qtkeychain[qt5]
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		>=dev-qt/qtnetwork-5.4:5
+		dev-qt/qtgui:5
+		dev-qt/qtquickcontrols:5
+		dev-qt/qtsql:5
+		dev-qt/qtwebkit:5[printsupport]
+	)
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	!net-misc/ocsync
+	!net-misc/nextcloud-client"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( >=kde-frameworks/extra-cmake-modules-5.22.0 )
+	qt5? ( dev-qt/linguist-tools:5 )
+	test? (
+		dev-util/cmocka
+		qt4? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
+	)"
+
+S=${WORKDIR}/owncloudclient-${PV}
+
+src_unpack() {
+	rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm
+	mv ${PN/-}-${BRANDED_PV}/cernbox "${S}" || die "failed to extract branding"
+}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+
+	eapply 	"${FILESDIR}"/shell-integration-nautilus.patch \
+		"${FILESDIR}"/shell-integration-dolphin.patch
+
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_WITH_QT4=$(usex qt4)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DUNIT_TESTING=$(usex test)
+		-DOEM_THEME_DIR=${PWD}/${BRANDED_P}/mirall
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}

diff --git a/net-misc/cernbox-client/files/shell-integration-dolphin.patch b/net-misc/cernbox-client/files/shell-integration-dolphin.patch
new file mode 100644
index 0000000..69631b8
--- /dev/null
+++ b/net-misc/cernbox-client/files/shell-integration-dolphin.patch
@@ -0,0 +1,36 @@
+From acdcc9ee50db0e010dbda185356868d65a231070 Mon Sep 17 00:00:00 2001
+From: Klaas Freitag <freitag@owncloud.com>
+Date: Mon, 12 Sep 2016 13:50:41 +0200
+Subject: [PATCH] Dolphin Plugin: Use the Application name for the socket path
+
+do not hardcode.
+
+This should fix #5165
+---
+ shell_integration/dolphin/ownclouddolphinpluginhelper.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp b/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
+index 027e0e6..68c2a9c 100644
+--- a/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
++++ b/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
+@@ -21,6 +21,7 @@
+ #include <qcoreevent.h>
+ #include <QFile>
+ #include "ownclouddolphinpluginhelper.h"
++#include "config.h"
+ 
+ OwncloudDolphinPluginHelper* OwncloudDolphinPluginHelper::instance()
+ {
+@@ -67,7 +68,10 @@ void OwncloudDolphinPluginHelper::tryConnect()
+         return;
+     }
+     QString runtimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
+-    QString socketPath = runtimeDir + QLatin1String("/ownCloud/socket");
++    runtimeDir.append( QChar('/'));
++    runtimeDir.append( QLatin1String(APPLICATION_SHORTNAME) );
++
++    const QString socketPath = runtimeDir + QLatin1String("/socket");
+     _socket.connectToServer(socketPath);
+ }
+ 

diff --git a/net-misc/cernbox-client/files/shell-integration-nautilus.patch b/net-misc/cernbox-client/files/shell-integration-nautilus.patch
new file mode 100644
index 0000000..67aee02
--- /dev/null
+++ b/net-misc/cernbox-client/files/shell-integration-nautilus.patch
@@ -0,0 +1,13 @@
+--- a/shell_integration/nautilus/CMakeLists.txt	2016-08-08 15:42:39.000000000 +0200
++++ b/shell_integration/nautilus/CMakeLists.txt	2016-09-10 18:01:22.387950249 +0200
+@@ -19,8 +19,8 @@
+                     ERROR_VARIABLE errors OUTPUT_VARIABLE out)
+ 
+                                         
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${DATADIR}/nautilus-python/extensions)
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${DATADIR}/nemo-python/extensions RENAME syncstate.py)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${DATADIR}/nautilus-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${DATADIR}/nemo-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
+     
+     
+ 

diff --git a/net-misc/cernbox-client/metadata.xml b/net-misc/cernbox-client/metadata.xml
new file mode 100644
index 0000000..1a378d6
--- /dev/null
+++ b/net-misc/cernbox-client/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  This service provides a cloud synchronisation service for all CERN users between personal devices (like a laptop) and a centrally-managed data storage.
+
+  Available to all CERN users. This service provides synchronisation capabilities:
+  everyone having a CERN computing account can use box to synchronise data (files and directories) across a series of (mobile) devices (smartphones, tablet, laptop, desktop).
+  Major software distributions are supported (notably recent Mac, Linux and Windows).
+
+  The service provides off-line eventually synchronised access to data and it is also meant for data sharing across collaborators (for example to share presentations or text documents).
+
+  The service is not suitable for critical-path activities like data acquisition, world-wide data distribution and massive batch processing.
+  </longdescription>
+  <use>
+    <flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
+    <flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
+    <flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
+  </use>
+  <upstream>
+    <doc>http://cernbox.web.cern.ch/cernbox/00_getting_started/index.html</doc>
+  </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/files/, net-misc/cernbox-client/
@ 2017-05-20  9:52 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2017-05-20  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     1a01c487a27ff2e2d67b2926b146f87ec2fcf93b
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Fri May 19 19:09:43 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat May 20 09:51:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=1a01c487

net-misc/cernbox-client: Bump to 2.3.2 release, drop old.

Following new owncloud-client version.

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/sci/pull/788

 .../cernbox-client/cernbox-client-2.2.4-r1.ebuild  | 106 ---------------------
 ...nt-2.3.0.ebuild => cernbox-client-2.3.2.ebuild} |   0
 .../files/shell-integration-nautilus.patch         |  25 -----
 3 files changed, 131 deletions(-)

diff --git a/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild b/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild
deleted file mode 100644
index d6687b872..000000000
--- a/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils rpm
-
-DESCRIPTION="Synchronize files from CERNbox EOS with your computer"
-
-# Origin is classic owncloud-client, branded for CERN during compilation.
-ORIGIN_P="owncloudclient"
-BRANDED_P="cernbox"
-BRANDED_PV="2.2.4"
-BRANDED_REL="1.1"
-
-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 nautilus samba +sftp test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	sys-fs/inotify-tools
-	virtual/libiconv
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/owncloudclient-${PV}
-
-src_unpack() {
-	rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm
-	mv ${PN/-}-${BRANDED_PV}/cernbox "${S}" || die "failed to extract branding"
-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-
-	eapply 	"${FILESDIR}"/shell-integration-nautilus.patch
-
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-DUNIT_TESTING=$(usex test)
-		-DOEM_THEME_DIR=${PWD}/${BRANDED_P}/mirall
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}

diff --git a/net-misc/cernbox-client/cernbox-client-2.3.0.ebuild b/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild
similarity index 100%
rename from net-misc/cernbox-client/cernbox-client-2.3.0.ebuild
rename to net-misc/cernbox-client/cernbox-client-2.3.2.ebuild

diff --git a/net-misc/cernbox-client/files/shell-integration-nautilus.patch b/net-misc/cernbox-client/files/shell-integration-nautilus.patch
deleted file mode 100644
index 45cc39e3d..000000000
--- a/net-misc/cernbox-client/files/shell-integration-nautilus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5f2b1999f6c22b293cb8aa91835b53cedc2dec94 Mon Sep 17 00:00:00 2001
-From: Christian Kamm <mail@ckamm.de>
-Date: Wed, 28 Sep 2016 13:09:15 +0200
-Subject: [PATCH] Package: Fix nautilus plugin name collision when branded
-
-As suggested by @olifre in #5183
----
- shell_integration/nautilus/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/shell_integration/nautilus/CMakeLists.txt b/shell_integration/nautilus/CMakeLists.txt
-index 6c1e9f7..3391102 100644
---- a/shell_integration/nautilus/CMakeLists.txt
-+++ b/shell_integration/nautilus/CMakeLists.txt
-@@ -19,8 +19,8 @@ if( UNIX AND NOT APPLE )
-                     ERROR_VARIABLE errors OUTPUT_VARIABLE out)
- 
-                                         
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${DATADIR}/nautilus-python/extensions)
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${DATADIR}/nemo-python/extensions RENAME syncstate.py)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${DATADIR}/nautilus-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${DATADIR}/nemo-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
-     
-     
- 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/files/, net-misc/cernbox-client/
@ 2020-10-05 20:22 Horea Christian
  0 siblings, 0 replies; 6+ messages in thread
From: Horea Christian @ 2020-10-05 20:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ff37c2c1cbd5798ee4c5306429d8b0977b6cc64b
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Oct  4 18:34:12 2020 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Oct  5 20:21:40 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ff37c2c1

net-misc/cernbox-client: Bump to version 2.6.3.14058.

This commit also drops the old version in one commit,
since it was broken in any case (fetching failed).

It also adds myself as maintainer.

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 ....2.ebuild => cernbox-client-2.6.3.14058.ebuild} | 75 +++++++++++-----------
 .../files/owncloud-client-2.6.3.14058-qt515.patch  | 11 ++++
 net-misc/cernbox-client/metadata.xml               | 21 +++---
 3 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild b/net-misc/cernbox-client/cernbox-client-2.6.3.14058.ebuild
similarity index 51%
rename from net-misc/cernbox-client/cernbox-client-2.3.2.ebuild
rename to net-misc/cernbox-client/cernbox-client-2.6.3.14058.ebuild
index 9513b064b..5cb28eec0 100644
--- a/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild
+++ b/net-misc/cernbox-client/cernbox-client-2.6.3.14058.ebuild
@@ -1,55 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils rpm
+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="owncloudclient"
+ORIGIN_P="owncloud-client"
 BRANDED_P="cernbox"
-BRANDED_PV="2.2.4"
-BRANDED_REL="1.1"
-
-DESCRIPTION="Synchronize files from CERNbox EOS with your computer"
+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
+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 nautilus samba +sftp test"
+IUSE="doc dolphin gnome-keyring nautilus test"
 
-COMMON_DEPEND="
-	>=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain
+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
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-fs/inotify-tools
-	virtual/libiconv
 	dolphin? (
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/kio:5
 	)
-	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
+	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
 	)
@@ -57,43 +52,44 @@ DEPEND="${COMMON_DEPEND}
 	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
-	mv ${PN/-}-${BRANDED_PV}/cernbox "${S}" || die "failed to extract branding"
+	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 "sed failed"
+	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
-	default
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-DUNIT_TESTING=$(usex test)
-		-DOEM_THEME_DIR=${PWD}/${BRANDED_P}/mirall
+		-DBUILD_TESTING=$(usex test)
+		-DOEM_THEME_DIR=${PWD}/${BRANDED_P}/syncclient
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
@@ -101,4 +97,5 @@ pkg_postinst() {
 		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
new file mode 100644
index 000000000..57dd20938
--- /dev/null
+++ b/net-misc/cernbox-client/files/owncloud-client-2.6.3.14058-qt515.patch
@@ -0,0 +1,11 @@
+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"

diff --git a/net-misc/cernbox-client/metadata.xml b/net-misc/cernbox-client/metadata.xml
index ac0a4fc58..c67ea7b66 100644
--- a/net-misc/cernbox-client/metadata.xml
+++ b/net-misc/cernbox-client/metadata.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>o.freyermuth@googlemail.com</email>
+		<name>Oliver Freyermuth</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sci-physics@gentoo.org</email>
 		<name>Gentoo Physics Project</name>
 	</maintainer>
 	<longdescription lang="en">
-This service provides a cloud synchronisation service for all CERN users between personal devices (like a laptop) and a centrally-managed data storage.
+		This service provides a cloud synchronisation service for all CERN users between personal devices (like a laptop) and a centrally-managed data storage.
 
-Available to all CERN users. This service provides synchronisation capabilities:
-everyone having a CERN computing account can use box to synchronise data (files and directories) across a series of (mobile) devices (smartphones, tablet, laptop, desktop).
-Major software distributions are supported (notably recent Mac, Linux and Windows).
+		Available to all CERN users. This service provides synchronisation capabilities:
+		everyone having a CERN computing account can use box to synchronise data (files and directories) across a series of (mobile) devices (smartphones, tablet, laptop, desktop).
+		Major software distributions are supported (notably recent Mac, Linux and Windows).
 
-The service provides off-line eventually synchronised access to data and it is also meant for data sharing across collaborators (for example to share presentations or text documents).
+		The service provides off-line eventually synchronised access to data and it is also meant for data sharing across collaborators (for example to share presentations or text documents).
 
-The service is not suitable for critical-path activities like data acquisition, world-wide data distribution and massive batch processing.
-</longdescription>
+		The service is not suitable for critical-path activities like data acquisition, world-wide data distribution and massive batch processing.
+	</longdescription>
 	<use>
 		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
 		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
-		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
 	</use>
 	<upstream>
-		<doc>http://cernbox.web.cern.ch/cernbox/00_getting_started/index.html</doc>
+		<doc>https://cernbox.web.cern.ch/cernbox/</doc>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/files/, net-misc/cernbox-client/
@ 2021-10-26 10:44 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-10-26 10:44 UTC (permalink / raw
  To: gentoo-commits

commit:     799016bc1b3cbed67c05f1c9c244fcca6e8aed57
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Oct  3 11:28:48 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 10:30:28 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=799016bc

net-misc/cernbox-client: Add compatibility patch with new Qt 5.

New Qt packages are based upon Qt5PatchCollection
and caused FTBFS with cernbox-client without the added patch.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild    |  2 ++
 .../owncloud-client-2.8.2.4246-qtcore-5.15.2-r10.patch      | 13 +++++++++++++
 2 files changed, 15 insertions(+)

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
index 2eb01cf8e..61be5a734 100644
--- a/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild
+++ b/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild
@@ -58,6 +58,8 @@ 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"

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
new file mode 100644
index 000000000..3cb002355
--- /dev/null
+++ b/net-misc/cernbox-client/files/owncloud-client-2.8.2.4246-qtcore-5.15.2-r10.patch
@@ -0,0 +1,13 @@
+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] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/files/, net-misc/cernbox-client/
@ 2023-06-26 17:55 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2023-06-26 17:55 UTC (permalink / raw
  To: gentoo-commits

commit:     f4c276075ea102834dbe7946552089ae300c97f3
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Mon Jun 26 17:30:44 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 17:39:09 2023 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f4c27607

net-misc/cernbox-client: add 3.2.0.10193

Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/sci/pull/1196
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../cernbox-client-3.2.0.10193.ebuild              | 92 ++++++++++++++++++++++
 ...owncloud-client-3.1.0.9872-no_cmake_fetch.patch | 17 ++++
 .../owncloud-client-3.2.0.10193-fix-mirall.patch   | 73 +++++++++++++++++
 ...ud-client-3.2.0.10193-no_fortify_override.patch | 16 ++++
 net-misc/cernbox-client/metadata.xml               |  4 +-
 5 files changed, 201 insertions(+), 1 deletion(-)

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>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-06-26 17:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-20  9:52 [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/files/, net-misc/cernbox-client/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2023-06-26 17:55 Andrew Ammerlaan
2021-10-26 10:44 Andrew Ammerlaan
2020-10-05 20:22 Horea Christian
2016-10-12  6:30 Marius Brehler
2016-10-12  6:30 Marius Brehler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox