Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (12ec04fce3cad485f7db591b2d917a4bcc7bc6c5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (12ec04fce3cad485f7db591b2d917a4bcc7bc6c5)
  • Date: Tue, 9 Jun 2009 15:06:57 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

collab/rapidsvn/DEPENDS | 2
collab/rapidsvn/DETAILS | 4 -
collab/rapidsvn/HISTORY | 5 +
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 ------
graphics/kicad/BUILD | 6 --
graphics/kicad/DEPENDS | 2
graphics/kicad/DETAILS | 11 ++--
graphics/kicad/HISTORY | 7 ++
graphics/kicad/INSTALL | 2
graphics/kicad/PRE_BUILD | 3 -
graphics/kicad/kicad.patch | 17 ------
kde4-apps/digikam4/DETAILS | 4 -
kde4-apps/digikam4/HISTORY | 3 +
23 files changed, 28 insertions(+), 214 deletions(-)

New commits:
commit f2c06f6439311a5acd45537864dff69c221b1e92
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kicad: => 2009-02-16

commit c47ba3088ea021a2e839e5c41e07bbf3bf6adc78
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

digikam4: => 1.0.0-beta1

commit 4e772695728f95caef626467ca4c748829b1e638
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

rapidsvn: => 0.9.8

diff --git a/collab/rapidsvn/DEPENDS b/collab/rapidsvn/DEPENDS
index 6c83233..d5cec4f 100755
--- a/collab/rapidsvn/DEPENDS
+++ b/collab/rapidsvn/DEPENDS
@@ -1,6 +1,6 @@
depends subversion &&
depends apr-util &&
-depends wxgtk &&
+depends WXWIDGET &&
depends neon &&
depends apr &&

diff --git a/collab/rapidsvn/DETAILS b/collab/rapidsvn/DETAILS
index 55b1a4d..8a3a05c 100755
--- a/collab/rapidsvn/DETAILS
+++ b/collab/rapidsvn/DETAILS
@@ -1,8 +1,8 @@
SPELL=rapidsvn
- VERSION=0.9.4
+ VERSION=0.9.8
+
SOURCE_HASH=sha512:e002d489ba453b749e742960b9cd0a148baadbb5a9bcb339fa87e2a346402911d10f6dfe3b4aa9d9e3271834d0c359b63b700b978cc38645c7fceb611cdb6829
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.rapidsvn.org/download/release/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:41c197e1aec1e27052f0700fffbd392e0b9c343898f78f17395e807b3ce3e68559720156e7dd32cc92b9cf4aaca1068f7ba418aa31121ce931c31fa84aa80ecf
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
LICENCE[1]=LGPL
diff --git a/collab/rapidsvn/HISTORY b/collab/rapidsvn/HISTORY
index 8f433c2..f67c61f 100644
--- a/collab/rapidsvn/HISTORY
+++ b/collab/rapidsvn/HISTORY
@@ -1,3 +1,8 @@
+2009-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.8
+ * DEPENDS: wxgtk -> WXWIDGET
+ * PRE_BUILD, patches/*: deleted
+
2007-11-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated to 0.9.4, added sha512, cleaned up
* DEPENDS: fixed depends, added db, openssl
diff --git a/collab/rapidsvn/PRE_BUILD b/collab/rapidsvn/PRE_BUILD
deleted file mode 100755
index 7d3f5df..0000000
--- a/collab/rapidsvn/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index fdb2972..0000000
--- a/collab/rapidsvn/patches/patch-src_add_action_cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 416339a..0000000
--- a/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$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
deleted file mode 100644
index 1c15da6..0000000
--- a/collab/rapidsvn/patches/patch-src_export_dlg_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$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
deleted file mode 100644
index ecf8e61..0000000
--- a/collab/rapidsvn/patches/patch-src_import_dlg_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 2ae1a37..0000000
--- a/collab/rapidsvn/patches/patch-src_listener_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index ce71f89..0000000
--- a/collab/rapidsvn/patches/patch-src_log_dlg_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$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
deleted file mode 100644
index 79e9e78..0000000
--- a/collab/rapidsvn/patches/patch-src_merge_dlg_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 5d7cef4..0000000
--- a/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index c3a4913..0000000
--- a/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-$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
deleted file mode 100644
index 5ce1921..0000000
--- a/collab/rapidsvn/patches/patch-src_resolve_action_cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$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"
diff --git a/graphics/kicad/BUILD b/graphics/kicad/BUILD
index c04853d..e013b8d 100755
--- a/graphics/kicad/BUILD
+++ b/graphics/kicad/BUILD
@@ -1,5 +1 @@
-cd $SOURCE_DIRECTORY &&
-mkdir -p build/release &&
-cd build/release &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr -DCMAKE_BUILD=Release ../../
&&
-make
+cmake_build
diff --git a/graphics/kicad/DEPENDS b/graphics/kicad/DEPENDS
index d4f4159..6ef02a7 100755
--- a/graphics/kicad/DEPENDS
+++ b/graphics/kicad/DEPENDS
@@ -1,4 +1,4 @@
-depends wxgtk &&
+depends WXWIDGET &&
depends boost &&
depends zlib &&
suggest_depends kicad-library "" "" "provides example modules"
diff --git a/graphics/kicad/DETAILS b/graphics/kicad/DETAILS
index 214bd00..4ce2f59 100755
--- a/graphics/kicad/DETAILS
+++ b/graphics/kicad/DETAILS
@@ -1,9 +1,10 @@
SPELL=kicad
- VERSION=20080825
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:7512ab3087f6424d33933b6798c1bce21d49561a649199c4588d2354b7ff68bceb9e563b3b76681c2289784a93f005840a08c05c1c234b854f73cd5a2ffd6985
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ VERSION=2009-02-16
+
SOURCE_HASH=sha512:24ff607eddd8a6d8b3b102a0798c2ee4bf411395f36c8862230be48e3c330438cd61b0bf2d1f9cb288ebc4d7051d8d1ecc69b4e5cb7fd3e5cae027f9c15da1ef
+ SOURCE="${SPELL}-sources-${VERSION}.tar.gz"
+# SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+ SOURCE_URL[0]=http://iut-tice.ujf-grenoble.fr/cao/$SOURCE
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://kicad.sourceforge.net";
LICENSE[0]=GPL
ENTERED=20071231
diff --git a/graphics/kicad/HISTORY b/graphics/kicad/HISTORY
index 1996771..36693cb 100644
--- a/graphics/kicad/HISTORY
+++ b/graphics/kicad/HISTORY
@@ -1,3 +1,10 @@
+2009-06-09 Treeve Jelbert <treeve AT souremage.org>
+ * DETAILS: version 2009-02-16
+ new URL
+ * DEPENDS: wxgtk -> WXWIDGET
+ * PRE_BUILD, kicad.patch, INSTALL: deleted
+ * BUILD: use cmake_build
+
2008-10-01 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 20080825
* BUILD: Uses cmake
diff --git a/graphics/kicad/INSTALL b/graphics/kicad/INSTALL
deleted file mode 100755
index 7c89606..0000000
--- a/graphics/kicad/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY/build/release &&
-make install
diff --git a/graphics/kicad/PRE_BUILD b/graphics/kicad/PRE_BUILD
deleted file mode 100755
index 5e81d3c..0000000
--- a/graphics/kicad/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/kicad.patch
diff --git a/graphics/kicad/kicad.patch b/graphics/kicad/kicad.patch
deleted file mode 100644
index 1b0fec8..0000000
--- a/graphics/kicad/kicad.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- CMakeLists.txt.orig 2008-10-01 15:21:46.000000000 -0500
-+++ CMakeLists.txt 2008-10-01 15:19:26.000000000 -0500
-@@ -113,10 +113,10 @@
-
- # Automagically create version header file.
- # does not work with mingw for me (jpc)
--if(UNIX)
-- include(CreateSVNVersionHeader)
-- create_svn_version_header()
--endif(UNIX)
-+#if(UNIX)
-+# include(CreateSVNVersionHeader)
-+# create_svn_version_header()
-+#endif(UNIX)
-
- if(EXISTS ${CMAKE_SOURCE_DIR}/include/config.h)
- # This file may exist (created by an alternate process to the svn test
above),
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index 7aa4971..644216e 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -7,8 +7,8 @@ if [[ $DIG_SVN == y ]];then
SOURCE=${SPELLX}-$VERSION.tar.bz2

SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/$SPELLX:$SPELLX
else
- VERSION=0.10.0
-
SOURCE_HASH=sha512:72d69ac0cb76ff01de9e51050041775564686c6aef1ed6218dcc311a6eeb643595dc0b8bc55df0aaf3e27322049486f389572d4fee9983270c5859cbac85c6ae
+ VERSION=1.0.0-beta1
+
SOURCE_HASH=sha512:578e045410db8381d4951505ef07afec8b98f4ba170882b56fbe9fa11e660fe6278676f0be56d5ea2ce4e2e030f29c081cd196e80e4eb3666536d2588b2faaad
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
fi
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index c4a4231..67ff5d1 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2009-06-09 Treeve Jelbert <treevesourcemage.org>
+ * DETAILS: version 1.0.0-beta1
+
2009-06-03 Treeve Jelbert <treevesourcemage.org>
* DEPENDS: add optional kdepimlibs4




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (12ec04fce3cad485f7db591b2d917a4bcc7bc6c5), Treeve Jelbert, 06/09/2009

Archive powered by MHonArc 2.6.24.

Top of Page