| 1 |
commit: 3d951ef32f14fb38b544571708b948d8d0e8092b |
| 2 |
Author: olifre <o.freyermuth <AT> googlemail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 2 10:13:42 2016 +0000 |
| 4 |
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 5 |
CommitDate: Sun Oct 2 10:13:42 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3d951ef3 |
| 7 |
|
| 8 |
net-misc/cernbox-client: Bump to 2.2.4, drop old. (#689) |
| 9 |
|
| 10 |
Remove dolphin-integration patch, applied upstream, |
| 11 |
update nautilus-integration patch to upstream's version. |
| 12 |
|
| 13 |
Package-Manager: portage-2.3.1 |
| 14 |
|
| 15 |
...nt-2.2.3.ebuild => cernbox-client-2.2.4.ebuild} | 3 +- |
| 16 |
.../files/shell-integration-dolphin.patch | 36 ---------------------- |
| 17 |
.../files/shell-integration-nautilus.patch | 18 +++++++++-- |
| 18 |
3 files changed, 16 insertions(+), 41 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-misc/cernbox-client/cernbox-client-2.2.3.ebuild b/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild |
| 21 |
similarity index 96% |
| 22 |
rename from net-misc/cernbox-client/cernbox-client-2.2.3.ebuild |
| 23 |
rename to net-misc/cernbox-client/cernbox-client-2.2.4.ebuild |
| 24 |
index 5f5693a..a741a9f 100644 |
| 25 |
--- a/net-misc/cernbox-client/cernbox-client-2.2.3.ebuild |
| 26 |
+++ b/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild |
| 27 |
@@ -88,8 +88,7 @@ src_prepare() { |
| 28 |
popd > /dev/null || die |
| 29 |
fi |
| 30 |
|
| 31 |
- eapply "${FILESDIR}"/shell-integration-nautilus.patch \ |
| 32 |
- "${FILESDIR}"/shell-integration-dolphin.patch |
| 33 |
+ eapply "${FILESDIR}"/shell-integration-nautilus.patch |
| 34 |
|
| 35 |
default |
| 36 |
} |
| 37 |
|
| 38 |
diff --git a/net-misc/cernbox-client/files/shell-integration-dolphin.patch b/net-misc/cernbox-client/files/shell-integration-dolphin.patch |
| 39 |
deleted file mode 100644 |
| 40 |
index 69631b8..0000000 |
| 41 |
--- a/net-misc/cernbox-client/files/shell-integration-dolphin.patch |
| 42 |
+++ /dev/null |
| 43 |
@@ -1,36 +0,0 @@ |
| 44 |
-From acdcc9ee50db0e010dbda185356868d65a231070 Mon Sep 17 00:00:00 2001 |
| 45 |
-From: Klaas Freitag <freitag@××××××××.com> |
| 46 |
-Date: Mon, 12 Sep 2016 13:50:41 +0200 |
| 47 |
-Subject: [PATCH] Dolphin Plugin: Use the Application name for the socket path |
| 48 |
- |
| 49 |
-do not hardcode. |
| 50 |
- |
| 51 |
-This should fix #5165 |
| 52 |
---- |
| 53 |
- shell_integration/dolphin/ownclouddolphinpluginhelper.cpp | 6 +++++- |
| 54 |
- 1 file changed, 5 insertions(+), 1 deletion(-) |
| 55 |
- |
| 56 |
-diff --git a/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp b/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp |
| 57 |
-index 027e0e6..68c2a9c 100644 |
| 58 |
---- a/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp |
| 59 |
-+++ b/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp |
| 60 |
-@@ -21,6 +21,7 @@ |
| 61 |
- #include <qcoreevent.h> |
| 62 |
- #include <QFile> |
| 63 |
- #include "ownclouddolphinpluginhelper.h" |
| 64 |
-+#include "config.h" |
| 65 |
- |
| 66 |
- OwncloudDolphinPluginHelper* OwncloudDolphinPluginHelper::instance() |
| 67 |
- { |
| 68 |
-@@ -67,7 +68,10 @@ void OwncloudDolphinPluginHelper::tryConnect() |
| 69 |
- return; |
| 70 |
- } |
| 71 |
- QString runtimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR")); |
| 72 |
-- QString socketPath = runtimeDir + QLatin1String("/ownCloud/socket"); |
| 73 |
-+ runtimeDir.append( QChar('/')); |
| 74 |
-+ runtimeDir.append( QLatin1String(APPLICATION_SHORTNAME) ); |
| 75 |
-+ |
| 76 |
-+ const QString socketPath = runtimeDir + QLatin1String("/socket"); |
| 77 |
- _socket.connectToServer(socketPath); |
| 78 |
- } |
| 79 |
- |
| 80 |
|
| 81 |
diff --git a/net-misc/cernbox-client/files/shell-integration-nautilus.patch b/net-misc/cernbox-client/files/shell-integration-nautilus.patch |
| 82 |
index 67aee02..45cc39e 100644 |
| 83 |
--- a/net-misc/cernbox-client/files/shell-integration-nautilus.patch |
| 84 |
+++ b/net-misc/cernbox-client/files/shell-integration-nautilus.patch |
| 85 |
@@ -1,6 +1,18 @@ |
| 86 |
---- a/shell_integration/nautilus/CMakeLists.txt 2016-08-08 15:42:39.000000000 +0200 |
| 87 |
-+++ b/shell_integration/nautilus/CMakeLists.txt 2016-09-10 18:01:22.387950249 +0200 |
| 88 |
-@@ -19,8 +19,8 @@ |
| 89 |
+From 5f2b1999f6c22b293cb8aa91835b53cedc2dec94 Mon Sep 17 00:00:00 2001 |
| 90 |
+From: Christian Kamm <mail@×××××.de> |
| 91 |
+Date: Wed, 28 Sep 2016 13:09:15 +0200 |
| 92 |
+Subject: [PATCH] Package: Fix nautilus plugin name collision when branded |
| 93 |
+ |
| 94 |
+As suggested by @olifre in #5183 |
| 95 |
+--- |
| 96 |
+ shell_integration/nautilus/CMakeLists.txt | 4 ++-- |
| 97 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 98 |
+ |
| 99 |
+diff --git a/shell_integration/nautilus/CMakeLists.txt b/shell_integration/nautilus/CMakeLists.txt |
| 100 |
+index 6c1e9f7..3391102 100644 |
| 101 |
+--- a/shell_integration/nautilus/CMakeLists.txt |
| 102 |
++++ b/shell_integration/nautilus/CMakeLists.txt |
| 103 |
+@@ -19,8 +19,8 @@ if( UNIX AND NOT APPLE ) |
| 104 |
ERROR_VARIABLE errors OUTPUT_VARIABLE out) |
Archives