kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Remove old deskutils/kdepim44 and deskutils/kdepim44-runtime, they

Browse source 
conflict with new kdepimlibs from KDE SC 4.12
This commit is contained in:
Max Brazhnikov 2014-02-18 14:27:39 +00:00
parent 617f037dbe
commit 5b97d08fc9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=344897
25 changed files with 2 additions and 1968 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MOVED
View file

@ -5452,3 +5452,5 @@ mail/zmailer||2014-02-13|Broken since at least last August
lang/gcc34|lang/gcc|2014-02-13|Superseded by GCC 4.6 or later
x11-toolkits/sakura|x11/sakura|2014-02-16|Moved to a better category
misc/kde4-shared-mime-info||2014-02-18|Removed, the port not needed anymore
deskutils/kdepim44-runtime||2014-02-18|Removed: conflicts with new kdepimlibs
deskutils/kdepim44||2014-02-18|Removed: depends on deskutils/kdepim44-runtime

2
deskutils/Makefile
View file

@ -109,8 +109,6 @@
SUBDIR += kchmviewer-kde4
SUBDIR += kdepim4
SUBDIR += kdepim4-runtime
SUBDIR += kdepim44
SUBDIR += kdepim44-runtime
SUBDIR += kdepimlibs4
SUBDIR += kdeplasma-addons
SUBDIR += kruler

35
deskutils/kdepim44-runtime/Makefile
View file

@ -1,35 +0,0 @@
# Created by: miwi
# $FreeBSD$
PORTNAME= kdepim-runtime
PORTVERSION= 4.4.11.1
PORTREVISION= 3
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/kdepim-${PORTVERSION}/src
DIST_SUBDIR= KDE
PKGNAMESUFFIX= 44
MAINTAINER= kde@FreeBSD.org
COMMENT= Libraries for KDE-PIM applications
LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs
CONFLICTS_INSTALL= kdepim-runtime-4.*
DEPRECATED= Not supported upstream, conflicts with upcoming kdepimlibs-4.12
EXPIRATION_DATE= 2014-02-28
USE_KDE4= pimlibs kdeprefix kdehier automoc4
USES= cmake:outsource shared-mime-info
USE_BZIP2= yes
USE_QT4= qmake_build moc_build rcc_build uic_build \
corelib dbus gui network qtestlib xml
USE_LDCONFIG= yes
NO_STAGE= yes
post-patch:
${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
.include <bsd.port.mk>

2
deskutils/kdepim44-runtime/distinfo
View file

@ -1,2 +0,0 @@
SHA256 (KDE/kdepim-runtime-4.4.11.1.tar.bz2) = 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6
SIZE (KDE/kdepim-runtime-4.4.11.1.tar.bz2) = 619924

11
deskutils/kdepim44-runtime/files/patch-CMakeLists.txt
View file

@ -1,11 +0,0 @@
--- ./CMakeLists.txt.orig 2009-08-10 19:43:44.000000000 +1100
+++ ./CMakeLists.txt 2009-08-10 19:58:07.000000000 +1100
@@ -47,7 +47,7 @@
############### Needed commands before building anything ###############
-include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS})
+include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")

14
deskutils/kdepim44-runtime/files/patch-resources__kolabproxy__CMakeLists.txt
View file

@ -1,14 +0,0 @@
--- ./resources/kolabproxy/CMakeLists.txt.orig 2009-08-04 09:09:41.000000000 +1100
+++ ./resources/kolabproxy/CMakeLists.txt 2009-08-10 19:40:23.000000000 +1100
@@ -1,8 +1,10 @@
project(kolabproxy)
include_directories(
- ${kdepim-runtime_SOURCE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR}
+ ${QT_QTGUI_INCLUDE_DIR}
${QT_QTDBUS_INCLUDE_DIR}
+ ${kdepim-runtime_SOURCE_DIR}
${Boost_INCLUDE_DIR}
)

33
deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt
View file

