Drop a bunch of ext/algorithm uses for asserts. Add explicit namespace

references to resolve ambiguity with a C++11 STL implementation.

5 files changed, 136 insertions, 21 deletions

diff --git a/misc/kdepim4/distinfo b/misc/kdepim4/distinfo
index 2f5548298e7..5ab3edd1787 100644
--- a/misc/kdepim4/distinfo
+++ b/misc/kdepim4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2013/02/27 19:29:33 markd Exp $
+$NetBSD: distinfo,v 1.19 2013/06/13 14:29:37 joerg Exp $
 
 SHA1 (kdepim-4.4.11.1.tar.bz2) = 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2
 RMD160 (kdepim-4.4.11.1.tar.bz2) = 51394b9dcb3aecc4f108e87de37c21e3af820ee1
@@ -17,10 +17,13 @@ SHA1 (patch-ak) = ba5152d71810759b4bcbe526f7d05eeb8ed8944b
 SHA1 (patch-akregator_plugins_mk4storage_CMakeLists.txt) = 804c66cd07ae0d5f71c4e6ff05be65e6c438e4cb
 SHA1 (patch-al) = 55c77b3ad49e97e304778f56379cabb62af95e07
 SHA1 (patch-am) = 862ed0d6c699146945bb6c5aff8aaec8030ce101
-SHA1 (patch-an) = 3f7da9f127a6bd7f97602b6faa5d2376f18fc7b0
+SHA1 (patch-an) = 90a94a03333b864aa09920bd1bee6aaeadf59336
 SHA1 (patch-ao) = e8c93353d3d73662a55589dc71ceb8d7e03426bd
 SHA1 (patch-ap) = cf6854d683345d51c6d9f19286d73fea693a241a
 SHA1 (patch-kalarm_CMakeLists.txt) = 6799c123f626c50b8bef7ca3e720f899938accdc
+SHA1 (patch-kleopatra_models_keylistmodel.cpp) = 7d9aed6b7c8be03967ef72a3f5db91ef09e856f7
+SHA1 (patch-kleopatra_utils_classify.cpp) = 8387bc4aec59aa416fe98ad0c9eb892103c459b4
+SHA1 (patch-kleopatra_utils_stl__util.h) = e7ef42fc26500a2dbbde3749b8115ba0f3918841
 SHA1 (patch-kmail_imapaccountbase.h) = 0f04ffe6e936bdd8ca5823be3d711a41965c64c8
 SHA1 (patch-kmail_networkaccount.h) = 0e1f95fcabad758fcd75a1c0e6605fcf7e57dd2b
 SHA1 (patch-knode_CMakeLists.txt) = 0f3fcf56b46ff0b82fbadb3602947b6235db5234
diff --git a/misc/kdepim4/patches/patch-an b/misc/kdepim4/patches/patch-an
index b7837fdeea3..c9dbdba2b32 100644
--- a/misc/kdepim4/patches/patch-an
+++ b/misc/kdepim4/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.2 2013/02/27 19:29:33 markd Exp $
+$NetBSD: patch-an,v 1.3 2013/06/13 14:29:37 joerg Exp $
 
 libassuan2 support from
 http://websvn.kde.org/?view=revision&revision=1078528
@@ -21,7 +21,18 @@ Work around moc inability to parse a boost macro
  
  #include <vector>
  #include <map>
-@@ -116,13 +118,18 @@ static const unsigned int INIT_SOCKET_FL
+@@ -91,10 +93,6 @@
+ 
+ #include <errno.h>
+ 
+-#ifdef __GNUC__
+-# include <ext/algorithm> // for is_sorted
+-#endif
+-
+ #ifdef Q_OS_WIN32
+ # include <io.h>
+ # include <process.h>
+@@ -116,13 +114,18 @@ static const unsigned int INIT_SOCKET_FL
  static const int FOR_READING = 0;
  static const unsigned int MAX_ACTIVE_FDS = 32;
  
@@ -42,7 +53,7 @@ Work around moc inability to parse a boost macro
  };
  
  static inline gpg_error_t assuan_process_done_msg( assuan_context_t ctx, gpg_error_t err, const char * err_msg ) {
-@@ -240,7 +247,8 @@ Q_SIGNALS:
+@@ -240,7 +243,8 @@ Q_SIGNALS:
  public Q_SLOTS:
      void slotReadActivity( int ) {
          assert( ctx );
@@ -52,7 +63,7 @@ Work around moc inability to parse a boost macro
              //if ( err == -1 || gpg_err_code(err) == GPG_ERR_EOF ) {
                  topHalfDeletion();
                  if ( nohupedCommands.empty() )
-@@ -296,15 +304,17 @@ private:
+@@ -296,15 +300,17 @@ private:
      }
  
  private:
@@ -72,7 +83,7 @@ Work around moc inability to parse a boost macro
          assert( assuan_get_pointer( ctx_ ) );
  
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -317,7 +327,7 @@ private:
+@@ -317,7 +323,7 @@ private:
          //return gpg_error( GPG_ERR_UNKNOWN_OPTION );
      }
  
