Thu Mar 31 09:00:39 2016 UTC ()
Build with subversion 1.9
https://github.com/RapidSVN/RapidSVN/issues/6


(markd)
diff -r1.85 -r1.86 pkgsrc/devel/rapidsvn/Makefile
diff -r1.18 -r1.19 pkgsrc/devel/rapidsvn/distinfo
diff -r0 -r1.1 pkgsrc/devel/rapidsvn/patches/patch-include_svncpp_dirent.hpp
diff -r0 -r1.1 pkgsrc/devel/rapidsvn/patches/patch-src_svncpp_client_ls.cpp
diff -r0 -r1.1 pkgsrc/devel/rapidsvn/patches/patch-src_svncpp_dirent.cpp

cvs diff -r1.85 -r1.86 pkgsrc/devel/rapidsvn/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/rapidsvn/Makefile 2016/03/05 11:28:25 1.85
+++ pkgsrc/devel/rapidsvn/Makefile 2016/03/31 09:00:39 1.86
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.85 2016/03/05 11:28:25 jperkin Exp $ 1# $NetBSD: Makefile,v 1.86 2016/03/31 09:00:39 markd Exp $
2 2
3DISTNAME= rapidsvn-0.12.1 3DISTNAME= rapidsvn-0.12.1
4PKGREVISION= 18 4PKGREVISION= 19
5CATEGORIES= devel x11 scm 5CATEGORIES= devel x11 scm
6MASTER_SITES= http://www.rapidsvn.org/download/release/0.12.1/ 6MASTER_SITES= http://www.rapidsvn.org/download/release/0.12.1/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://rapidsvn.tigris.org/ 9HOMEPAGE= http://rapidsvn.tigris.org/
10COMMENT= Cross-platform Subversion GUI 10COMMENT= Cross-platform Subversion GUI
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13USE_TOOLS+= gmake msgfmt 13USE_TOOLS+= gmake msgfmt
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_LIBTOOL= YES 15USE_LIBTOOL= YES
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17 17

cvs diff -r1.18 -r1.19 pkgsrc/devel/rapidsvn/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/rapidsvn/distinfo 2015/11/03 03:29:19 1.18
+++ pkgsrc/devel/rapidsvn/distinfo 2016/03/31 09:00:39 1.19
@@ -1,7 +1,10 @@ @@ -1,7 +1,10 @@
1$NetBSD: distinfo,v 1.18 2015/11/03 03:29:19 agc Exp $ 1$NetBSD: distinfo,v 1.19 2016/03/31 09:00:39 markd Exp $
2 2
3SHA1 (rapidsvn-0.12.1.tar.gz) = 65d051b5a84fe8b5b0ce906f2ba5cf134a560feb 3SHA1 (rapidsvn-0.12.1.tar.gz) = 65d051b5a84fe8b5b0ce906f2ba5cf134a560feb
4RMD160 (rapidsvn-0.12.1.tar.gz) = dde655f385245ba9346a5fc4a051ef01c5551501 4RMD160 (rapidsvn-0.12.1.tar.gz) = dde655f385245ba9346a5fc4a051ef01c5551501
5SHA512 (rapidsvn-0.12.1.tar.gz) = 892dab56e8ec19c5f26a0ddfab378187bc0325275f9fcf759c12beead70aab17876f7e5920bcf214fc86354faef58244ce25926ba010158f7354cd144e1c4c07 5SHA512 (rapidsvn-0.12.1.tar.gz) = 892dab56e8ec19c5f26a0ddfab378187bc0325275f9fcf759c12beead70aab17876f7e5920bcf214fc86354faef58244ce25926ba010158f7354cd144e1c4c07
6Size (rapidsvn-0.12.1.tar.gz) = 1087511 bytes 6Size (rapidsvn-0.12.1.tar.gz) = 1087511 bytes
 7SHA1 (patch-include_svncpp_dirent.hpp) = 2c1dca7f31227caeb6cc483e9d77e9e1c6e7a074
7SHA1 (patch-src_locale_Makefile.in) = fe0fe3a74e03ef6f1f9c50cf4ae4db393aa21f9f 8SHA1 (patch-src_locale_Makefile.in) = fe0fe3a74e03ef6f1f9c50cf4ae4db393aa21f9f
 9SHA1 (patch-src_svncpp_client_ls.cpp) = 223bc7a2b306ffcb5aa759c7b609af85eab38724
 10SHA1 (patch-src_svncpp_dirent.cpp) = b256d12e890efc2a7555c3ceeabb691e5c4369cf

File Added: pkgsrc/devel/rapidsvn/patches/patch-include_svncpp_dirent.hpp
$NetBSD: patch-include_svncpp_dirent.hpp,v 1.1 2016/03/31 09:00:39 markd Exp $

Build with subversion 1.9
https://github.com/RapidSVN/RapidSVN/issues/6

--- include/svncpp/dirent.hpp.orig	2012-06-28 06:39:20.000000000 +0000
+++ include/svncpp/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
@@ -91,3 +91,4 @@ namespace svn
  * eval: (load-file "../../rapidsvn-dev.el")
  * end:
  */
+

File Added: pkgsrc/devel/rapidsvn/patches/patch-src_svncpp_client_ls.cpp
$NetBSD: patch-src_svncpp_client_ls.cpp,v 1.1 2016/03/31 09:00:39 markd Exp $

Build with subversion 1.9 
https://github.com/RapidSVN/RapidSVN/issues/6 

--- src/svncpp/client_ls.cpp.orig	2012-06-28 06:39:33.000000000 +0000
+++ src/svncpp/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 "svncpp/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,8 +93,75 @@ 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")
  * end:
  */
+

File Added: pkgsrc/devel/rapidsvn/patches/patch-src_svncpp_dirent.cpp
$NetBSD: patch-src_svncpp_dirent.cpp,v 1.1 2016/03/31 09:00:39 markd Exp $

Build with subversion 1.9 
https://github.com/RapidSVN/RapidSVN/issues/6 

--- src/svncpp/dirent.cpp.orig	2012-06-28 06:39:33.000000000 +0000
+++ src/svncpp/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))
   {
   }