Date: Tue, 5 Nov 2013 22:10:00 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332918 - in head/deskutils/kdepim44: . files Message-ID: <201311052210.rA5MA0If061708@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <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() ) 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 <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 + 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 <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 + 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 <andreas.holzammer@kdab.com> +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 <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> 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 <QByteArray> + #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<KMail::ACLListEntry> 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 <QString> + +-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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311052210.rA5MA0If061708>