development/rapidsvn: Fix build with subversion 1.9.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 148 insertions, 4 deletions

diff --git a/development/rapidsvn/rapidsvn.SlackBuild b/development/rapidsvn/rapidsvn.SlackBuild
index 35ae6529fc0e..68f194e2db87 100644
--- a/development/rapidsvn/rapidsvn.SlackBuild
+++ b/development/rapidsvn/rapidsvn.SlackBuild
@@ -8,7 +8,7 @@
 
 PRGNAM=rapidsvn
 VERSION=${VERSION:-0.12.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,7 +51,11 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Reworked from KDE kdevplatform to build with subversion 1.9
+# https://quickgit.kde.org/?p=kdevplatform.git&a=commit&h=8117ca137b45816865554d6e86b96d9e633a7e08
+patch -p1 < $CWD/subversion1.9.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -74,8 +78,7 @@ install -m 0644 $CWD/rapidsvn.desktop $PKG/usr/share/applications
 cat src/res/bitmaps/rapidsvn_128x128.png > $PKG/usr/share/pixmaps/rapidsvn.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS CHANGES COPYING ChangeLog FDL.txt GPL.txt HACKING.txt INSTALL \
+cp -a AUTHORS CHANGES COPYING ChangeLog FDL.txt GPL.txt HACKING.txt INSTALL \
   LICENSE.txt NEWS README TRANSLATIONS  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/rapidsvn/subversion1.9.patch b/development/rapidsvn/subversion1.9.patch
new file mode 100644
index 000000000000..74b16349e547
--- /dev/null
+++ b/development/rapidsvn/subversion1.9.patch
@@ -0,0 +1,141 @@
+--- rapidsvn-0.12.1/src/svncpp/client_ls.cpp.old	2012-06-28 13:39:33.000000000 +0700
++++ rapidsvn-0.12.1/src/svncpp/client_ls.cpp	2016-01-05 07:13:33.309097969 +0700
+@@ -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 @@
+   }
+ }
+ 
++#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:
+  */
++
+50c50
+<     Data(const char * _name, svn_dirent_t * dirEntry)
+---
+>     Data(const char * _name, const svn_dirent_t * dirEntry)
+81c81
+<   DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
+---
+>   DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
+153a154
+> 
+--- rapidsvn-0.12.1/include/svncpp/dirent.hpp.old	2012-06-28 13:39:20.000000000 +0700
++++ rapidsvn-0.12.1/include/svncpp/dirent.hpp	2016-01-05 07:11:10.337456433 +0700
+@@ -41,7 +41,7 @@
+     /**
+      * 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 @@
+  * eval: (load-file "../../rapidsvn-dev.el")
+  * end:
+  */
++
+--- rapidsvn-0.12.1/src/svncpp/dirent.cpp.old	2016-01-05 07:22:32.647100607 +0700
++++ rapidsvn-0.12.1/src/svncpp/dirent.cpp	2016-01-05 07:23:15.778197025 +0700
+@@ -47,7 +47,7 @@
+     {
+     }
+ 
+-    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 @@
+   {
+   }
+ 
+-  DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
++  DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
+       : m(new Data(name, DirEntry))
+   {
+   }