diff options
Diffstat (limited to 'devel/subcommander2/files')
32 files changed, 0 insertions, 657 deletions
diff --git a/devel/subcommander2/files/patch-configure.ac b/devel/subcommander2/files/patch-configure.ac deleted file mode 100644 index 1face02b85a5..000000000000 --- a/devel/subcommander2/files/patch-configure.ac +++ /dev/null @@ -1,218 +0,0 @@ ---- configure.ac.orig 2009-09-29 06:27:22.000000000 +0900 -+++ configure.ac 2012-05-10 05:20:28.000000000 +0900 -@@ -8,7 +8,8 @@ - AM_CONFIG_HEADER(config.h) - AC_CONFIG_SRCDIR(sublib/version.in.h) - AC_CONFIG_AUX_DIR(ac-helpers) --AM_INIT_AUTOMAKE(subdir-objects) -+AM_INIT_AUTOMAKE(subdir-objects foreign) -+AM_MAINTAINER_MODE - AH_TOP([ - #ifndef SC_CONFIG_H - #define SC_CONFIG_H -@@ -141,14 +142,14 @@ - - AC_LANG(C++) - AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM( -+ [AC_LANG_PROGRAM( - [[ - #include <boost/shared_ptr.hpp> - ]], - [[ - boost::shared_ptr<char> ptr; - ]] -- ), -+ )], - [ - AC_MSG_RESULT([yes]) - ],[ -@@ -190,10 +191,10 @@ - - AC_LANG(C++) - AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM( -- [[#include <neon/ne_socket.h>]], -+ [AC_LANG_PROGRAM( -+ [[#error include <neon/ne_socket.h>]], - [[ne_sock_exit()]] -- ), -+ )], - [ - AC_MSG_RESULT([yes]) - AC_MSG_RESULT([ headers $NEON_INCLUDES]) -@@ -241,14 +242,14 @@ - - AC_LANG(C++) - AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM( -- [[#include <serf-0/serf.h>]], -+ [AC_LANG_PROGRAM( -+ [[#error include <serf-0/serf.h>]], - [[ - #if ! SERF_VERSION_AT_LEAST(0,3,0) - # error no serf! - #endif // serf - ]] -- ), -+ )], - [ - AC_MSG_RESULT([yes]) - AC_MSG_RESULT([ headers $SERF_INCLUDES]) -@@ -273,9 +274,9 @@ - AC_SUBST(NET_LIBS) - - --if test x$found_neon = xno -a x$found_serf = xno; then -- AC_MSG_ERROR([found neither neon nor serf, try setting --with-neon or --with-serf]) --fi -+#if test x$found_neon = xno -a x$found_serf = xno; then -+# AC_MSG_ERROR([found neither neon nor serf, try setting --with-neon or --with-serf]) -+#fi - - - ## -@@ -357,9 +358,9 @@ - goodsvn="bad"; - elif test $SVN_MAJOR -eq 1 -a $SVN_MINOR -le 3; then - goodsvn="bad"; --elif test x$SVN_VERSION == x1.4.4; then -+elif test x$SVN_VERSION = x1.4.4; then - goodsvn="bad"; --elif test x$SVN_VERSION == x1.5.0; then -+elif test x$SVN_VERSION = x1.5.0; then - goodsvn="bad"; - fi - -@@ -368,26 +369,14 @@ - if test $SVN_MAJOR -ge 1; then - - SVN_LIBS_ALL="$SVN_LIBS -lsvn_client-1 -lsvn_wc-1 -lsvn_repos-1" -- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_svn-1 -lsvn_ra_local-1" -- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1 -lsvn_fs_fs-1" -+ SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1" -+ SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1" - SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_delta-1 -lsvn_diff-1" - SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_subr-1" - -- if test $SVN_MINOR -eq 4; then -- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_dav-1" -- elif test $SVN_MINOR -ge 5; then -- if test x$found_neon = xyes; then -- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_neon-1" -- fi -- if test x$found_serf = xyes; then -- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_serf-1" -- fi -- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs_util-1" -- fi -- - fi - --if test x$goodsvn == xok; then -+if test x$goodsvn = xok; then - AC_MSG_RESULT([yes]) - AC_MSG_RESULT([ headers $SVN_INCLUDES]) - AC_MSG_RESULT([ libraries $SVN_LIBS_ALL]) -@@ -443,7 +432,7 @@ - - AC_LANG(C++) - AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM( -+ [AC_LANG_PROGRAM( - [[ - #include <openssl/evp.h> - #include <openssl/err.h> -@@ -454,7 +443,7 @@ - ERR_free_strings(); - unsigned long openssl = OPENSSL_VERSION_NUMBER; - ]] -- ), -+ )], - [ - AC_MSG_RESULT([yes]) - ],[ -@@ -500,14 +489,14 @@ - - AC_LANG(C++) - AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM( -+ [AC_LANG_PROGRAM( - [[ - #include <db.h> - ]], - [[ - unsigned long num = DB_VERSION_MAJOR; - ]] -- ), -+ )], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE([SC_HAVE_BDB],[1],[berkeley db]) -@@ -635,7 +624,7 @@ - - QT_BIN="$qt_path/bin" - QT_PATH="$qt_path" -- QT_LIBPATH="$qt_path/lib" -+ QT_LIBPATH="$qt_path/lib/qt4" - - # extract version numbers of qt - -@@ -669,7 +658,7 @@ - *) - # any other Unix platform directly link with the libs - -- QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/Qt" -+ QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/qt4" - QT_LIBS="-L$QT_LIBPATH -lQt3Support -lQtGui -lQtNetwork -lQtCore" - ;; - esac -@@ -719,10 +708,10 @@ - - AC_LANG(C++) - AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM( -+ [AC_LANG_PROGRAM( - [[#include <QtGui/QWidget>]], - [[QWidget* w = new QWidget();]] -- ), -+ )], - [ - AC_MSG_RESULT([yes]) - AC_MSG_RESULT([ version $QT_VERSION]) -@@ -816,7 +805,7 @@ - - AC_LANG(C++) - AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM( -+ [AC_LANG_PROGRAM( - [[ - #include <vector> - ]], -@@ -825,7 +814,7 @@ - #error no stlport! - #endif // _STLPORT_VERSION - ]] -- ), -+ )], - [ - AC_MSG_RESULT([yes]) - has_stlport="yes" -@@ -853,7 +842,7 @@ - AC_MSG_CHECKING([wether we have a working stl]) - AC_LANG(C++) - AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM( -+ [AC_LANG_PROGRAM( - [[ - ]], - [[ -@@ -861,7 +850,7 @@ - # error needs stlport! - #endif // __GNUC__ - ]] -- ), -+ )], - [ - AC_MSG_RESULT([yes]) - ],[ diff --git a/devel/subcommander2/files/patch-po__Makefile.am b/devel/subcommander2/files/patch-po__Makefile.am deleted file mode 100644 index 66326f5430f2..000000000000 --- a/devel/subcommander2/files/patch-po__Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ ---- po/Makefile.am.orig 2009-05-17 22:56:55.000000000 +0900 -+++ po/Makefile.am 2012-05-10 05:36:32.000000000 +0900 -@@ -1,11 +1,12 @@ - ## process this file with automake to produce Makefile.in - --locdir=$(datadir)/locale -+locdir=$(DESTDIR)/$(datadir)/locale - - all: po-merge de.mo zh_CN.mo - - - install-data-local: -+ mkdir -p $(locdir)/de/LC_MESSAGES/ $(locdir)/zh_CN/LC_MESSAGES/ - cp de.mo $(locdir)/de/LC_MESSAGES/Subcommander.mo - cp zh_CN.mo $(locdir)/zh_CN/LC_MESSAGES/Subcommander.mo - diff --git a/devel/subcommander2/files/patch-subcommander__BookmarkViewItemModel.cpp b/devel/subcommander2/files/patch-subcommander__BookmarkViewItemModel.cpp deleted file mode 100644 index 3f98d66b4e33..000000000000 --- a/devel/subcommander2/files/patch-subcommander__BookmarkViewItemModel.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- subcommander/BookmarkViewItemModel.cpp.orig 2009-09-20 18:24:16.000000000 +0900 -+++ subcommander/BookmarkViewItemModel.cpp 2012-05-10 05:38:50.000000000 +0900 -@@ -219,7 +219,8 @@ - if( !advance ) - return false; - -- _frame = ++_frame % ActiveDecorationFrames; -+ ++_frame; -+ _frame = _frame % ActiveDecorationFrames; - return true; - } - diff --git a/devel/subcommander2/files/patch-subcommander__CommitItemLvi.cpp b/devel/subcommander2/files/patch-subcommander__CommitItemLvi.cpp deleted file mode 100644 index 18ee932a9ac5..000000000000 --- a/devel/subcommander2/files/patch-subcommander__CommitItemLvi.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- subcommander/CommitItemLvi.cpp.orig 2008-07-13 20:40:21.000000000 +0900 -+++ subcommander/CommitItemLvi.cpp 2012-05-10 05:39:57.000000000 +0900 -@@ -32,7 +32,7 @@ - CommitItemLvi::CommitItemLvi( const svn::CommitItemPtr item, - const QString& itemStr ) : super(), _item(item), _itemStr(itemStr) - { -- char* kinds[] = -+ const char* kinds[] = - { - _n("none"), - _n("file"), diff --git a/devel/subcommander2/files/patch-subcommander__DiffSummarizeLvi.cpp b/devel/subcommander2/files/patch-subcommander__DiffSummarizeLvi.cpp deleted file mode 100644 index 0deecfbbb760..000000000000 --- a/devel/subcommander2/files/patch-subcommander__DiffSummarizeLvi.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- subcommander/DiffSummarizeLvi.cpp.orig 2007-08-04 16:22:10.000000000 +0900 -+++ subcommander/DiffSummarizeLvi.cpp 2012-05-10 05:41:05.000000000 +0900 -@@ -13,7 +13,7 @@ - #include "svn/DiffSummarize.h" - - --static char* getSummarizeCode( svn::DiffSummarizeKind kind ) -+static char* const getSummarizeCode( svn::DiffSummarizeKind kind ) - { - switch( kind ) - { -@@ -25,7 +25,7 @@ - } - } - --static char* getNodCode( svn::NodeKind kind ) -+static char* const getNodCode( svn::NodeKind kind ) - { - switch( kind ) - { diff --git a/devel/subcommander2/files/patch-subcommander__DiffViewModel.cpp b/devel/subcommander2/files/patch-subcommander__DiffViewModel.cpp deleted file mode 100644 index 52a5b342edfc..000000000000 --- a/devel/subcommander2/files/patch-subcommander__DiffViewModel.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- subcommander/DiffViewModel.cpp.orig 2008-12-31 00:58:11.000000000 +0900 -+++ subcommander/DiffViewModel.cpp 2012-05-10 05:50:30.000000000 +0900 -@@ -78,7 +78,7 @@ - { - public: - DiffThread( ScModel* model, DiffViewModel::DiffCmds& cmds ) -- : _model(model), _cmds(cmds), _run(true) -+ : _run(true), _model(model), _cmds(cmds) - { - } - diff --git a/devel/subcommander2/files/patch-subcommander__ListWidget.cpp b/devel/subcommander2/files/patch-subcommander__ListWidget.cpp deleted file mode 100644 index a3518f61cfc4..000000000000 --- a/devel/subcommander2/files/patch-subcommander__ListWidget.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- subcommander/ListWidget.cpp.orig 2009-09-13 01:49:22.000000000 +0900 -+++ subcommander/ListWidget.cpp 2012-05-10 06:04:40.000000000 +0900 -@@ -134,7 +134,7 @@ - "<b>help</b>" - "<p>" - "* pressing SHIFT-F1 in the working copy view will display a detailed" --"description of the the columns and their possible values." -+" description of the the columns and their possible values." - "</p>" - "<b>internationalization (i18n)</b>" - "<p>" -@@ -151,6 +151,8 @@ - "set any repository folder as branch or tag folder. subcommander needs" - " only to know WHERE you keep your branches and tags. It does NOT " - "require that they are named 'branches' or 'tags'." -+"<br>* for anonymous (read only) access to the preconfigured subcommander" -+" repository, use the username 'guest' with an empty password." - "</p>" - "</qt>" - ); diff --git a/devel/subcommander2/files/patch-subcommander__MainWindow.cpp b/devel/subcommander2/files/patch-subcommander__MainWindow.cpp deleted file mode 100644 index 4c08c56625b8..000000000000 --- a/devel/subcommander2/files/patch-subcommander__MainWindow.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- subcommander/MainWindow.cpp.orig 2009-01-11 23:46:56.000000000 +0900 -+++ subcommander/MainWindow.cpp 2012-05-10 05:51:23.000000000 +0900 -@@ -260,7 +260,7 @@ - void MainWindow::settings( const QString& selected ) - { - SettingsDialog* sd = new SettingsDialog( _q("subcommander:settings"), this ); -- SettingsInfo* si; -+ //SettingsInfo* si; - - #if 0 - // projects root item diff --git a/devel/subcommander2/files/patch-subcommander__Makefile.am b/devel/subcommander2/files/patch-subcommander__Makefile.am deleted file mode 100644 index 1d2d4e097b1c..000000000000 --- a/devel/subcommander2/files/patch-subcommander__Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ ---- subcommander/Makefile.am.orig 2009-09-20 18:10:18.000000000 +0900 -+++ subcommander/Makefile.am 2012-05-10 05:35:09.000000000 +0900 -@@ -125,9 +125,9 @@ - - bin_PROGRAMS = subcommander - --subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib \ -+subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lsublib -lutil \ - @QT_LIBS@ @SVN_LIBS_ALL@ @STLPORT_LIBS@ @NET_LIBS@ \ -- @APU_LIBS@ @APR_LIBS@ -lsasl2 -lz -+ @APU_LIBS@ @APR_LIBS@ -lz - - subcommander_DEPENDENCIES = ../sublib/libsublib.a ../svn/libsvn.a ../util/libutil.a - diff --git a/devel/subcommander2/files/patch-subcommander__ProjectWizard.cpp b/devel/subcommander2/files/patch-subcommander__ProjectWizard.cpp deleted file mode 100644 index 5acbe3a0b549..000000000000 --- a/devel/subcommander2/files/patch-subcommander__ProjectWizard.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- subcommander/ProjectWizard.cpp.orig 2008-11-15 20:42:38.000000000 +0900 -+++ subcommander/ProjectWizard.cpp 2012-05-10 05:32:51.000000000 +0900 -@@ -363,6 +363,8 @@ - sc::String wcPath = sc::String(field("WcPath").toString().utf8()); - sc::String wcUrl; - -+ if ( wcPath.right(1) == "/" ) wcPath = wcPath.left(wcPath.getByteCnt() - 1); -+ - svn::Client::getUrlFromPath( wcPath, wcUrl ); - - setField( "TrunkUrl", QString::fromUtf8(wcUrl) ); diff --git a/devel/subcommander2/files/patch-subcommander__RpViewTree.cpp b/devel/subcommander2/files/patch-subcommander__RpViewTree.cpp deleted file mode 100644 index 3676f5275d00..000000000000 --- a/devel/subcommander2/files/patch-subcommander__RpViewTree.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- subcommander/RpViewTree.cpp.orig 2008-08-17 17:00:54.000000000 +0900 -+++ subcommander/RpViewTree.cpp 2012-05-10 06:02:40.000000000 +0900 -@@ -113,7 +113,7 @@ - - - RpViewTree::RpViewTree( const sc::String& root, RpViewState* state, ActionStorage* as, QWidget* parent ) --: super(parent), _state(state), _actions(as), _itemData(new RpViewEntryData()) -+: super(parent), _itemData(new RpViewEntryData()), _state(state), _actions(as) - { - setTextElideMode(Qt::ElideMiddle); - setAllColumnsShowFocus(true); diff --git a/devel/subcommander2/files/patch-subcommander__RpViewTreeProxyModel.cpp b/devel/subcommander2/files/patch-subcommander__RpViewTreeProxyModel.cpp deleted file mode 100644 index 9b8a37c27e5c..000000000000 --- a/devel/subcommander2/files/patch-subcommander__RpViewTreeProxyModel.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- subcommander/RpViewTreeProxyModel.cpp.orig 2008-08-09 15:55:24.000000000 +0900 -+++ subcommander/RpViewTreeProxyModel.cpp 2012-05-10 05:52:30.000000000 +0900 -@@ -28,7 +28,7 @@ - { - QVariant value = sourceModel()->data( mapToSource(index), role ); - -- if( index.column() == 0 && role == Qt::DisplayRole || role == Qt::EditRole ) -+ if( (index.column() == 0 && role == Qt::DisplayRole) || role == Qt::EditRole ) - { - QString temp = value.toString(); - diff --git a/devel/subcommander2/files/patch-subcommander__RpViewWhatsThis.cpp b/devel/subcommander2/files/patch-subcommander__RpViewWhatsThis.cpp deleted file mode 100644 index 5c5ad08b7853..000000000000 --- a/devel/subcommander2/files/patch-subcommander__RpViewWhatsThis.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- subcommander/RpViewWhatsThis.cpp.orig 2007-06-26 04:28:49.000000000 +0900 -+++ subcommander/RpViewWhatsThis.cpp 2012-05-10 05:47:04.000000000 +0900 -@@ -19,7 +19,7 @@ - ws += "<b>" + _q("repository copy view columns") + "</b>"; - ws += - "<hr>" -- "<table cellspacing=0>" -+ "<table cellspacing=2>" - "<tr>"; - ws += "<td><nobr>" + _q("name") + "</nobr></td>"; - ws += "<td>" + _q("the name of an item - the header shows its name and the repository url") + "<br></td>" -@@ -51,7 +51,7 @@ - ws += "<td><nobr>" + _q("last committed date") + "</nobr></td>"; - ws += "<td>" + _q("an items last committed date") + "<br></td>" + - "</tr>" -- "<tr>"; -+ "<tr>" - "</table>" - "</qt>"; - diff --git a/devel/subcommander2/files/patch-subcommander__WcSelection.cpp b/devel/subcommander2/files/patch-subcommander__WcSelection.cpp deleted file mode 100644 index 7d0600859dcb..000000000000 --- a/devel/subcommander2/files/patch-subcommander__WcSelection.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- subcommander/WcSelection.cpp.orig 2007-09-16 23:37:07.000000000 +0900 -+++ subcommander/WcSelection.cpp 2012-05-10 05:43:53.000000000 +0900 -@@ -89,8 +89,8 @@ - - svn::WcStatusPtr status = *(_statuss.begin()); - -- return !status->isAddable() -- && status->isChanged() -+ return (!status->isAddable() -+ && status->isChanged()) - || status->isDir(); - } - diff --git a/devel/subcommander2/files/patch-subcommander__WcViewTreeProxyModel.cpp b/devel/subcommander2/files/patch-subcommander__WcViewTreeProxyModel.cpp deleted file mode 100644 index fc25e437f227..000000000000 --- a/devel/subcommander2/files/patch-subcommander__WcViewTreeProxyModel.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- subcommander/WcViewTreeProxyModel.cpp.orig 2009-01-18 18:57:43.000000000 +0900 -+++ subcommander/WcViewTreeProxyModel.cpp 2012-05-10 05:44:52.000000000 +0900 -@@ -33,7 +33,7 @@ - { - QVariant value = sourceModel()->data( mapToSource(index), role ); - -- if( index.column() == 0 && role == Qt::DisplayRole || role == Qt::EditRole ) -+ if( (index.column() == 0 && role == Qt::DisplayRole) || role == Qt::EditRole ) - { - QString temp = value.toString(); - diff --git a/devel/subcommander2/files/patch-subcommander__WcViewWhatsThis.cpp b/devel/subcommander2/files/patch-subcommander__WcViewWhatsThis.cpp deleted file mode 100644 index c9f9a860d0ce..000000000000 --- a/devel/subcommander2/files/patch-subcommander__WcViewWhatsThis.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- subcommander/WcViewWhatsThis.cpp.orig 2009-01-03 02:33:10.000000000 +0900 -+++ subcommander/WcViewWhatsThis.cpp 2012-05-10 05:48:12.000000000 +0900 -@@ -162,7 +162,7 @@ - "</tr>" - "<tr>"; - ws += "<td></td>" -- "<td></td><td>not modified</td><td></td>" "<td>*</td><td>modified</td><td></td>"; -+ "<td></td><td>not modified</td><td></td>" "<td>*</td><td>modified</td><td></td>" - "</tr>" - "</table>" - "</qt>"; diff --git a/devel/subcommander2/files/patch-subcommander__commands__IgnoreCmd.cpp b/devel/subcommander2/files/patch-subcommander__commands__IgnoreCmd.cpp deleted file mode 100644 index 553a66bda859..000000000000 --- a/devel/subcommander2/files/patch-subcommander__commands__IgnoreCmd.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- subcommander/commands/IgnoreCmd.cpp.orig 2008-12-30 23:58:59.000000000 +0900 -+++ subcommander/commands/IgnoreCmd.cpp 2012-05-10 05:53:54.000000000 +0900 -@@ -30,7 +30,7 @@ - - void IgnoreCmd::run() - { -- sc::Error* err; -+ sc::Error* err (0); - - _prgscb->started( _param, getCancel() ); - diff --git a/devel/subcommander2/files/patch-subcommander__commands__ScCmd.cpp b/devel/subcommander2/files/patch-subcommander__commands__ScCmd.cpp deleted file mode 100644 index fe134cc781bf..000000000000 --- a/devel/subcommander2/files/patch-subcommander__commands__ScCmd.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- subcommander/commands/ScCmd.cpp.orig 2008-11-23 01:46:19.000000000 +0900 -+++ subcommander/commands/ScCmd.cpp 2012-05-10 05:55:05.000000000 +0900 -@@ -28,13 +28,13 @@ - _client = client; - _prgscb = progress; - -- apr_time_t t1 = apr_time_now(); -+ //apr_time_t t1 = apr_time_now(); - - //_prgscb->started( getId(), /*_param*/, getCancel() ); - run(); - //_prgscb->finished( getId(), /*_param*/, time ); - -- apr_time_t t2 = apr_time_now(); -+ //apr_time_t t2 = apr_time_now(); - - //_prgscb->time( _id, ((double)(t2-t1)/1000.0) ); - } diff --git a/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp b/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp deleted file mode 100644 index 23f679ad04aa..000000000000 --- a/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- subcommander/settings/ToolsSettingsWidget.cpp.orig 2007-08-19 22:04:03.000000000 +0900 -+++ subcommander/settings/ToolsSettingsWidget.cpp 2012-05-10 05:29:12.000000000 +0900 -@@ -39,7 +39,7 @@ - vl->addStretch(1); - { - // diff command -- QLabel* diffLabel = new QLabel(_q("(visual) diff comand:"), this); -+ QLabel* diffLabel = new QLabel(_q("(visual) diff command:"), this); - QPushButton* diffBi = new QPushButton( _q("reset/builtin"), this ); - _diffEdit = new QLineEdit( this ); - QPushButton* diffEx = new ExternButton( this ); -@@ -59,7 +59,7 @@ - row++; - - // merge command -- QLabel* mergeLabel = new QLabel(_q("(visual) merge comand:"), this); -+ QLabel* mergeLabel = new QLabel(_q("(visual) merge command:"), this); - QPushButton* mergeBi = new QPushButton( _q("reset/builtin"), this ); - _mergeEdit = new QLineEdit( this ); - QPushButton* mergeEx = new ExternButton( this ); diff --git a/devel/subcommander2/files/patch-subcommander__subcommander.cpp b/devel/subcommander2/files/patch-subcommander__subcommander.cpp deleted file mode 100644 index b2bd8bf37e6d..000000000000 --- a/devel/subcommander2/files/patch-subcommander__subcommander.cpp +++ /dev/null @@ -1,32 +0,0 @@ ---- subcommander/subcommander.cpp.orig 2009-09-20 18:10:18.000000000 +0900 -+++ subcommander/subcommander.cpp 2012-05-10 06:03:26.000000000 +0900 -@@ -64,12 +64,6 @@ - #endif // _WIN32 - } - --void exit_neon() --{ --#ifdef _WIN32 -- ne_sock_exit(); --#endif // _WIN32 --} - - - /** main for running the tests. */ -@@ -123,7 +117,7 @@ - // no way to bring up a dialog if something went wrong in the basic - // initialization. - -- fprintf( stderr, e.getError()->getMessage() ); -+ fprintf( stderr, "%s", e.getError()->getMessage().getStr() ); - return EXIT_FAILURE; - } - -@@ -167,7 +161,6 @@ - //config.save(); - - exit_ssl(); -- exit_neon(); - - TargetRepository::teardown(); - stopStackProcess(); diff --git a/devel/subcommander2/files/patch-sublib__CrashHandler.cpp b/devel/subcommander2/files/patch-sublib__CrashHandler.cpp deleted file mode 100644 index a22d0488c288..000000000000 --- a/devel/subcommander2/files/patch-sublib__CrashHandler.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- sublib/CrashHandler.cpp.orig 2007-08-19 22:04:03.000000000 +0900 -+++ sublib/CrashHandler.cpp 2012-05-10 05:56:28.000000000 +0900 -@@ -22,6 +22,7 @@ - #endif // _WIN32 - - -+#if _WIN32 - // helper - static const char* copyString( const sc::String& src ) - { -@@ -37,6 +38,7 @@ - QString sbj = _q("%1 [%2] crashed...").arg(getLongAppName()).arg(SUBCOMMANDER_VERSION); - return sc::String(sbj.toUtf8()); - } -+#endif - - static sc::String getMessage() - { diff --git a/devel/subcommander2/files/patch-sublib__ErrorDialog.cpp b/devel/subcommander2/files/patch-sublib__ErrorDialog.cpp deleted file mode 100644 index 16dcb68875bd..000000000000 --- a/devel/subcommander2/files/patch-sublib__ErrorDialog.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- sublib/ErrorDialog.cpp.orig 2007-08-19 22:04:03.000000000 +0900 -+++ sublib/ErrorDialog.cpp 2012-05-10 05:49:27.000000000 +0900 -@@ -219,6 +219,7 @@ - { - } - -+#if _WIN32 - static const char* copyString( const QString& s ) - { - QByteArray qs = s.toLocal8Bit(); -@@ -226,6 +227,7 @@ - strncpy( result, (const char*)qs, qs.length() ); - return result; - } -+#endif - - void ErrorDialog::send() - { diff --git a/devel/subcommander2/files/patch-sublib__Makefile.am b/devel/subcommander2/files/patch-sublib__Makefile.am deleted file mode 100644 index ff7bc00ffad9..000000000000 --- a/devel/subcommander2/files/patch-sublib__Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- sublib/Makefile.am.orig 2009-09-20 18:10:18.000000000 +0900 -+++ sublib/Makefile.am 2012-05-10 05:23:34.000000000 +0900 -@@ -121,7 +121,7 @@ - $(QT_MOC) $< -o $@ - - resources.cpp : resources.h -- $(QT_RCC) -name sublib -o $@ ../pics/sublib.qrc -+ $(QT_RCC) -name sublib -o $@ $(top_srcdir)/pics/sublib.qrc - - clean-local: - -rm -rf moc diff --git a/devel/subcommander2/files/patch-sublib__MsgHandler.cpp b/devel/subcommander2/files/patch-sublib__MsgHandler.cpp deleted file mode 100644 index 2b8b9e602dbc..000000000000 --- a/devel/subcommander2/files/patch-sublib__MsgHandler.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- sublib/MsgHandler.cpp.orig 2007-08-19 22:04:03.000000000 +0900 -+++ sublib/MsgHandler.cpp 2012-05-10 05:58:52.000000000 +0900 -@@ -16,6 +16,9 @@ - // qt - #include <QtGui/QApplication> - -+// sys -+#include <cstdlib> -+ - - static void MessageHandler( QtMsgType type, const char *msg ) - { -@@ -28,6 +31,7 @@ - msgWarning( getLongAppName(), msg, _q("&Ok") ); - break; - case QtFatalMsg: -+ case QtCriticalMsg: - msgCritical( getLongAppName(), msg, _q("&Abort") ); - abort(); - } diff --git a/devel/subcommander2/files/patch-sublib__Utility.cpp b/devel/subcommander2/files/patch-sublib__Utility.cpp deleted file mode 100644 index 8f8f257f6418..000000000000 --- a/devel/subcommander2/files/patch-sublib__Utility.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- sublib/Utility.cpp.orig 2009-09-20 18:10:18.000000000 +0900 -+++ sublib/Utility.cpp 2012-05-10 05:31:52.000000000 +0900 -@@ -27,6 +27,7 @@ - #endif // _WIN32 - - // sys -+#include <cstdlib> - #include <locale.h> - - diff --git a/devel/subcommander2/files/patch-submerge__Makefile.am b/devel/subcommander2/files/patch-submerge__Makefile.am deleted file mode 100644 index 6766a98420c1..000000000000 --- a/devel/subcommander2/files/patch-submerge__Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- submerge/Makefile.am.orig 2008-06-23 02:19:21.000000000 +0900 -+++ submerge/Makefile.am 2012-05-10 05:28:09.000000000 +0900 -@@ -29,7 +29,7 @@ - - bin_PROGRAMS = submerge - --submerge_LDADD = -L../util -L../svn -L../sublib -lutil -lsvn -lsublib \ -+submerge_LDADD = -L../util -L../svn -L../sublib -lutil -lsublib -lsvn \ - @QT_LIBS@ @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_diff-1 \ - -lsvn_subr-1 @STLPORT_LIBS@ -lz - diff --git a/devel/subcommander2/files/patch-submerge__TextLineNrWidget.cpp b/devel/subcommander2/files/patch-submerge__TextLineNrWidget.cpp deleted file mode 100644 index a93ac2afe7ab..000000000000 --- a/devel/subcommander2/files/patch-submerge__TextLineNrWidget.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- submerge/TextLineNrWidget.cpp.orig 2010-06-20 22:28:45.000000000 +0900 -+++ submerge/TextLineNrWidget.cpp 2012-10-02 17:09:22.000000000 +0900 -@@ -71,7 +71,7 @@ - sc::Size lines = _model->getLineCnt(); - - char buf[16] = ""; -- _lnColumns = sprintf( buf, "%lu", lines ); -+ _lnColumns = sprintf( buf, "%lu", static_cast<unsigned long>(lines) ); - - updateGeometry(); - } diff --git a/devel/subcommander2/files/patch-svn-Property.h b/devel/subcommander2/files/patch-svn-Property.h deleted file mode 100644 index 5d232bffd0ce..000000000000 --- a/devel/subcommander2/files/patch-svn-Property.h +++ /dev/null @@ -1,12 +0,0 @@ ---- svn/Property.h.orig 2006-01-17 15:40:34.000000000 -0500 -+++ svn/Property.h 2009-04-06 14:40:42.000000000 -0400 -@@ -17,8 +17,7 @@ - #include <vector> - - // svn --struct svn_prop_t; -- -+#include <svn_props.h> - - namespace svn - { diff --git a/devel/subcommander2/files/patch-svn__VisualMerge.cpp b/devel/subcommander2/files/patch-svn__VisualMerge.cpp deleted file mode 100644 index 8c6937edcbbb..000000000000 --- a/devel/subcommander2/files/patch-svn__VisualMerge.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- svn/VisualMerge.cpp.orig 2006-01-18 05:40:34.000000000 +0900 -+++ svn/VisualMerge.cpp 2012-05-10 06:01:16.000000000 +0900 -@@ -19,7 +19,7 @@ - - VisualMerge::VisualMerge( svn_client_ctx_t* context, const sc::String& mergeCmd, - apr_pool_t* pool ) --: _context(context), _mergeCmd(mergeCmd), _pool(pool) -+: _context(context), _pool(pool), _mergeCmd(mergeCmd) - { - } - diff --git a/devel/subcommander2/files/patch-svn__WcEntry.cpp b/devel/subcommander2/files/patch-svn__WcEntry.cpp deleted file mode 100644 index 4d7460887387..000000000000 --- a/devel/subcommander2/files/patch-svn__WcEntry.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- svn/WcEntry.cpp.orig 2008-11-09 01:23:48.000000000 +0900 -+++ svn/WcEntry.cpp 2012-10-02 17:12:20.000000000 +0900 -@@ -20,7 +20,7 @@ - { - } - --WcEntry::WcEntry( svn_wc_entry_t* entry ) -+WcEntry::WcEntry( const svn_wc_entry_t* entry ) - { - _name = sc::String(entry->name); - _revision = entry->revision; diff --git a/devel/subcommander2/files/patch-svn__WcEntry.h b/devel/subcommander2/files/patch-svn__WcEntry.h deleted file mode 100644 index 76c2797b16ea..000000000000 --- a/devel/subcommander2/files/patch-svn__WcEntry.h +++ /dev/null @@ -1,11 +0,0 @@ ---- svn/WcEntry.h.orig 2008-11-09 01:23:48.000000000 +0900 -+++ svn/WcEntry.h 2012-10-02 17:12:50.000000000 +0900 -@@ -38,7 +38,7 @@ - WcEntry(); - - public: -- WcEntry( svn_wc_entry_t* ); -+ WcEntry( const svn_wc_entry_t* ); - WcEntry( const WcEntry& src ); - - Revnumber getRevnumber() const; diff --git a/devel/subcommander2/files/patch-util__ErrorCodes.cpp b/devel/subcommander2/files/patch-util__ErrorCodes.cpp deleted file mode 100644 index e57e5b6c394c..000000000000 --- a/devel/subcommander2/files/patch-util__ErrorCodes.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- util/ErrorCodes.cpp.orig 2006-02-13 00:25:44.000000000 +0900 -+++ util/ErrorCodes.cpp 2012-05-10 05:46:12.000000000 +0900 -@@ -28,7 +28,7 @@ - } - } - -- return errors[ErrUnknown]._msg; -+ return errors[ErrUnknown - SC_ERR_START]._msg; - } - - } // namespace |