[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (62026c55552f55e9e003f39f56903e7261ab9da2)

Vlad Glagolev scm at sourcemage.org
Sat Nov 3 18:52:09 EDT 2007


GIT changes to master grimoire by Vlad Glagolev <codex at sourcemage.org>:

 collab/rapidsvn/DEPENDS                               |   71 +++++++++++-------
 collab/rapidsvn/DETAILS                               |   12 +--
 collab/rapidsvn/HISTORY                               |    6 +
 collab/rapidsvn/PRE_BUILD                             |    8 ++
 collab/rapidsvn/patches/patch-src_add_action_cpp      |   18 ++++
 collab/rapidsvn/patches/patch-src_checkout_dlg_cpp    |   11 ++
 collab/rapidsvn/patches/patch-src_export_dlg_cpp      |   11 ++
 collab/rapidsvn/patches/patch-src_import_dlg_cpp      |   12 +++
 collab/rapidsvn/patches/patch-src_listener_cpp        |   12 +++
 collab/rapidsvn/patches/patch-src_log_dlg_cpp         |   11 ++
 collab/rapidsvn/patches/patch-src_merge_dlg_cpp       |   12 +++
 collab/rapidsvn/patches/patch-src_preferences_dlg_cpp |   16 ++++
 collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp  |   47 +++++++++++
 collab/rapidsvn/patches/patch-src_resolve_action_cpp  |   18 ++++
 14 files changed, 232 insertions(+), 33 deletions(-)

New commits:
commit e6f768477de4a8ac5f1bc1bb69aa9792ecd7f5ff
Author: Vlad Glagolev <codex at sourcemage.org>
Commit: Vlad Glagolev <codex at sourcemage.org>

    rapidsvn: updated to 0.9.4 + lots of fixes

diff --git a/collab/rapidsvn/DEPENDS b/collab/rapidsvn/DEPENDS
index 25b40f8..6c83233 100755
--- a/collab/rapidsvn/DEPENDS
+++ b/collab/rapidsvn/DEPENDS
@@ -1,27 +1,44 @@
-depends  apr         &&
-depends  apr-util    &&
-depends  neon        &&
-depends  subversion  &&
-depends  wxgtk       &&
-depends  libxslt     &&
-depends  graphviz    &&
-
-optional_depends  libxslt                 \
-                  ''                      \
-                  ''                      \
-                  'to generate manpages'  &&
-
-optional_depends  docbook-xsl             \
-                  ''                      \
-                  '--with-docbook-xsl=/usr/share/xml/docbook/xsl-stylesheets-1.65'  \
-                  'to generate manpages'  &&
-
-optional_depends  doxygen                                 \
-                  ''                                      \
-                  ''                                      \
-                  'for C++ subversion api documentation'  &&
-
-optional_depends  cppunit                                   \
-                  ''                                        \
-                  ''                                        \
-                  'for RapidSVN regression test execution'
+depends subversion &&
+depends apr-util &&
+depends wxgtk &&
+depends neon &&
+depends apr &&
+
+# dockbook's dir
+local DB_VER=$(installed_version docbook-xsl | cut -c -4)
+local DB_DIR="/usr/share/xml/docbook/xsl-stylesheets-${DB_VER}"
+
+optional_depends graphviz \
+                 "" \
+		 "" \
+		 "for code documentation" &&
+
+optional_depends libxslt \
+                 "" \
+                 "" \
+                 "for manpage creation" &&
+
+optional_depends docbook-xsl \
+                 "--with-docbook-xsl-manpages=${DB_DIR}/manpages/docbook.xsl" \
+                 "" \
+                 "to generate manpages" &&
+
+optional_depends doxygen \
+                 "" \
+                 "" \
+                 "for code documentation" &&
+
+optional_depends cppunit \
+                 "" \
+                 "" \
+                 "for the regression tests" &&
+
+optional_depends db \
+                 "" \
+		 "" \
+		 "for DBD repository access" &&
+
+optional_depends openssl \
+                 "" \
+		 "" \
+		 "for OpenSSL support"
diff --git a/collab/rapidsvn/DETAILS b/collab/rapidsvn/DETAILS
index c687425..55b1a4d 100755
--- a/collab/rapidsvn/DETAILS
+++ b/collab/rapidsvn/DETAILS
@@ -1,13 +1,13 @@
            SPELL=rapidsvn
-         VERSION=0.6.0
+         VERSION=0.9.4
           SOURCE=$SPELL-$VERSION.tar.gz
-          MD5[0]='53cb182f4607f07428ddfd34e2cc7947'
-      LICENSE[0]=APACHE
+   SOURCE_URL[0]=http://www.rapidsvn.org/download/release/$VERSION/$SOURCE
+     SOURCE_HASH=sha512:41c197e1aec1e27052f0700fffbd392e0b9c343898f78f17395e807b3ce3e68559720156e7dd32cc92b9cf4aaca1068f7ba418aa31121ce931c31fa84aa80ecf
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.rapidsvn.org/download/$SOURCE
-        WEB_SITE=http://rapidsvn.tigris.org/
+      LICENSE[0]=GPL
+      LICENCE[1]=LGPL
+        WEB_SITE=http://www.rapidsvn.org/
          ENTERED=20021016
-         UPDATED=20031205
            SHORT='RapidSVN is wxWindows-based Subversion client'
 cat << EOF
 RapidSVN is a cross-platform GUI front-end for the Subversion revision system
diff --git a/collab/rapidsvn/HISTORY b/collab/rapidsvn/HISTORY
index 89fea2f..9087319 100644
--- a/collab/rapidsvn/HISTORY
+++ b/collab/rapidsvn/HISTORY
@@ -1,3 +1,9 @@
+2007-11-04 Vlad Glagolev <codex at sourcemage.org>
+	* DETAILS: updated to 0.9.4, added sha512, cleaned up
+	* DEPENDS: fixed depends, added db, openssl
+	* PRE_BUILD: added ability to be built with wxGTK 2.8
+	  via official patches (from my OpenBSD port)
+
 2007-02-04 Tommy Boatman <tboatman2 at houston.rr.com>
 	* DEPENDS: lowercased wxgtk - bug 11074
 
diff --git a/collab/rapidsvn/PRE_BUILD b/collab/rapidsvn/PRE_BUILD
new file mode 100755
index 0000000..7d3f5df
--- /dev/null
+++ b/collab/rapidsvn/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [[ $(installed_version wxgtk | cut -c -3) == 2.8 ]]; then
+  for p in $(ls ${SCRIPT_DIRECTORY}/patches); do
+    patch -p0 < ${SCRIPT_DIRECTORY}/patches/$p
+  done
+fi
diff --git a/collab/rapidsvn/patches/patch-src_add_action_cpp b/collab/rapidsvn/patches/patch-src_add_action_cpp
new file mode 100644
index 0000000..fdb2972
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_add_action_cpp
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_add_action_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/add_action.cpp.orig	Fri Dec  8 18:47:07 2006
++++ src/add_action.cpp	Mon Oct  8 13:01:47 2007
+@@ -23,11 +23,11 @@
+  * ====================================================================
+  */
+ 
+-// svncpp
+-#include "svncpp/client.hpp"
+-
+ // wxWidgets
+ #include "wx/intl.h"
++
++// svncpp
++#include "svncpp/client.hpp"
+ 
+ // app
+ #include "ids.hpp"
diff --git a/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp b/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp
new file mode 100644
index 0000000..416339a
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_checkout_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/checkout_dlg.cpp.orig	Fri Dec  8 18:47:07 2006
++++ src/checkout_dlg.cpp	Mon Oct  8 13:01:47 2007
+@@ -256,7 +256,6 @@ struct CheckoutDlg::Data (public)
+ 
+ BEGIN_EVENT_TABLE (CheckoutDlg, wxDialog)
+   EVT_BUTTON (ID_BUTTON_BROWSE, CheckoutDlg::OnBrowse)
+-  EVT_BUTTON (wxID_OK, CheckoutDlg::OnOK)
+   EVT_CHECKBOX (ID_USELATEST, CheckoutDlg::OnUseLatest)
+   EVT_TEXT (-1, CheckoutDlg::OnText)
+ //  EVT_BUTTON (wxID_HELP, CheckoutDlg::OnHelp)
diff --git a/collab/rapidsvn/patches/patch-src_export_dlg_cpp b/collab/rapidsvn/patches/patch-src_export_dlg_cpp
new file mode 100644
index 0000000..1c15da6
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_export_dlg_cpp
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_export_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/export_dlg.cpp.orig	Fri Dec  8 18:47:07 2006
++++ src/export_dlg.cpp	Mon Oct  8 13:01:47 2007
+@@ -295,7 +295,6 @@ struct ExportDlg::Data (public)
+ 
+ BEGIN_EVENT_TABLE (ExportDlg, wxDialog)
+   EVT_BUTTON (ID_BUTTON_BROWSE, ExportDlg::OnBrowse)
+-  EVT_BUTTON (wxID_OK, ExportDlg::OnOK)
+   EVT_CHECKBOX (ID_USE_LATEST, ExportDlg::OnUseLatest)
+   EVT_CHECKBOX (ID_NOT_SPECIFIED, ExportDlg::OnNotSpecified)
+   EVT_COMBOBOX (ID_NATIVE_EOL, ExportDlg::OnNativeEol)
diff --git a/collab/rapidsvn/patches/patch-src_import_dlg_cpp b/collab/rapidsvn/patches/patch-src_import_dlg_cpp
new file mode 100644
index 0000000..ecf8e61
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_import_dlg_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_import_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/import_dlg.cpp.orig	Mon Oct  8 13:03:12 2007
++++ src/import_dlg.cpp	Mon Oct  8 13:03:33 2007
+@@ -196,7 +196,7 @@ ImportDlg::OnOk (wxCommandEvent &event)
+     }
+   }
+ 
+-  wxDialog::OnOK(event);
++  wxDialog::EndModal (wxID_OK);
+ }
+ 
+ void
diff --git a/collab/rapidsvn/patches/patch-src_listener_cpp b/collab/rapidsvn/patches/patch-src_listener_cpp
new file mode 100644
index 0000000..2ae1a37
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_listener_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_listener_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/listener.cpp.orig	Fri Dec  8 18:47:07 2006
++++ src/listener.cpp	Mon Oct  8 13:01:47 2007
+@@ -253,7 +253,7 @@ struct Listener::Data (public)
+   void 
+   handleEvent (wxCommandEvent & event)
+   {
+-    switch (event.m_id)
++    switch (event.GetId ())
+     {
+     case SIG_GET_LOG_MSG:
+       callbackGetLogMessage ();
diff --git a/collab/rapidsvn/patches/patch-src_log_dlg_cpp b/collab/rapidsvn/patches/patch-src_log_dlg_cpp
new file mode 100644
index 0000000..ce71f89
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_log_dlg_cpp
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_log_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/log_dlg.cpp.orig	Fri Dec  8 18:47:07 2006
++++ src/log_dlg.cpp	Mon Oct  8 13:01:47 2007
+@@ -32,6 +32,7 @@
+ #include "wx/valgen.h"
+ #include "wx/listctrl.h"
+ #include "wx/splitter.h"
++#include "wx/notebook.h"
+ 
+ 
+ // svncpp
diff --git a/collab/rapidsvn/patches/patch-src_merge_dlg_cpp b/collab/rapidsvn/patches/patch-src_merge_dlg_cpp
new file mode 100644
index 0000000..79e9e78
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_merge_dlg_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_merge_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/merge_dlg.cpp.orig	Mon Oct  8 13:03:19 2007
++++ src/merge_dlg.cpp	Mon Oct  8 13:03:33 2007
+@@ -113,7 +113,7 @@ MergeDlg::OnOK (wxCommandEvent & event)
+     }
+   }
+ 
+-  wxDialog::OnOK(event);
++  wxDialog::EndModal (wxID_OK);
+ }
+ 
+ void
diff --git a/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp b/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp
new file mode 100644
index 0000000..5d7cef4
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_preferences_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/preferences_dlg.cpp.orig	Mon Oct  8 13:03:28 2007
++++ src/preferences_dlg.cpp	Mon Oct  8 13:03:33 2007
+@@ -114,10 +114,8 @@ class ProgramsPanel : public wxPanel (public)
+    */
+   bool SelectExecutable (const wxString & title, wxTextCtrl * textCtrl)
+   {
+-    wxFileDialog dlg (this, title);
+-
+-    dlg.SetStyle (wxHIDE_READONLY | wxOPEN);
+-    dlg.SetWildcard (EXECUTABLE_WILDCARD);
++    wxFileDialog dlg (this, title, wxEmptyString, wxEmptyString, 
++                      EXECUTABLE_WILDCARD, wxOPEN);
+     dlg.SetPath (textCtrl->GetValue ());
+ 
+     if (dlg.ShowModal () != wxID_OK)
diff --git a/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp b/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp
new file mode 100644
index 0000000..c3a4913
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp
@@ -0,0 +1,47 @@
+$OpenBSD: patch-src_rapidsvn_frame_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/rapidsvn_frame.cpp.orig	Fri Dec  8 18:47:07 2006
++++ src/rapidsvn_frame.cpp	Mon Oct  8 13:01:47 2007
+@@ -1150,7 +1150,7 @@ RapidSvnFrame::OnColumnReset (wxCommandEvent &)
+ void
+ RapidSvnFrame::OnColumn (wxCommandEvent & event)
+ {
+-  int eventId = event.m_id;
++  int eventId = event.GetId ();
+   int col = 0;
+   while (col < FileListCtrl::COL_COUNT &&
+          m->ColumnList[col].id != eventId)
+@@ -1192,7 +1192,7 @@ void
+ RapidSvnFrame::OnColumnSorting (wxCommandEvent & event)
+ {
+   // we dont want to list FileListCtrl::COL_NAME/COL_PATH/... here
+-  int col = event.m_id - ID_ColumnSort_Name;
++  int col = event.GetId () - ID_ColumnSort_Name;
+ 
+   m->listCtrl->SetSortColumn (col);
+   m->listCtrl->SetSortAscending (true);
+@@ -1294,7 +1294,7 @@ RapidSvnFrame::OnInfo (wxCommandEvent & WXUNUSED (even
+ void
+ RapidSvnFrame::OnUpdateCommand (wxUpdateUIEvent & updateUIEvent)
+ {
+-  updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.m_id, GetSelectionActionFlags ()));
++  updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.GetId (), GetSelectionActionFlags ()));
+ }
+ 
+ void
+@@ -1514,13 +1514,13 @@ RapidSvnFrame::OnFileCommand (wxCommandEvent & event)
+ {
+   Action* action = NULL;
+ 
+-  if ((event.m_id >= ID_Verb_Min) && (event.m_id <= ID_Verb_Max))
++  if ((event.GetId () >= ID_Verb_Min) && (event.GetId () <= ID_Verb_Max))
+   {
+-    action = new ExternalProgramAction (this, event.m_id - ID_Verb_Min, false);
++    action = new ExternalProgramAction (this, event.GetId () - ID_Verb_Min, false);
+   }
+   else
+   {
+-    switch (event.m_id)
++    switch (event.GetId ())
+     {
+     case ID_Explore:
+       action = new ExternalProgramAction (this, -1, true);
diff --git a/collab/rapidsvn/patches/patch-src_resolve_action_cpp b/collab/rapidsvn/patches/patch-src_resolve_action_cpp
new file mode 100644
index 0000000..5ce1921
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_resolve_action_cpp
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_resolve_action_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/resolve_action.cpp.orig	Fri Dec  8 18:47:07 2006
++++ src/resolve_action.cpp	Mon Oct  8 13:01:47 2007
+@@ -23,11 +23,11 @@
+  * ====================================================================
+  */
+ 
+-// svncpp
+-#include "svncpp/client.hpp"
+-
+ // wxWidgets
+ #include "wx/intl.h"
++
++// svncpp
++#include "svncpp/client.hpp"
+ 
+ // app
+ #include "resolve_action.hpp"



More information about the SM-Commit mailing list