[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rapidsvn/files/, dev-vcs/rapidsvn/

[David Seifert]

commit: 2ba7fcbdaa2028dc043e5b748677c9dbadfef4a3
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan 23 14:50:10 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 23 14:52:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba7fcbd

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

 ...rapidsvn-0.12.1-subversion1.9-private-api.patch | 129 +
 .../files/rapidsvn-0.12.1-svncpp_link.patch|   4 +-
 dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild | 118 +++
 3 files changed, 249 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 000..7c84c8d
--- /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 
++
++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(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
++   _entry,
++   ,
++   *m_context,
++   pool);
++
++if (error != SVN_NO_ERROR)
++  throw ClientException(error);
++
++std::sort(entries.begin(), entries.end(), _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 4df855f..e26ecda 100644
--- a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
+++ 

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rapidsvn/files/, dev-vcs/rapidsvn/

[Pacho Ramos]

commit: 0f3f5afb945bb13bd02ec8865a8793ec5d9ac8f0
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct 24 09:21:59 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct 24 09:22:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3f5afb

dev-vcs/rapidsvn: Support wxGTK:3.0 (#563348)

Package-Manager: portage-2.2.23

 dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch | 192 +
 dev-vcs/rapidsvn/rapidsvn-0.12.1-r2.ebuild | 126 ++
 2 files changed, 318 insertions(+)

diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch 
b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch
new file mode 100644
index 000..2862e30
--- /dev/null
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch
@@ -0,0 +1,192 @@
+Description: Update for wx 3.0.0
+ Update configure to recognise that wx 3.0.0 >= 2.4.2.
+ Fix code for wx API changes.
+Author: Olly Betts 
+Origin: debian
+Forwarded: no
+Last-Update: 2014-04-10
+
+--- a/configure.ac
 b/configure.ac
+@@ -171,6 +171,8 @@
+ ;;
+ [2.[5-9].*])
+   ;;
++3.*)
++  ;;
+ *)
+ AC_MSG_ERROR([wxWidgets >= 2.4.2 required, found version $WX_VERSION])
+   AC_MSG_ERROR([Try --with-wx-config.])
+--- a/src/filelist_ctrl.cpp
 b/src/filelist_ctrl.cpp
+@@ -1029,7 +1029,7 @@
+ 
+ // Workaround for issue 324 (only local+non-flat+update):
+ //   we chdir to the requested dir and pass "." to svn
+-if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode)
++if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode && 
!m->Path.empty())
+ {
+   m->IsRelative = true;
+   ::wxSetWorkingDirectory(m->Path);
+@@ -1606,7 +1606,7 @@
+   }
+ }
+ 
+-inline void
++bool
+ FileListCtrl::SetColumnWidth(const int col, const int width)
+ {
+   m->ColumnWidth[col] = width;
+@@ -1614,8 +1614,9 @@
+   int index = m->ColumnIndex[col];
+   if (index != -1)
+   {
+-wxListCtrl::SetColumnWidth(index, width);
++return wxListCtrl::SetColumnWidth(index, width);
+   }
++  return false;
+ }
+ 
+ int
+--- a/src/filelist_ctrl.hpp
 b/src/filelist_ctrl.hpp
+@@ -118,7 +118,7 @@
+* @param col column number
+* @param width
+*/
+-  void
++  bool
+   SetColumnWidth(const int col, const int width);
+ 
+   /**
+--- a/src/hist_val.cpp
 b/src/hist_val.cpp
+@@ -113,7 +113,7 @@
+   }
+ 
+   // if we have an entry, select it
+-  if (!comboBox->IsEmpty())
++  if (!comboBox->IsListEmpty())
+ comboBox->SetSelection(0, 0);
+ }
+ 
+--- a/src/listener.cpp
 b/src/listener.cpp
+@@ -167,7 +167,7 @@
+ wxMutexLocker lock(mutex);
+ wxString localCertFile = wxFileSelector(
+_("Select Certificate File"), wxT(""), 
wxT(""), wxT(""),
+-   wxT("*.*"), wxOPEN | wxFILE_MUST_EXIST, 
parent);
++   wxT("*.*"), wxFD_OPEN | wxFD_FILE_MUST_EXIST, 
parent);
+ LocalToUtf8(localCertFile, certFile);
+ 
+ dataReceived = !localCertFile.empty();
+--- a/src/log_dlg.cpp
 b/src/log_dlg.cpp
+@@ -211,7 +211,7 @@
+ 
+ for (size_t idx = 0; idx < str.Length(); idx++)
+ {
+-  switch (str[idx])
++  switch ((wchar_t)str[idx])
+   {
+   case wxT('\r'):
+   case wxT('\n'):
+--- a/src/preferences_dlg.cpp
 b/src/preferences_dlg.cpp
+@@ -126,7 +126,7 @@
+ PreferencesDlg::SelectExecutable(const wxString & title, wxTextCtrl * 
textCtrl)
+ {
+   wxFileDialog dlg(this, title, wxEmptyString, wxEmptyString,
+-   EXECUTABLE_WILDCARD, wxOPEN);
++   EXECUTABLE_WILDCARD, wxFD_OPEN);
+   dlg.SetPath(textCtrl->GetValue());
+ 
+   if (dlg.ShowModal() != wxID_OK)
+--- a/src/verblist.cpp
 b/src/verblist.cpp
+@@ -71,7 +71,7 @@
+ const wxString &
+ VerbList::GetName(size_t /*index*/) const
+ {
+-  return wxT("");
++  return wxEmptyString;
+ }
+ 
+ 
+--- a/src/checkout_action.cpp
 b/src/checkout_action.cpp
+@@ -120,7 +120,8 @@
+   pegRevision = svn::Revision(revnum);
+   }
+ 
+-  wxSetWorkingDirectory(m_data.DestFolder);
++  if (!m_data.DestFolder.empty())
++wxSetWorkingDirectory(m_data.DestFolder);
+ 
+   svn::Path repUrlUtf8(PathUtf8(m_data.RepUrl));
+   svn::Path destFolderUtf8(PathUtf8(dest_folder));
+--- a/src/action.cpp
 b/src/action.cpp
+@@ -218,7 +218,9 @@
+ bool
+ Action::Prepare()
+ {
+-  wxSetWorkingDirectory(Utf8ToLocal(m->path.c_str()));
++  const wxString & dir = Utf8ToLocal(m->path.c_str());
++  if (!dir.empty())
++wxSetWorkingDirectory(dir);
+ 
+   return true;
+ }
+--- a/src/cleanup_action.cpp
 b/src/cleanup_action.cpp
+@@ -52,7 +52,9 @@
+   svn::Client client(GetContext());
+   const svn::Path & path = GetPath();
+ 
+-  wxSetWorkingDirectory(Utf8ToLocal(path.c_str()));
++  const wxString & dir = Utf8ToLocal(path.c_str());
++  if (!dir.empty())
++wxSetWorkingDirectory(dir);
+   client.cleanup(path.c_str());
+ 
+   return true;
+---