[gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/files/, net-misc/cernbox-client/

["Marius Brehler" <marbre@linux.sungazer.de>]

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)