svn commit: r327475 - head/deskutils/kdepim4/files

[Raphael Kubo da Costa]

Author: rakuco
Date: Tue Sep 17 12:53:40 2013
New Revision: 327475
URL: http://svnweb.freebsd.org/changeset/ports/327475

Log:
  Add some patches to make the port build with libc++.
  
  This isn't a proper fix, but is good enough while I do something more
  appropriate upstream.
  
  Based on a patch originally written by lstewart at .

Added:
  head/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp   (contents, props changed)
  head/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp   (contents, props changed)
  head/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp   (contents, props changed)

Added: head/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp	Tue Sep 17 12:53:40 2013	(r327475)
@@ -0,0 +1,29 @@
+--- kleopatra/models/keylistmodel.cpp
++++ kleopatra/models/keylistmodel.cpp
+@@ -73,7 +73,7 @@
+ #include <iterator>
+ #include <cassert>
+ 
+-#ifdef __GNUC__
++#ifdef __GLIBCXX__
+ #include <ext/algorithm> // for is_sorted
+ #endif
+ 
+@@ -460,7 +460,7 @@ QModelIndex FlatKeyListModel::doMapFromKey( const Key & key, int col ) const {
+ }
+ 
+ QList<QModelIndex> FlatKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
+-#ifdef __GNUC__
++#ifdef __GLIBCXX__
+     assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
+ #endif
+     if ( keys.empty() )
+@@ -717,7 +717,7 @@ static std::vector<Key> topological_sort( const std::vector<Key> & keys ) {
+ }
+ 
+ QList<QModelIndex> HierarchicalKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
+-#ifdef __GNUC__
++#ifdef __GLIBCXX__
+     assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
+ #endif
+     if ( keys.empty() )

Added: head/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp	Tue Sep 17 12:53:40 2013	(r327475)
@@ -0,0 +1,20 @@
+--- kleopatra/uiserver/assuanserverconnection.cpp
++++ kleopatra/uiserver/assuanserverconnection.cpp
+@@ -96,7 +96,7 @@
+ 
+ #include <errno.h>
+ 
+-#ifdef __GNUC__
++#ifdef __GLIBCXX__
+ # include <ext/algorithm> // for is_sorted
+ #endif
+ 
+@@ -827,7 +827,7 @@ AssuanServerConnection::Private::Private( assuan_fd_t fd_, const std::vector< sh
+       sessionId( 0 ),
+       factories( factories_ )
+ {
+-#ifdef __GNUC__
++#ifdef __GLIBCXX__
+     assert( __gnu_cxx::is_sorted( factories_.begin(), factories_.end(), _detail::ByName<std::less>() ) );
+ #endif
+ 

Added: head/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp	Tue Sep 17 12:53:40 2013	(r327475)
@@ -0,0 +1,29 @@
+--- kleopatra/utils/classify.cpp
++++ kleopatra/utils/classify.cpp
+@@ -43,7 +43,7 @@
+ 
+ #include <boost/range.hpp>
+ 
+-#ifdef __GNUC__
++#ifdef __GLIBCXX__
+ # include <ext/algorithm>
+ #endif
+ 
+@@ -150,7 +150,7 @@ unsigned int Kleo::classify( const QStringList & fileNames ) {
+ }
+ 
+ unsigned int Kleo::classify( const QString & filename ) {
+-#ifdef __GNUC__
++#ifdef __GLIBCXX__
+     assert( __gnu_cxx::is_sorted( begin( classifications ), end( classifications ), ByExtension<std::less>() ) );
+ #endif
+ 
+@@ -179,7 +179,7 @@ unsigned int Kleo::classify( const QString & filename ) {
+ }
+ 
+ unsigned int Kleo::classifyContent( const QByteArray & data ) {
+-#ifdef __GNUC__
++#ifdef __GLIBCXX__
+     assert( __gnu_cxx::is_sorted( begin( content_classifications ), end( content_classifications ), ByContent<std::less>(100) ) );
+ #endif
+