From owner-svn-ports-all@FreeBSD.ORG Tue Sep 17 12:53:41 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3BD9D5BB; Tue, 17 Sep 2013 12:53:41 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 28BC223AC; Tue, 17 Sep 2013 12:53:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HCrfeG030042; Tue, 17 Sep 2013 12:53:41 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HCre3x030034; Tue, 17 Sep 2013 12:53:40 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201309171253.r8HCre3x030034@svn.freebsd.org> From: Raphael Kubo da Costa Date: Tue, 17 Sep 2013 12:53:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327475 - head/deskutils/kdepim4/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 12:53:41 -0000 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@. 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 + #include + +-#ifdef __GNUC__ ++#ifdef __GLIBCXX__ + #include // for is_sorted + #endif + +@@ -460,7 +460,7 @@ QModelIndex FlatKeyListModel::doMapFromKey( const Key & key, int col ) const { + } + + QList FlatKeyListModel::doAddKeys( const std::vector & keys ) { +-#ifdef __GNUC__ ++#ifdef __GLIBCXX__ + assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint() ) ); + #endif + if ( keys.empty() ) +@@ -717,7 +717,7 @@ static std::vector topological_sort( const std::vector & keys ) { + } + + QList HierarchicalKeyListModel::doAddKeys( const std::vector & keys ) { +-#ifdef __GNUC__ ++#ifdef __GLIBCXX__ + assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint() ) ); + #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 + +-#ifdef __GNUC__ ++#ifdef __GLIBCXX__ + # include // 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() ) ); + #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 + +-#ifdef __GNUC__ ++#ifdef __GLIBCXX__ + # include + #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() ) ); + #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(100) ) ); + #endif +