[SCM] KDevelop Platform packaging branch, experimental, updated. debian/1.7.3-3

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevplatform.git;a=commitdiff;h=397b8a3

The following commit has been merged in the experimental branch:
commit 397b8a3437501045796d10670414449ebb9eaa64
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Aug 31 17:54:57 2015 +0200

    New upstream patch: upstream_make_subversion_plugin_compile
---
 debian/changelog                                   |   1 +
 debian/patches/series                              |   1 +
 .../upstream_make_subversion_plugin_compile        | 140 +++++++++++++++++++++
 3 files changed, 142 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 64c2736..ec06e7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kdevplatform (1.7.1-1~) UNRELEASED; urgency=medium
   * Remove upstream applied patch: fix_shell_script
   * Add libsoprano-dev build dep.
   * New patch: workaround_boost_ftbfs
+  * New upstream patch: upstream_make_subversion_plugin_compile
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 31 Aug 2015 13:36:03 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index bc8d36c..73f977f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 11_disable_examples_tests.diff
 workaround_boost_ftbfs
+upstream_make_subversion_plugin_compile
diff --git a/debian/patches/upstream_make_subversion_plugin_compile b/debian/patches/upstream_make_subversion_plugin_compile
new file mode 100644
index 0000000..184f368
--- /dev/null
+++ b/debian/patches/upstream_make_subversion_plugin_compile
@@ -0,0 +1,140 @@
+commit 8117ca137b45816865554d6e86b96d9e633a7e08
+Author: Alex Merry <alex.merry at kde.org>
+Date:   Sun Aug 16 23:59:35 2015 +0100
+
+    Make subversion plugin compile with subversion 1.9.
+    
+    The plugin was formerly using private API, which was hidden in 1.9.
+    
+    REVIEW: 124783
+    (cherry picked from commit cfb7f8d89e4749c7b07c7880b3065bf8a86be22c)
+
+diff --git a/plugins/subversion/kdevsvncpp/client_ls.cpp b/plugins/subversion/kdevsvncpp/client_ls.cpp
+index 6cd79bb..95fd6cb 100644
+--- a/plugins/subversion/kdevsvncpp/client_ls.cpp
++++ b/plugins/subversion/kdevsvncpp/client_ls.cpp
+@@ -29,6 +29,7 @@
+ #include "svn_client.h"
+ #include "svn_path.h"
+ #include "svn_sorts.h"
++#include "svn_version.h"
+ //#include "svn_utf.h"
+ 
+ // svncpp
+@@ -37,6 +38,8 @@
+ #include "kdevsvncpp/exception.hpp"
+ 
+ 
++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
++
+ static int
+ compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
+ {
+@@ -90,6 +93,72 @@ namespace svn
+   }
+ }
+ 
++#else
++
++#include <algorithm>
++
++static svn_error_t* store_entry(
++        void *baton,
++        const char *path,
++        const svn_dirent_t *dirent,
++        const svn_lock_t *,
++        const char *abs_path,
++        const char *,
++        const char *,
++        apr_pool_t *scratch_pool)
++{
++  svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton);
++  if (path[0] == '

-- 
KDevelop Platform packaging