make subversion plugin compile with subversion 1.9.

bump PKGREVISION.

5 files changed, 141 insertions, 3 deletions

diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 9de1bbac833..5cd9ec850dc 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2015/06/12 10:48:50 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2015/08/29 02:29:53 markd Exp $
 #
 
 DISTNAME=	kdevplatform-1.7.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE:=kdevelop/4.7.0/src/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/devel/kdevplatform/distinfo b/devel/kdevplatform/distinfo
index 86632d16a24..a92f5a58fd8 100644
--- a/devel/kdevplatform/distinfo
+++ b/devel/kdevplatform/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.12 2014/11/17 19:01:13 joerg Exp $
+$NetBSD: distinfo,v 1.13 2015/08/29 02:29:53 markd Exp $
 
 SHA1 (kdevplatform-1.7.0.tar.xz) = 9fc196e7cb09ab33fd5cfbf5af19aa7c513efdc9
 RMD160 (kdevplatform-1.7.0.tar.xz) = bfa2899a954f3aa1529c3250f56c92a7057d7c42
 Size (kdevplatform-1.7.0.tar.xz) = 1900040 bytes
 SHA1 (patch-plugins_classbrowser_documentclassesfolder.h) = b224d053031f21b09f33d35f2e023232338aca4e
 SHA1 (patch-plugins_standardoutputview_outputwidget.cpp) = 39ec8e88a7b39d2b95af3819add5a1cb379df4ea
+SHA1 (patch-plugins_subversion_kdevsvncpp_client_ls.cpp) = a14cc89e0630d41f1bd5bf1140f1efc8adc0fcba
+SHA1 (patch-plugins_subversion_kdevsvncpp_dirent.cpp) = c599846b132f83154a25d9021f7df0582b434347
+SHA1 (patch-plugins_subversion_kdevsvncpp_dirent.hpp) = 1018d36965de6f465ce825d3ded8c9e931bf868e
 SHA1 (patch-sublime_aggregatemodel.cpp) = 76bca4fbe352760eaa570ea242d0e33263481e90
 SHA1 (patch-util_dbus__socket__transformer_main.cpp) = 0acde83eb41e65ba29db6bf5187a5f666cfb06f1
diff --git a/devel/kdevplatform/patches/patch-plugins_subversion_kdevsvncpp_client_ls.cpp b/devel/kdevplatform/patches/patch-plugins_subversion_kdevsvncpp_client_ls.cpp
new file mode 100644
index 00000000000..022c9d3ca28
--- /dev/null
+++ b/devel/kdevplatform/patches/patch-plugins_subversion_kdevsvncpp_client_ls.cpp
@@ -0,0 +1,96 @@
+$NetBSD: patch-plugins_subversion_kdevsvncpp_client_ls.cpp,v 1.1 2015/08/29 02:29:53 markd Exp $
+
+make subversion plugin compile with subversion 1.9.
+
+--- plugins/subversion/kdevsvncpp/client_ls.cpp.orig	2014-08-26 19:49:48.000000000 +0000
++++ 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] == '\0') {
++    if (dirent->kind == svn_node_file) {
++      // for compatibility with svn_client_ls behaviour, listing a file
++      // stores that file name
++      entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent));
++    }
++  } else {
++    entries->push_back(svn::DirEntry(path, dirent));
++  }
++  return SVN_NO_ERROR;
++}
++
++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b)
++{
++  return svn_path_compare_paths(a.name(), b.name()) < 0;
++}
++
++namespace svn
++{
++  DirEntries
++  Client::list(const char * pathOrUrl,
++               svn_opt_revision_t * revision,
++               bool recurse) throw(ClientException)
++  {
++    Pool pool;
++    DirEntries entries;
++
++    svn_error_t * error =
++      svn_client_list3(pathOrUrl,
++                       revision,
++                       revision,
++                       SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse),
++                       SVN_DIRENT_ALL,
++                       FALSE, // fetch locks
++                       FALSE, // include externals
++                       &store_entry,
++                       &entries,
++                       *m_context,
++                       pool);
++
++    if (error != SVN_NO_ERROR)
++      throw ClientException(error);
++
++    std::sort(entries.begin(), entries.end(), &sort_by_path);
++
++    return entries;
++  }
++}
++
++#endif
++
+ /* -----------------------------------------------------------------
+  * local variables:
+  * eval: (load-file "../../rapidsvn-dev.el")
diff --git a/devel/kdevplatform/patches/patch-plugins_subversion_kdevsvncpp_dirent.cpp b/devel/kdevplatform/patches/patch-plugins_subversion_kdevsvncpp_dirent.cpp
new file mode 100644
index 00000000000..1f004955c2c
--- /dev/null
+++ b/devel/kdevplatform/patches/patch-plugins_subversion_kdevsvncpp_dirent.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-plugins_subversion_kdevsvncpp_dirent.cpp,v 1.1 2015/08/29 02:29:53 markd Exp $
+
+make subversion plugin compile with subversion 1.9.
+
+--- plugins/subversion/kdevsvncpp/dirent.cpp.orig	2014-08-26 19:49:48.000000000 +0000
++++ plugins/subversion/kdevsvncpp/dirent.cpp
+@@ -47,7 +47,7 @@ public:
+     {
+     }
+ 
+-    Data(const char * _name, svn_dirent_t * dirEntry)
++    Data(const char * _name, const svn_dirent_t * dirEntry)
+         : name(_name), kind(dirEntry->kind), size(dirEntry->size),
+         hasProps(dirEntry->has_props != 0),
+         createdRev(dirEntry->created_rev), time(dirEntry->time)
+@@ -78,7 +78,7 @@ public:
+   {
+   }
+ 
+-  DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
++  DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
+       : m(new Data(name, DirEntry))
+   {
+   }
diff --git a/devel/kdevplatform/patches/patch-plugins_subversion_kdevsvncpp_dirent.hpp b/devel/kdevplatform/patches/patch-plugins_subversion_kdevsvncpp_dirent.hpp
new file mode 100644
index 00000000000..49a1e26e82f
--- /dev/null
+++ b/devel/kdevplatform/patches/patch-plugins_subversion_kdevsvncpp_dirent.hpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_subversion_kdevsvncpp_dirent.hpp,v 1.1 2015/08/29 02:29:53 markd Exp $
+
+make subversion plugin compile with subversion 1.9.
+
+--- plugins/subversion/kdevsvncpp/dirent.hpp.orig	2014-08-26 19:49:48.000000000 +0000
++++ plugins/subversion/kdevsvncpp/dirent.hpp
+@@ -41,7 +41,7 @@ namespace svn
+     /**
+      * constructor for existing @a svn_dirent_t entries
+      */
+-    DirEntry(const char * name, svn_dirent_t * dirEntry);
++    DirEntry(const char * name, const svn_dirent_t * dirEntry);
+ 
+     /**
+      * copy constructor