@@ -81,7 +92,7 @@ Work around moc inability to parse a boost macro
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
  
-@@ -344,7 +354,7 @@ private:
+@@ -344,7 +350,7 @@ private:
          return assuan_process_done( ctx_, 0 );
      }
  
@@ -90,7 +101,7 @@ Work around moc inability to parse a boost macro
          if ( !QByteArray( line ).trimmed().isEmpty() ) {
              static const QString errorString = i18n("CAPABILITIES does not take arguments");
              return assuan_process_done_msg( ctx_, gpg_error( GPG_ERR_ASS_PARAMETER ), errorString );
-@@ -357,7 +367,7 @@ private:
+@@ -357,7 +363,7 @@ private:
          return assuan_process_done( ctx_, assuan_send_data( ctx_, capabilities, sizeof capabilities - 1 ) );
      }
  
@@ -99,7 +110,7 @@ Work around moc inability to parse a boost macro
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
  
-@@ -386,7 +396,7 @@ private:
+@@ -386,7 +392,7 @@ private:
          return assuan_process_done( ctx_, assuan_send_data( ctx_, ba.constData(), ba.size() ) );
      }
  
@@ -108,7 +119,7 @@ Work around moc inability to parse a boost macro
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
  
-@@ -400,7 +410,7 @@ private:
+@@ -400,7 +406,7 @@ private:
          return assuan_process_done( ctx_, 0 );
      }
  
@@ -117,7 +128,7 @@ Work around moc inability to parse a boost macro
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
  
-@@ -418,7 +428,7 @@ private:
+@@ -418,7 +424,7 @@ private:
  
      // format: TAG (FD|FD=\d+|FILE=...)
      template <bool in, typename T_memptr>
@@ -126,7 +137,7 @@ Work around moc inability to parse a boost macro
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
  
-@@ -498,19 +508,19 @@ private:
+@@ -498,19 +504,19 @@ private:
  
      }
  
@@ -150,7 +161,7 @@ Work around moc inability to parse a boost macro
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
  
-@@ -572,7 +582,7 @@ private:
+@@ -572,7 +578,7 @@ private:
      }
  
      template <typename T_memptr, typename T_memptr2>
@@ -159,7 +170,7 @@ Work around moc inability to parse a boost macro
          assert( assuan_get_pointer( ctx ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx ) );
  
-@@ -656,11 +666,11 @@ private:
+@@ -656,11 +662,11 @@ private:
          return assuan_process_done( ctx, 0 );
      }
  
@@ -173,7 +184,14 @@ Work around moc inability to parse a boost macro
          return recipient_sender_handler( &Private::senders, &Private::informativeSenders, ctx, line, true );
      }
  
