[SCM] dolphin-plugins packaging branch, master, updated. debian/4.12.4-1-47-ge05b158

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/dolphin-plugins.git;a=commitdiff;h=bd62931

The following commit has been merged in the master branch:
commit bd62931204636fe7cb04a799a75b2d88fc8bfcad
Author: Harald Sitter <apachelogger at ubuntu.com>
Date:   Wed Apr 9 16:26:49 2014 +0200

    * Batch import fixes between 4.12.97 and current git KDE/4.13 in
      debian/patches/upstream_git/
      + KDE Bug: #332481
---
 debian/changelog                                   |  8 +++
 debian/patches/series                              |  2 +
 ...01-SVN_SILENT-made-messages-.desktop-file.patch | 24 +++++++++
 ...crash-on-startup-caused-by-Dropbox-plugin.patch | 57 ++++++++++++++++++++++
 4 files changed, 91 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c46a37e..9f1ce47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dolphin-plugins (4:4.12.97-0ubuntu2) trusty; urgency=medium
+
+  * Batch import fixes between 4.12.97 and current git KDE/4.13 in
+    debian/patches/upstream_git/ 
+    + KDE Bug: #332481
+
+ -- Harald Sitter <apachelogger at kubuntu.org>  Wed, 09 Apr 2014 16:17:47 +0200
+
 dolphin-plugins (4:4.12.97-0ubuntu1) trusty; urgency=medium
 
   * New upstream release candidate
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c287df6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+upstream_git/0001-SVN_SILENT-made-messages-.desktop-file.patch
+upstream_git/0002-Fix-crash-on-startup-caused-by-Dropbox-plugin.patch
diff --git a/debian/patches/upstream_git/0001-SVN_SILENT-made-messages-.desktop-file.patch b/debian/patches/upstream_git/0001-SVN_SILENT-made-messages-.desktop-file.patch
new file mode 100644
index 0000000..d97dd91
--- /dev/null
+++ b/debian/patches/upstream_git/0001-SVN_SILENT-made-messages-.desktop-file.patch
@@ -0,0 +1,24 @@
+From a56489cf130b907c6092e7b3d94ce93e0fdef6ce Mon Sep 17 00:00:00 2001
+From: l10n daemon script <scripty at kde.org>
+Date: Thu, 27 Mar 2014 04:51:10 +0000
+Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file)
+
+---
+ dropbox/fileviewdropboxplugin.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dropbox/fileviewdropboxplugin.desktop b/dropbox/fileviewdropboxplugin.desktop
+index 599f6a5..901a9d8 100644
+--- a/dropbox/fileviewdropboxplugin.desktop
++++ b/dropbox/fileviewdropboxplugin.desktop
+@@ -18,6 +18,7 @@ Name[nl]=Dropbox
+ Name[pl]=Dropbox
+ Name[pt]=Dropbox
+ Name[pt_BR]=Dropbox
++Name[ro]=Dropbox
+ Name[ru]=Dropbox
+ Name[sk]=Dropbox
+ Name[sl]=Dropbox
+-- 
+1.9.1
+
diff --git a/debian/patches/upstream_git/0002-Fix-crash-on-startup-caused-by-Dropbox-plugin.patch b/debian/patches/upstream_git/0002-Fix-crash-on-startup-caused-by-Dropbox-plugin.patch
new file mode 100644
index 0000000..048e230
--- /dev/null
+++ b/debian/patches/upstream_git/0002-Fix-crash-on-startup-caused-by-Dropbox-plugin.patch
@@ -0,0 +1,57 @@
+From 671b27877b22b0e9ba3dd2bdaa0a3909c501161f Mon Sep 17 00:00:00 2001
+From: Emmanuel Pescosta <emmanuelpescosta099 at gmail.com>
+Date: Thu, 3 Apr 2014 02:03:14 +0200
+Subject: [PATCH 2/2] Fix crash on startup caused by Dropbox plugin
+
+Create the item state socket on "begin retrieval" and delete
+it again in "end retrieval".
+
+BUG: 332481
+FIXED-IN: 4.13.0
+REVIEW: 117344
+---
+ dropbox/fileviewdropboxplugin.cpp | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/dropbox/fileviewdropboxplugin.cpp b/dropbox/fileviewdropboxplugin.cpp
+index 0026d59..3496ce1 100644
+--- a/dropbox/fileviewdropboxplugin.cpp
++++ b/dropbox/fileviewdropboxplugin.cpp
+@@ -44,17 +44,11 @@ public:
+         contextFilePaths(),
+         controlSocketPath(),
+         controlSocket(new QLocalSocket(parent)),
+-        itemStateSocket(new QLocalSocket),
+         databaseFileWatcher(new QFileSystemWatcher(parent)),
+         contextActions(new KActionCollection(parent))
+     {
+     }
+ 
+-    ~Private()
+-    {
+-        delete itemStateSocket;
+-    }
+-
+     QStringList contextFilePaths;
+     QString controlSocketPath;
+     QPointer<QLocalSocket> controlSocket;
+@@ -106,6 +100,8 @@ bool FileViewDropboxPlugin::beginRetrieval(const QString& directory)
+     qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
+     qRegisterMetaType<QAbstractSocket::SocketState>("QAbstractSocket::SocketState");
+ 
++    d->itemStateSocket = new QLocalSocket;
++
+     return connectWithDropbox(d->itemStateSocket, LongTimeout);
+ }
+ 
+@@ -123,6 +119,7 @@ KVersionControlPlugin2::ItemVersion FileViewDropboxPlugin::itemVersion(const KFi
+ 
+ void FileViewDropboxPlugin::endRetrieval()
+ {
++    delete d->itemStateSocket;
+ }
+ 
+ QList<QAction*> FileViewDropboxPlugin::actions(const KFileItemList& items) const
+-- 
+1.9.1
+

-- 
dolphin-plugins packaging