@ -1,33 +0,0 @@
--- ./xml/CMakeLists.txt.orig 2009-06-03 22:54:34.000000000 +1100
+++ ./xml/CMakeLists.txt 2009-07-05 22:39:32.000000000 +1100
@@ -1,21 +1,24 @@
project (akonadixml)
-if ( LIBXML2_FOUND )
- add_definitions( -DHAVE_LIBXML2 )
-endif ( LIBXML2_FOUND )
-
-add_subdirectory( tests )
-
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
include_directories(
+ ${QT_QTGUI_INCLUDE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR}
+ ${QT_QTXML_INCLUDE_DIR}
${AKONADI_INCLUDE_DIR}
${KDE4_INCLUDES}
${KDEPIMLIBS_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
)
+if ( LIBXML2_FOUND )
+ add_definitions( -DHAVE_LIBXML2 )
+endif ( LIBXML2_FOUND )
+
+add_subdirectory( tests )
+
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
set( akonadixml_SRCS

46
deskutils/kdepim44-runtime/files/qt3to4headers.txt
View file

@ -1,46 +0,0 @@
s/<q3dragobject.h>/<Q3DragObject>/g
s/<q3frame.h>/<Q3Frame>/g
s/<q3groupbox.h>/<Q3GroupBox>/g
s/<q3hgroupbox.h>/<Q3HGroupBox>/g
s/<q3listview.h>/<Q3ListView>/g
s/<q3popupmenu.h>/<Q3PopupMenu>/g
s/<q3process.h>/<Q3Process>/g
s/<q3progressdialog.h>/<Q3ProgressDialog>/g
s/<q3strlist.h>/<Q3StrList>/g
s/<q3textview.h>/<Q3TextView>/g
s/<q3vbox.h>/<Q3VBox>/g
s/<q3vgroupbox.h>/<Q3VGroupBox>/g
s/<qapplication.h>/<QApplication>/g
s/<qbuttongroup.h>/<QButtonGroup>/g
s/<qcheckbox.h>/<QCheckBox>/g
s/<qcolor.h>/<QColor>/g
s/<qcombobox.h>/<QComboBox>/g
s/<qcursor.h>/<QCursor>/g
s/<qdesktopwidget.h>/<QDesktopWidget>/g
s/<qdir.h>/<QDir>/g
s/<qevent.h>/<QEvent>/g
s/<qfile.h>/<QFile>/g
s/<qfileinfo.h>/<QFileInfo>/g
s/<qfont.h>/<QFont>/g
s/<qfontmetrics.h>/<QFontMetrics>/g
s/<qgroupbox.h>/<QGroupBox>/g
s/<qimage.h>/<QImage>/g
s/<qlabel.h>/<QLabel>/g
s/<qlayout.h>/<QLayout>/g
s/<qlineedit.h>/<QLineEdit>/g
s/<qmatrix.h>/<QMatrix>/g
s/<qobject.h>/<QObject>/g
s/<qpainter.h>/<QPainter>/g
s/<qpalette.h>/<QPalette>/g
s/<qpixmap.h>/<QPixmap>/g
s/<qpointer.h>/<QPointer>/g
s/<qpushbutton.h>/<QPushButton>/g
s/<qradiobutton.h>/<QRadioButton>/g
s/<qregexp.h>/<QRegExp>/g
s/<qspinbox.h>/<QSpinBox>/g
s/<qstring.h>/<QString>/g
s/<qtextcodec.h>/<QTextCodec>/g
s/<qtextstream.h>/<QTextStream>/g
s/<qtimer.h>/<QTimer>/g
s/<qtooltip.h>/<QToolTip>/g
s/<qwidget.h>/<QWidget>/g

8
deskutils/kdepim44-runtime/pkg-descr
View file

@ -1,8 +0,0 @@
KDE4 is the K Desktop Environment for Unix, Windows, and Mac OS X.
These kde4 ports intend to provide early access to KDE4 for FreeBSD
developers, porters and beta testers. Use at your own risk!
This package provides PIM runtime libs for KDE4.
WWW: http://www.kde.org/

105
deskutils/kdepim44-runtime/pkg-plist
View file

@ -1,105 +0,0 @@
bin/akonadi2xml
bin/akonadi_birthdays_resource
bin/akonadi_contacts_resource
bin/akonadi_ical_resource
bin/akonadi_imap_resource
bin/akonadi_kabc_resource
bin/akonadi_kcal_resource
bin/akonadi_knut_resource
bin/akonadi_kolabproxy_resource
bin/akonadi_localbookmarks_resource
bin/akonadi_maildir_resource
bin/akonadi_maildispatcher_agent
bin/akonadi_mailtransport_dummy_resource
bin/akonadi_mbox_resource
bin/akonadi_microblog_resource
bin/akonadi_nepomuk_calendar_feeder
bin/akonadi_nepomuk_contact_feeder
bin/akonadi_nepomuktag_resource
bin/akonadi_nntp_resource
bin/akonadi_notes_resource
bin/akonadi_pop3_resource
bin/akonadi_vcard_resource
bin/akonadi_vcarddir_resource
bin/akonaditray
bin/kaddressbookmigrator
bin/kmail-migrator
bin/kres-migrator
lib/kde4/akonadi_serializer_addressee.so
lib/kde4/akonadi_serializer_bookmark.so
lib/kde4/akonadi_serializer_contactgroup.so
lib/kde4/akonadi_serializer_kcal.so
lib/kde4/akonadi_serializer_kcalcore.so
lib/kde4/akonadi_serializer_mail.so
lib/kde4/akonadi_serializer_microblog.so
lib/kde4/kabc_akonadi.so
lib/kde4/kcal_akonadi.so
lib/kde4/kcm_akonadi.so
lib/kde4/kcm_akonadi_resources.so
lib/kde4/kcm_akonadi_server.so
lib/kde4/kio_akonadi.so
lib/libakonadi-xml.so
lib/libakonadi-xml.so.5
lib/libakonadi-xml.so.5.0.1
lib/libkdepim-copy.so
lib/libkdepim-copy.so.5
lib/libkdepim-copy.so.5.0.1
lib/libmaildir.so
lib/libmaildir.so.5
lib/libmaildir.so.5.0.1
lib/libmbox.so
lib/libmbox.so.5
lib/libmbox.so.5.0.1
share/akonadi/agents/birthdaysresource.desktop
share/akonadi/agents/contactsresource.desktop
share/akonadi/agents/icalresource.desktop
share/akonadi/agents/imapresource.desktop
share/akonadi/agents/kabcresource.desktop
share/akonadi/agents/kcalresource.desktop
share/akonadi/agents/knutresource.desktop
share/akonadi/agents/kolabproxyresource.desktop
share/akonadi/agents/localbookmarksresource.desktop
share/akonadi/agents/maildirresource.desktop
share/akonadi/agents/maildispatcheragent.desktop
share/akonadi/agents/mboxresource.desktop
share/akonadi/agents/microblog.desktop
share/akonadi/agents/mtdummyresource.desktop
share/akonadi/agents/nepomukcalendarfeeder.desktop
share/akonadi/agents/nepomukcontactfeeder.desktop
share/akonadi/agents/nepomuktagresource.desktop
share/akonadi/agents/nntpresource.desktop
share/akonadi/agents/notesresource.desktop
share/akonadi/agents/pop3resource.desktop
share/akonadi/agents/vcarddirresource.desktop
share/akonadi/agents/vcardresource.desktop
share/applications/kde4/akonaditray.desktop
share/apps/akonadi/akonadi-xml.xsd
share/apps/akonadi/firstrun/defaultaddressbook
share/apps/akonadi/firstrun/defaultcalendar
share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
share/apps/akonadi_knut_resource/knut-template.xml
share/autostart/kaddressbookmigrator.desktop
share/config/kmail-migratorrc
share/config/kres-migratorrc
share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
share/icons/hicolor/64x64/apps/kolab.png
share/kde4/services/akonadi.protocol
share/kde4/services/kcm_akonadi.desktop
share/kde4/services/kcm_akonadi_resources.desktop
share/kde4/services/kcm_akonadi_server.desktop
share/kde4/services/kresources/kabc/akonadi.desktop
share/kde4/services/kresources/kcal/akonadi.desktop
share/mime/packages/kdepim-mime.xml
@dirrm share/apps/akonadi_knut_resource
@dirrm share/apps/akonadi/plugins/serializer
@dirrm share/apps/akonadi/plugins
@dirrm share/apps/akonadi/firstrun
@dirrmtry share/apps/akonadi
@dirrm share/akonadi/agents
@dirrm share/akonadi

43
deskutils/kdepim44/Makefile
View file

@ -1,43 +0,0 @@
# Created by: miwi
# $FreeBSD$
PORTNAME= kdepim
PORTVERSION= 4.4.11.1
PORTREVISION= 7
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/kdepim-${PORTVERSION}/src
DIST_SUBDIR= KDE
PKGNAMESUFFIX= 44
MAINTAINER= kde@FreeBSD.org
COMMENT= Libraries for KDE-PIM applications
LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme \
libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
libboost_thread.so:${PORTSDIR}/devel/boost-libs \
libqca.so:${PORTSDIR}/devel/qca
RUN_DEPENDS= ${KDE4_PREFIX}/bin/akonadi_mbox_resource:${PORTSDIR}/deskutils/kdepim44-runtime
CONFLICTS_INSTALL= kdepim-4.*
DEPRECATED= Not supported upstream, conflicts with upcoming kdepimlibs-4.12
EXPIRATION_DATE= 2014-02-28
USE_KDE4= kdelibs pimlibs \
akonadi kdeprefix kdehier automoc4 oxygen
USES= cmake:outsource
USE_BZIP2= yes
USE_QT4= qmake_build moc_build rcc_build uic_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
#cannot be built with assuan2
CMAKE_ARGS+= -DWITH_Assuan:BOOL=off
NO_STAGE= yes
.include <bsd.port.mk>

2
deskutils/kdepim44/distinfo
View file

@ -1,2 +0,0 @@
SHA256 (KDE/kdepim-4.4.11.1.tar.bz2) = a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
SIZE (KDE/kdepim-4.4.11.1.tar.bz2) = 8964708

418
deskutils/kdepim44/files/patch-clang
View file

@ -1,418 +0,0 @@
--- ./kmail/accountmanager.cpp.orig 2012-05-27 10:22:58.000000000 +0200
+++ ./kmail/accountmanager.cpp 2012-05-27 10:26:46.000000000 +0200
@@ -22,10 +22,8 @@
#include <krandom.h>
#include <kconfiggroup.h>
-using namespace KMail;
-
//-----------------------------------------------------------------------------
-AccountManager::AccountManager()
+KMail::AccountManager::AccountManager()
:QObject(), mNewMailArrived( false ), mInteractive( false ),
mTotalNewMailsArrived( 0 ), mDisplaySummary( false )
{
@@ -34,19 +32,21 @@
}
//-----------------------------------------------------------------------------
-AccountManager::~AccountManager()
+KMail::AccountManager::~AccountManager()
{
qDeleteAll(mAcctList);
}
//-----------------------------------------------------------------------------
-QStringList AccountManager::accountGroups() const
+QStringList
+KMail::AccountManager::accountGroups() const
{
return KMKernel::config()->groupList().filter( QRegExp( "Account \\d+" ) );
}
//-----------------------------------------------------------------------------
-void AccountManager::writeConfig( bool withSync )
+void
+KMail::AccountManager::writeConfig( bool withSync )
{
KSharedConfig::Ptr config = KMKernel::config();
@@ -78,7 +78,8 @@
//-----------------------------------------------------------------------------
-void AccountManager::readConfig(void)
+void
+KMail::AccountManager::readConfig(void)
{
// Delete all in-memory accounts
for ( AccountList::Iterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it )
@@ -134,7 +135,8 @@
//-----------------------------------------------------------------------------
-void AccountManager::singleCheckMail(KMAccount *account, bool interactive)
+void
+KMail::AccountManager::singleCheckMail(KMAccount *account, bool interactive)
{
mNewMailArrived = false;
mInteractive = interactive;
@@ -158,7 +160,8 @@
}
//-----------------------------------------------------------------------------
-void AccountManager::processNextCheck( bool _newMail )
+void
+KMail::AccountManager::processNextCheck( bool _newMail )
{
kDebug() << "processNextCheck, remaining" << mAcctTodo.count();
if ( _newMail )
@@ -232,7 +235,8 @@
}
//-----------------------------------------------------------------------------
-KMAccount* AccountManager::create( const KAccount::Type aType,
+KMAccount*
+KMail::AccountManager::create( const KAccount::Type aType,
const QString &aName, uint id )
{
KMAccount* act = 0;
@@ -265,7 +269,8 @@
//-----------------------------------------------------------------------------
-void AccountManager::add( KMAccount *account )
+void
+KMail::AccountManager::add( KMAccount *account )
{
if ( account ) {
mAcctList.append( account );
@@ -290,7 +295,8 @@
//-----------------------------------------------------------------------------
-KMAccount* AccountManager::findByName(const QString &aName) const
+KMAccount*
+KMail::AccountManager::findByName(const QString &aName) const
{
if ( aName.isEmpty() ) return 0;
@@ -302,7 +308,8 @@
//-----------------------------------------------------------------------------
-KMAccount* AccountManager::find( const uint id ) const
+KMAccount*
+KMail::AccountManager::find( const uint id ) const
{
if (id == 0) return 0;
for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) {
@@ -312,19 +319,22 @@
}
//-----------------------------------------------------------------------------
-QList<KMAccount*>::iterator AccountManager::begin()
+QList<KMAccount*>::iterator
+KMail::AccountManager::begin()
{
return mAcctList.begin();
}
//-----------------------------------------------------------------------------
-QList<KMAccount*>::iterator AccountManager::end()
+QList<KMAccount*>::iterator
+KMail::AccountManager::end()
{
return mAcctList.end();
}
//-----------------------------------------------------------------------------
-bool AccountManager::remove( KMAccount* acct )
+bool
+KMail::AccountManager::remove( KMAccount* acct )
{
if( !acct )
return false;
@@ -334,7 +344,8 @@
}
//-----------------------------------------------------------------------------
-void AccountManager::checkMail( bool _interactive )
+void
+KMail::AccountManager::checkMail( bool _interactive )
{
mNewMailArrived = false;
@@ -356,12 +367,14 @@
//-----------------------------------------------------------------------------
-void AccountManager::singleInvalidateIMAPFolders(KMAccount *account) {
+void
+KMail::AccountManager::singleInvalidateIMAPFolders(KMAccount *account) {
account->invalidateIMAPFolders();
}
-void AccountManager::invalidateIMAPFolders()
+void
+KMail::AccountManager::invalidateIMAPFolders()
{
for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it )
singleInvalidateIMAPFolders( *it );
@@ -369,7 +382,8 @@
//-----------------------------------------------------------------------------
-QStringList AccountManager::getAccounts() const
+QStringList
+KMail::AccountManager::getAccounts() const
{
QStringList strList;
for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) {
@@ -379,7 +393,8 @@
}
//-----------------------------------------------------------------------------
-void AccountManager::intCheckMail(int item, bool _interactive)
+void
+KMail::AccountManager::intCheckMail(int item, bool _interactive)
{
mNewMailArrived = false;
mTotalNewMailsArrived = 0;
@@ -391,7 +406,8 @@
//-----------------------------------------------------------------------------
-void AccountManager::addToTotalNewMailCount( const QMap<QString, int> & newInFolder )
+void
+KMail::AccountManager::addToTotalNewMailCount( const QMap<QString, int> & newInFolder )
{
for ( QMap<QString, int>::const_iterator it = newInFolder.begin();
it != newInFolder.end(); ++it ) {
@@ -404,7 +420,8 @@
}
//-----------------------------------------------------------------------------
-uint AccountManager::createId()
+uint
+KMail::AccountManager::createId()
{
QList<uint> usedIds;
for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) {
@@ -422,7 +439,8 @@
}
//-----------------------------------------------------------------------------
-void AccountManager::cancelMailCheck()
+void
+KMail::AccountManager::cancelMailCheck()
{
for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) {
(*it)->cancelMailCheck();
@@ -431,7 +449,8 @@
//-----------------------------------------------------------------------------
-void AccountManager::readPasswords()
+void
+KMail::AccountManager::readPasswords()
{
for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) {
NetworkAccount *acct = dynamic_cast<NetworkAccount*>( (*it) );
@@ -441,7 +460,8 @@
}
//-----------------------------------------------------------------------------
-bool AccountManager::isUnique( const QString &aName ) const
+bool
+KMail::AccountManager::isUnique( const QString &aName ) const
{
for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) {
if ( (*it)->name() == aName ) return false;
@@ -450,7 +470,8 @@
}
//-----------------------------------------------------------------------------
-QString AccountManager::makeUnique( const QString &name ) const
+QString
+KMail::AccountManager::makeUnique( const QString &name ) const
{
int suffix = 1;
QString result = name;
--- ./kmail/accountwizard.cpp.orig 2012-05-27 10:40:25.000000000 +0200
+++ ./kmail/accountwizard.cpp 2012-05-27 10:41:35.000000000 +0200
@@ -416,7 +416,7 @@
name[ 0 ] = name[ 0 ].toUpper();
}
- AccountManager *manager = mKernel->acctMgr();
+ KMail::AccountManager *manager = mKernel->acctMgr();
if ( !manager->isUnique( name ) ) {
name = manager->makeUnique( name );
}
@@ -523,7 +523,7 @@
void AccountWizard::createAccount()
{
// create incoming account
- AccountManager *acctManager = mKernel->acctMgr();
+ KMail::AccountManager *acctManager = mKernel->acctMgr();
switch ( mTypeBox->type() ) {
case AccountTypeBox::Local:
--- ./kmail/kmacctcachedimap.h.orig 2012-05-27 10:10:49.000000000 +0200
+++ ./kmail/kmacctcachedimap.h 2012-05-27 10:12:06.000000000 +0200
@@ -194,8 +194,8 @@
bool sentCustomLoginCommand() const { return mSentCustomLoginCommand; }
protected:
- friend class ::AccountManager;
- KMAcctCachedImap(AccountManager* owner, const QString& accountName, uint id);
+ friend class KMail::AccountManager;
+ KMAcctCachedImap(KMail::AccountManager* owner, const QString& accountName, uint id);
protected slots:
/** new-mail-notification for the current folder (is called via folderComplete) */
--- ./kmail/kmaccount.cpp.orig 2012-05-27 10:15:32.000000000 +0200
+++ ./kmail/kmaccount.cpp 2012-05-27 10:18:19.000000000 +0200
@@ -90,7 +90,7 @@
//-----------------------------------------------------------------------------
-KMAccount::KMAccount(AccountManager* aOwner, const QString& aName, uint id)
+KMAccount::KMAccount(KMail::AccountManager* aOwner, const QString& aName, uint id)
: KAccount( id, aName ),
mTrash(KMKernel::self()->trashFolder()->idString()),
mOwner(aOwner),
@@ -440,11 +440,13 @@
//-----------------------------------------------------------------------------
void KMAccount::mailCheck()
{
+ KMail::AccountManager *acctmgr;
+
if (mTimer)
mTimer->stop();
if ( kmkernel ) {
- AccountManager *acctmgr = kmkernel->acctMgr();
+ acctmgr = kmkernel->acctMgr();
if ( acctmgr ) {
acctmgr->singleCheckMail( this, false );
}
--- ./kmail/kmacctcachedimap.cpp.orig 2012-05-27 10:30:11.000000000 +0200
+++ ./kmail/kmacctcachedimap.cpp 2012-05-27 10:30:33.000000000 +0200
@@ -49,7 +49,7 @@
#include <QList>
-KMAcctCachedImap::KMAcctCachedImap( AccountManager* aOwner,
+KMAcctCachedImap::KMAcctCachedImap( KMail::AccountManager* aOwner,
const QString& aAccountName, uint id )
: KMail::ImapAccountBase( aOwner, aAccountName, id ), mFolder( 0 ),
mAnnotationCheckPassed(false),
--- ./kmail/kmacctimap.h.orig 2012-05-27 10:13:07.000000000 +0200
+++ ./kmail/kmacctimap.h 2012-05-27 10:14:12.000000000 +0200
@@ -101,8 +101,8 @@
void slotUpdateFolderList();
protected:
- friend class ::AccountManager;
- KMAcctImap(AccountManager* owner, const QString& accountName, uint id);
+ friend class KMail::AccountManager;
+ KMAcctImap(KMail::AccountManager* owner, const QString& accountName, uint id);
/**
* Handle an error coming from a KIO job
* See ImapAccountBase::handleJobError for details.
--- ./kmail/kmacctimap.cpp.orig 2012-05-27 10:28:47.000000000 +0200
+++ ./kmail/kmacctimap.cpp 2012-05-27 10:29:37.000000000 +0200
@@ -54,7 +54,7 @@
#include <errno.h>
//-----------------------------------------------------------------------------
-KMAcctImap::KMAcctImap(AccountManager* aOwner, const QString& aAccountName, uint id):
+KMAcctImap::KMAcctImap(KMail::AccountManager* aOwner, const QString& aAccountName, uint id):
KMail::ImapAccountBase(aOwner, aAccountName, id),
mCountRemainChecks( 0 )
{
--- ./kmail/kmacctlocal.h.orig 2012-05-27 10:36:43.000000000 +0200
+++ ./kmail/kmacctlocal.h 2012-05-27 10:37:02.000000000 +0200
@@ -10,9 +10,9 @@
class KMAcctLocal: public KMAccount
{
protected:
- friend class ::AccountManager;
+ friend class KMail::AccountManager;
- KMAcctLocal(AccountManager* owner, const QString& accountName, uint id);
+ KMAcctLocal(KMail::AccountManager* owner, const QString& accountName, uint id);
public:
virtual ~KMAcctLocal();
--- ./kmail/kmacctmaildir.h.orig 2012-05-27 10:34:36.000000000 +0200
+++ ./kmail/kmacctmaildir.h 2012-05-27 10:35:32.000000000 +0200
@@ -10,9 +10,9 @@
class KMAcctMaildir: public KMAccount
{
protected:
- friend class ::AccountManager;
+ friend class KMail::AccountManager;
- KMAcctMaildir(AccountManager* owner, const QString& accountName, uint id);
+ KMAcctMaildir(KMail::AccountManager* owner, const QString& accountName, uint id);
public:
virtual ~KMAcctMaildir();
--- ./kmail/kmkernel.cpp.orig 2012-05-27 10:31:17.000000000 +0200
+++ ./kmail/kmkernel.cpp 2012-05-27 10:33:02.000000000 +0200
@@ -914,7 +914,7 @@
mAddMsgCurrentFolder->unGetMsg( index );
retval = 1;
} else {
- retval =- 2;
+ retval = -2;
delete msg;
msg = 0;
}
@@ -1018,7 +1018,7 @@
mAddMsgCurrentFolder->unGetMsg( index );
retval = 1;
} else {
- retval =- 2;
+ retval = -2;
delete msg;
msg = 0;
}
@@ -1533,7 +1533,7 @@
if (lsf)
the_searchFolderMgr->remove( lsf );
- the_acctMgr = new AccountManager();
+ the_acctMgr = new KMail::AccountManager();
the_filterMgr = new KMFilterMgr();
the_popFilterMgr = new KMFilterMgr(true);
the_filterActionDict = new KMFilterActionDict;
--- ./kmail/popaccount.h.orig 2012-05-27 10:18:58.000000000 +0200
+++ ./kmail/popaccount.h 2012-05-27 10:19:33.000000000 +0200
@@ -103,8 +103,8 @@
private:
enum Stage { Idle, List, Uidl, Head, Retr, Dele, Quit };
- friend class ::AccountManager;
- PopAccount(AccountManager* owner, const QString& accountName, uint id);
+ friend class KMail::AccountManager;
+ PopAccount(KMail::AccountManager* owner, const QString& accountName, uint id);
/**
* Start a KIO Job to get a list of messages on the pop server
--- ./libkleo/backends/qgpgme/threadedjobmixin.h.orig 2012-05-27 09:48:29.000000000 +0200
+++ ./libkleo/backends/qgpgme/threadedjobmixin.h 2012-05-27 09:51:03.000000000 +0200
@@ -143,7 +143,7 @@
void lateInitialization() {
assert( m_ctx );
- connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
+ T_base::connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
m_ctx->setProgressProvider( this );
}

23
deskutils/kdepim44/files/patch-kalarm__lib__spinbox2.cpp
View file

@ -1,23 +0,0 @@
--- kalarm/lib/spinbox2.cpp
+++ kalarm/lib/spinbox2.cpp
@@ -28,7 +28,7 @@
#include <QMouseEvent>
#include <QStyleOptionSpinBox>
#include <QGraphicsPixmapItem>
-#include <QPaintEngine>
+#include <QPainter>
#include <QTimer>
#include <QFrame>
#include <QBrush>
@@ -588,8 +588,9 @@ void SpinMirror::setFrame()
p = grabWidget(mMainSpinbox, QRect(x, 0, 1, height()));
// Blot out edit field stuff from the middle of the slice
QPixmap dot = grabWidget(mMainSpinbox, QRect(x, editOffsetY, 1, 1));
- QPaintEngine* pe = p.paintEngine();
- pe->drawTiledPixmap(QRectF(0, editOffsetY, 1, height() - 2*editOffsetY), dot, QPointF(0, 0));
+ QPainter painter(&p);
+ painter.drawTiledPixmap(0, editOffsetY, 1, height() - 2*editOffsetY, dot, 0, 0);
+ painter.end();
// Horizontally fill the mirror widget with the vertical slice
p = p.scaled(size());
// Grab the left hand border of the main spinbox, and draw it into the mirror widget.

10
deskutils/kdepim44/files/patch-kleopatra__CMakeLists.txt
View file

@ -1,10 +0,0 @@
--- kleopatra/CMakeLists.txt.orig 2013-01-09 20:23:28.900492685 +0000
+++ kleopatra/CMakeLists.txt 2013-01-09 20:23:50.410492001 +0000
@@ -301,6 +301,7 @@
)
add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
kde4_add_app_icon(_kleopatra_mainwindow_SRCS "ox*-app-kleopatra.png")

29
deskutils/kdepim44/files/patch-kleopatra__models__keylistmodel.cpp
View file

@ -1,29 +0,0 @@
--- 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() )

20
deskutils/kdepim44/files/patch-kleopatra__uiserver__assuanserverconnection.cpp
View file

@ -1,20 +0,0 @@
--- 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

29
deskutils/kdepim44/files/patch-kleopatra__utils__classify.cpp
View file

@ -1,29 +0,0 @@
--- 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

26
deskutils/kdepim44/files/patch-kleopatra__utils__stl_util.h
View file

@ -1,26 +0,0 @@
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>

10
deskutils/kdepim44/files/patch-kmail__CMakeLists.txt
View file

@ -1,10 +0,0 @@
--- ./kmail/CMakeLists.txt.orig 2012-08-25 02:59:33.137594262 +0200
+++ ./kmail/CMakeLists.txt 2012-08-25 03:03:00.337595149 +0200
@@ -4,7 +4,6 @@
check_include_files(fcntl.h HAVE_FCNTL_H)
check_include_files(byteswap.h HAVE_BYTESWAP_H)
check_include_files(paths.h HAVE_PATHS_H)
-check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
check_function_exists(mmap HAVE_MMAP)
macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H)

11
deskutils/kdepim44/files/patch-kmail__avscripts__kmail_clamav.sh
View file

@ -1,11 +0,0 @@
--- ./kmail/avscripts/kmail_clamav.sh.orig 2008-01-15 04:57:51.000000000 +0300
+++ ./kmail/avscripts/kmail_clamav.sh 2010-03-27 01:28:30.548465474 +0300
@@ -35,7 +35,7 @@
cat > $TEMPFILE
# check for a running daemon
-if [ "`ps -eo comm|grep clamd`" = "clamd" ]; then
+if [ "`ps -axo comm|grep clamd`" = "clamd" ]; then
chmod a+r $TEMPFILE
CLAMCOMANDO="clamdscan --stdout --no-summary "
else

20
deskutils/kdepim44/files/patch-kmail__imapaccountbase.h
View file

@ -1,20 +0,0 @@
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;

20
deskutils/kdepim44/files/patch-kmail__networkaccount.h
View file

@ -1,20 +0,0 @@
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:

8
deskutils/kdepim44/pkg-descr
View file

@ -1,8 +0,0 @@
KDE4 is the K Desktop Environment for Unix, Windows, and Mac OS X.
These kde4 ports intend to provide early access to KDE4 for FreeBSD
developers, porters and beta testers. Use at your own risk!
This package provides PIM applications for KDE4.
WWW: http://www.kde.org/

1043
deskutils/kdepim44/pkg-plist
View file

File diff suppressed because it is too large Load diff