-@@ -792,11 +802,15 @@ AssuanServerConnection::Private::Private
+@@ -785,18 +791,18 @@ AssuanServerConnection::Private::Private
+       sessionId( 0 ),
+       factories( factories_ )
+ {
+-#ifdef __GNUC__
+-    assert( __gnu_cxx::is_sorted( factories_.begin(), factories_.end(), _detail::ByName<std::less>() ) );
+-#endif
+-
      if ( fd == ASSUAN_INVALID_FD )
          throw Exception( gpg_error( GPG_ERR_INV_ARG ), "pre-assuan_init_socket_server_ext" );
  
@@ -192,7 +210,7 @@ Work around moc inability to parse a boost macro
  
      // for callbacks, associate the context with this connection:
      assuan_set_pointer( ctx.get(), this );
-@@ -824,34 +838,34 @@ AssuanServerConnection::Private::Private
+@@ -824,34 +830,34 @@ AssuanServerConnection::Private::Private
  
  
      // register our INPUT/OUTPUT/MESSGAE/FILE handlers:
@@ -239,7 +257,7 @@ Work around moc inability to parse a boost macro
          throw Exception( err, "register \"CAPABILITIES\" handler" );
  
      assuan_set_hello_line( ctx.get(), "GPG UI server (Kleopatra/" KLEOPATRA_VERSION_STRING ") ready to serve" );
-@@ -904,20 +918,14 @@ class InquiryHandler : public QObject {
+@@ -904,20 +910,14 @@ class InquiryHandler : public QObject {
      Q_OBJECT
  public:
  
@@ -261,7 +279,7 @@ Work around moc inability to parse a boost macro
      {
          assert( cb_data );
          InquiryHandler * this_ = static_cast<InquiryHandler*>(cb_data);
-@@ -926,26 +934,9 @@ public:
+@@ -926,26 +926,9 @@ public:
          delete this_;
          return 0;
      }
@@ -288,7 +306,7 @@ Work around moc inability to parse a boost macro
  
  Q_SIGNALS:
      void signal( int rc, const QByteArray & data, const QByteArray & keyword );
-@@ -1157,20 +1148,13 @@ int AssuanCommand::inquire( const char *
+@@ -1157,20 +1140,13 @@ int AssuanCommand::inquire( const char *
      if ( d->nohup )
          return makeError( GPG_ERR_INV_OP );
  
@@ -309,7 +327,7 @@ Work around moc inability to parse a boost macro
  }
  
  void AssuanCommand::done( const GpgME::Error& err, const QString & details ) {
-@@ -1262,7 +1246,7 @@ const std::vector<KMime::Types::Mailbox>
+@@ -1262,7 +1238,7 @@ const std::vector<KMime::Types::Mailbox>
      return d->senders;
  }
  
diff --git a/misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp b/misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp
new file mode 100644
index 00000000000..302ea4b9296
--- /dev/null
+++ b/misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp
@@ -0,0 +1,35 @@
+$NetBSD: patch-kleopatra_models_keylistmodel.cpp,v 1.1 2013/06/13 14:29:37 joerg Exp $
+
+--- kleopatra/models/keylistmodel.cpp.orig	2013-06-12 20:30:56.000000000 +0000
++++ kleopatra/models/keylistmodel.cpp
+@@ -67,10 +67,6 @@
+ #include <iterator>
+ #include <cassert>
+ 
+-#ifdef __GNUC__
+-#include <ext/algorithm> // for is_sorted
+-#endif
+-
+ using namespace GpgME;
+ using namespace Kleo;
+ 
+@@ -444,9 +440,6 @@ QModelIndex FlatKeyListModel::doMapFromK
+ }
+ 
+ QList<QModelIndex> FlatKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
+-#ifdef __GNUC__
+-    assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
+-#endif
+     if ( keys.empty() )
+         return QList<QModelIndex>();
+ 
+@@ -701,9 +694,6 @@ static std::vector<Key> topological_sort
+ }
+ 
+ QList<QModelIndex> HierarchicalKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
+-#ifdef __GNUC__
+-    assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
+-#endif
+     if ( keys.empty() )
+         return QList<QModelIndex>();
+ 
diff --git a/misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp b/misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp
new file mode 100644
index 00000000000..94191127e16
--- /dev/null
+++ b/misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp
@@ -0,0 +1,37 @@
+$NetBSD: patch-kleopatra_utils_classify.cpp,v 1.1 2013/06/13 14:29:37 joerg Exp $
+
+--- kleopatra/utils/classify.cpp.orig	2013-06-12 20:27:57.000000000 +0000
++++ kleopatra/utils/classify.cpp
+@@ -43,10 +43,6 @@
+ 
+ #include <boost/range.hpp>
+ 
+-#ifdef __GNUC__
+-# include <ext/algorithm>
+-#endif
+-
+ #include <functional>
+ 
+ using namespace boost;
+@@ -149,10 +145,6 @@ unsigned int Kleo::classify( const QStri
+ }
+ 
+ unsigned int Kleo::classify( const QString & filename ) {
+-#ifdef __GNUC__
+-    assert( __gnu_cxx::is_sorted( begin( classifications ), end( classifications ), ByExtension<std::less>() ) );
+-#endif
+-
+     const QFileInfo fi( filename );
+ 
+     const _classification * const it = qBinaryFind( begin( classifications ), end( classifications ),
+@@ -175,10 +167,6 @@ unsigned int Kleo::classify( const QStri
+ }
+ 
+ unsigned int Kleo::classifyContent( const QByteArray & data ) {
+-#ifdef __GNUC__
+-    assert( __gnu_cxx::is_sorted( begin( content_classifications ), end( content_classifications ), ByContent<std::less>(100) ) );
+-#endif
+-
+     static const char beginString[] = "-----BEGIN ";
+     static const QByteArrayMatcher beginMatcher( beginString );
+     int pos = beginMatcher.indexIn( data );
diff --git a/misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h b/misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h
new file mode 100644
index 00000000000..63594e9e52b
--- /dev/null
+++ b/misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-kleopatra_utils_stl__util.h,v 1.1 2013/06/13 14:29:37 joerg Exp $
+
+--- kleopatra/utils/stl_util.h.orig	2013-06-12 20:35:45.000000000 +0000
++++ kleopatra/utils/stl_util.h
+@@ -347,7 +347,7 @@ namespace kdtools {
+     template <typename O, typename I, typename P>
+     O copy_if( const I & i, P p ) {
+         O o;
+-        copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p );
++        kdtools::copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p );
+         return o;
+     }
+ 
+@@ -390,7 +390,7 @@ namespace kdtools {
+ 
+     template <typename C, typename P>
+     bool none_of( const C & c, P p ) {
+-        return none_of( boost::begin( c ), boost::end( c ), p );
++        return kdtools::none_of( boost::begin( c ), boost::end( c ), p );
+     }
+ 
+     template <typename C, typename B>