From owner-svn-ports-all@FreeBSD.ORG Tue Nov 5 22:10:02 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5EE9738D; Tue, 5 Nov 2013 22:10:02 +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 3D93C2AD2; Tue, 5 Nov 2013 22:10:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5MA2wG061883; Tue, 5 Nov 2013 22:10:02 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5MA0If061708; Tue, 5 Nov 2013 22:10:00 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201311052210.rA5MA0If061708@svn.freebsd.org> From: Raphael Kubo da Costa Date: Tue, 5 Nov 2013 22:10:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332918 - in head/deskutils/kdepim44: . 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, 05 Nov 2013 22:10:02 -0000 Author: rakuco Date: Tue Nov 5 22:10:00 2013 New Revision: 332918 URL: http://svnweb.freebsd.org/changeset/ports/332918 Log: - Add a series of patches to fix the build with libc++, some of them imported from deskutils/kdepim4. - Properly set XDG_CONFIG_HOME to /dev/null when building so that no additional files are touched at build time. Added: head/deskutils/kdepim44/files/patch-kleopatra__models__keylistmodel.cpp - copied unchanged from r332875, head/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp head/deskutils/kdepim44/files/patch-kleopatra__uiserver__assuanserverconnection.cpp - copied unchanged from r332875, head/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp head/deskutils/kdepim44/files/patch-kleopatra__utils__classify.cpp - copied unchanged from r332875, head/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp head/deskutils/kdepim44/files/patch-kleopatra__utils__stl_util.h (contents, props changed) head/deskutils/kdepim44/files/patch-kmail__imapaccountbase.h (contents, props changed) head/deskutils/kdepim44/files/patch-kmail__networkaccount.h (contents, props changed) Modified: head/deskutils/kdepim44/Makefile Modified: head/deskutils/kdepim44/Makefile ============================================================================== --- head/deskutils/kdepim44/Makefile Tue Nov 5 22:07:08 2013 (r332917) +++ head/deskutils/kdepim44/Makefile Tue Nov 5 22:10:00 2013 (r332918) @@ -29,6 +29,7 @@ USE_QT4= qmake_build moc_build rcc_build corelib dbus designer gui network qt3support sql webkit USE_OPENLDAP= yes USE_LDCONFIG= yes +MAKE_ENV= XDG_CONFIG_HOME=/dev/null MAN1= kabcclient.1 Copied: head/deskutils/kdepim44/files/patch-kleopatra__models__keylistmodel.cpp (from r332875, head/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kdepim44/files/patch-kleopatra__models__keylistmodel.cpp Tue Nov 5 22:10:00 2013 (r332918, copy of r332875, head/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp) @@ -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() ) Copied: head/deskutils/kdepim44/files/patch-kleopatra__uiserver__assuanserverconnection.cpp (from r332875, head/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kdepim44/files/patch-kleopatra__uiserver__assuanserverconnection.cpp Tue Nov 5 22:10:00 2013 (r332918, copy of r332875, head/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp) @@ -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 + Copied: head/deskutils/kdepim44/files/patch-kleopatra__utils__classify.cpp (from r332875, head/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kdepim44/files/patch-kleopatra__utils__classify.cpp Tue Nov 5 22:10:00 2013 (r332918, copy of r332875, head/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp) @@ -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 + Added: head/deskutils/kdepim44/files/patch-kleopatra__utils__stl_util.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kdepim44/files/patch-kleopatra__utils__stl_util.h Tue Nov 5 22:10:00 2013 (r332918) @@ -0,0 +1,26 @@ +commit 47323edeea633998fff40e5ce1e04e9138e8062f +Author: Andreas Holzammer +Date: Fri Feb 25 16:59:19 2011 +0100 + + dont confuse copy_if and none_of for kdetools and boost + +--- kleopatra/utils/stl_util.h ++++ kleopatra/utils/stl_util.h +@@ -347,7 +347,7 @@ namespace kdtools { + template + 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 + 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 Added: head/deskutils/kdepim44/files/patch-kmail__imapaccountbase.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kdepim44/files/patch-kmail__imapaccountbase.h Tue Nov 5 22:10:00 2013 (r332918) @@ -0,0 +1,20 @@ +libc++ build fix. +--- kmail/imapaccountbase.h ++++ kmail/imapaccountbase.h +@@ -37,7 +37,6 @@ + #include + #include "progressmanager.h" + +-class AccountManager; + class KMFolder; + class KConfigGroup; + class KMMessagePart; +@@ -55,6 +54,8 @@ namespace KPIM { + } + + namespace KMail { ++ class AccountManager; ++ + struct ACLListEntry; + class QuotaInfo; + typedef QVector ACLList; Added: head/deskutils/kdepim44/files/patch-kmail__networkaccount.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kdepim44/files/patch-kmail__networkaccount.h Tue Nov 5 22:10:00 2013 (r332918) @@ -0,0 +1,20 @@ +libc++ build fix. +--- kmail/networkaccount.h ++++ kmail/networkaccount.h +@@ -33,7 +33,6 @@ + + #include + +-class AccountManager; + class KConfig/*Base*/; + class KUrl; + namespace KIO { +@@ -42,6 +41,8 @@ namespace KIO { + + namespace KMail { + ++ class AccountManager; ++ + class NetworkAccount : public KMAccount { + Q_OBJECT + protected: