Hello community, here is the log from the commit of package kdevplatform for openSUSE:Factory checked in at 2015-08-28 08:26:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdevplatform (Old) and /work/SRC/openSUSE:Factory/.kdevplatform.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdevplatform" Changes: -------- --- /work/SRC/openSUSE:Factory/kdevplatform/kdevplatform.changes 2015-03-05 18:16:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdevplatform.new/kdevplatform.changes 2015-08-28 08:26:28.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 23 16:34:52 UTC 2015 - hrvoje.sen...@gmail.com + +- Added make-subversion-plugin-compile-with-subversion-1.9.patch + +------------------------------------------------------------------- New: ---- make-subversion-plugin-compile-with-subversion-1.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevplatform.spec ++++++ --- /var/tmp/diff_new_pack.sNmWQe/_old 2015-08-28 08:26:29.000000000 +0200 +++ /var/tmp/diff_new_pack.sNmWQe/_new 2015-08-28 08:26:29.000000000 +0200 @@ -26,6 +26,8 @@ Group: Development/Tools/IDE Url: http://www.kdevelop.org Source0: http://download.kde.org/stable/kdevelop/%{kdevelop_version}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM make-subversion-plugin-compile-with-subversion-1.9.patch +Patch0: make-subversion-plugin-compile-with-subversion-1.9.patch BuildRequires: boost-devel BuildRequires: commoncpp2-devel BuildRequires: db-devel @@ -50,6 +52,7 @@ %lang_package %prep %setup -q +%patch0 -p1 echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt ++++++ make-subversion-plugin-compile-with-subversion-1.9.patch ++++++ From: Alex Merry <alex.me...@kde.org> Date: Sun, 16 Aug 2015 22:59:35 +0000 Subject: Make subversion plugin compile with subversion 1.9. X-Git-Url: http://quickgit.kde.org/?p=kdevplatform.git&a=commitdiff&h=8117ca137b45816865554d6e86b96d9e633a7e08 --- 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) --- --- 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 @@ -36,6 +37,8 @@ #include "kdevsvncpp/dirent.hpp" #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 @@ } } +#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") --- a/plugins/subversion/kdevsvncpp/dirent.cpp +++ b/plugins/subversion/kdevsvncpp/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)) { } --- a/plugins/subversion/kdevsvncpp/dirent.hpp +++ b/plugins/subversion/kdevsvncpp/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
