diff options
author | David Seifert <soap@gentoo.org> | 2016-01-23 15:50:10 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2016-01-23 15:52:10 +0100 |
commit | 2ba7fcbdaa2028dc043e5b748677c9dbadfef4a3 (patch) | |
tree | 54856ac3449e5ce6e5a51963585ae3792602f828 /dev-vcs/rapidsvn/files | |
parent | eclass: Update e-mail address of GNU Emacs project. (diff) | |
download | gentoo-2ba7fcbdaa2028dc043e5b748677c9dbadfef4a3.tar.gz gentoo-2ba7fcbdaa2028dc043e5b748677c9dbadfef4a3.tar.bz2 gentoo-2ba7fcbdaa2028dc043e5b748677c9dbadfef4a3.zip |
dev-vcs/rapidsvn: Add patch for building with subversion 1.9
* Gentoo-Bug: 558572
* Remove use of autotools-utils.eclass
* EAPI=6
Package-Manager: portage-2.2.27
Diffstat (limited to 'dev-vcs/rapidsvn/files')
-rw-r--r-- | dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch | 129 | ||||
-rw-r--r-- | dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch | 4 |
2 files changed, 131 insertions, 2 deletions
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch new file mode 100644 index 000000000000..7c84c8d481fd --- /dev/null +++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch @@ -0,0 +1,129 @@ +Fix compile errors due to hiding of private API in subversion 1.9. +See also: + https://bugs.gentoo.org/show_bug.cgi?id=558572 + https://slackbuilds.org/cgit/slackbuilds/commit/?id=c2df77021b476ca9484772361003df04fa03038a + https://github.com/RapidSVN/RapidSVN/issues/6 + +--- rapidsvn-0.12.1/src/svncpp/client_ls.cpp ++++ rapidsvn-0.12.1/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,6 +93,72 @@ + } + } + ++#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") +--- rapidsvn-0.12.1/include/svncpp/dirent.hpp ++++ rapidsvn-0.12.1/include/svncpp/dirent.hpp +@@ -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 +--- rapidsvn-0.12.1/src/svncpp/dirent.cpp ++++ rapidsvn-0.12.1/src/svncpp/dirent.cpp +@@ -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)) + { + } diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch index 4df855fb79b4..e26ecda15d9b 100644 --- a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch +++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch @@ -1,7 +1,7 @@ Index: src/svncpp/Makefile.am =================================================================== ---- src/svncpp/Makefile.am (revision 7100) -+++ src/svncpp/Makefile.am (working copy) +--- rapidsvn-0.12.1/src/svncpp/Makefile.am (revision 7100) ++++ rapidsvn-0.12.1/src/svncpp/Makefile.am (working copy) @@ -27,3 +27,7 @@ url.cpp \ wc.cpp |