From 0e859b1f8f8cf8d9f17938243c1c167e547ec6fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 17 Apr 2014 15:36:26 +0200 Subject: [PATCH] - rel 3; build fix (building with current kde) --- kde4-kdepim-runtime-build.patch | 352 ++++++++++++++++++++++++++++++++ kde4-kdepim-runtime.spec | 4 +- 2 files changed, 355 insertions(+), 1 deletion(-) create mode 100644 kde4-kdepim-runtime-build.patch diff --git a/kde4-kdepim-runtime-build.patch b/kde4-kdepim-runtime-build.patch new file mode 100644 index 0000000..768ae2e --- /dev/null +++ b/kde4-kdepim-runtime-build.patch @@ -0,0 +1,352 @@ +commit 37c762abc4a41dc6cca2a85c0fc8308696ab3178 +Author: Dan Vrátil +Date: Tue Feb 18 11:25:40 2014 +0100 + + Fix ambiguous reference to Job in AbstractLocalStoreTest + +diff --git a/resources/shared/filestore/tests/abstractlocalstoretest.cpp b/resources/shared/filestore/tests/abstractlocalstoretest.cpp +index 6f1b625..74ed543 100644 +--- a/resources/shared/filestore/tests/abstractlocalstoretest.cpp ++++ b/resources/shared/filestore/tests/abstractlocalstoretest.cpp +@@ -48,8 +48,8 @@ class TestStore : public AbstractLocalStore + TestStore() : mLastCheckedJob( 0 ), mLastProcessedJob( 0 ), mErrorCode( 0 ) {} + + public: +- mutable Job *mLastCheckedJob; +- Job *mLastProcessedJob; ++ mutable Akonadi::FileStore::Job *mLastCheckedJob; ++ Akonadi::FileStore::Job *mLastProcessedJob; + + Collection mTopLevelCollection; + +@@ -57,7 +57,7 @@ class TestStore : public AbstractLocalStore + QString mErrorText; + + protected: +- void processJob( Job *job ); ++ void processJob( Akonadi::FileStore::Job *job ); + + protected: + void setTopLevelCollection( const Collection &collection ) +@@ -70,14 +70,14 @@ class TestStore : public AbstractLocalStore + AbstractLocalStore::setTopLevelCollection( modifiedCollection ); + } + +- void checkCollectionCreate( CollectionCreateJob *job, int &errorCode, QString &errorText ) const ++ void checkCollectionCreate( Akonadi::FileStore::CollectionCreateJob *job, int &errorCode, QString &errorText ) const + { + mLastCheckedJob = job; + errorCode = mErrorCode; + errorText = mErrorText; + } + +- void checkCollectionDelete( CollectionDeleteJob *job, int &errorCode, QString &errorText ) const ++ void checkCollectionDelete( Akonadi::FileStore::CollectionDeleteJob *job, int &errorCode, QString &errorText ) const + { + mLastCheckedJob = job; + errorCode = mErrorCode; +@@ -119,7 +119,7 @@ class TestStore : public AbstractLocalStore + errorText = mErrorText; + } + +- void checkItemFetch( ItemFetchJob *job, int &errorCode, QString &errorText ) const ++ void checkItemFetch( Akonadi::FileStore::ItemFetchJob *job, int &errorCode, QString &errorText ) const + { + mLastCheckedJob = job; + errorCode = mErrorCode; +@@ -133,14 +133,14 @@ class TestStore : public AbstractLocalStore + errorText = mErrorText; + } + +- void checkItemMove( ItemMoveJob *job, int &errorCode, QString &errorText ) const ++ void checkItemMove( Akonadi::FileStore::ItemMoveJob *job, int &errorCode, QString &errorText ) const + { + mLastCheckedJob = job; + errorCode = mErrorCode; + errorText = mErrorText; + } + +- void checkStoreCompact( StoreCompactJob *job, int &errorCode, QString &errorText ) const ++ void checkStoreCompact( Akonadi::FileStore::StoreCompactJob *job, int &errorCode, QString &errorText ) const + { + mLastCheckedJob = job; + errorCode = mErrorCode; +@@ -148,7 +148,7 @@ class TestStore : public AbstractLocalStore + } + }; + +-void TestStore::processJob( Job *job ) ++void TestStore::processJob( Akonadi::FileStore::Job *job ) + { + mLastProcessedJob = job; + +@@ -236,7 +236,7 @@ void AbstractLocalStoreTest::testCreateCollection() + job = mStore->createCollection( Collection(), Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -247,7 +247,7 @@ void AbstractLocalStoreTest::testCreateCollection() + job = mStore->createCollection( Collection(), Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -259,7 +259,7 @@ void AbstractLocalStoreTest::testCreateCollection() + job = mStore->createCollection( collection, Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -302,7 +302,7 @@ void AbstractLocalStoreTest::testDeleteCollection() + job = mStore->deleteCollection( Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -313,7 +313,7 @@ void AbstractLocalStoreTest::testDeleteCollection() + job = mStore->deleteCollection( Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -325,7 +325,7 @@ void AbstractLocalStoreTest::testDeleteCollection() + job = mStore->deleteCollection( collection ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -369,7 +369,7 @@ void AbstractLocalStoreTest::testFetchCollection() + job = mStore->fetchCollections( Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -380,7 +380,7 @@ void AbstractLocalStoreTest::testFetchCollection() + job = mStore->fetchCollections( Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -436,7 +436,7 @@ void AbstractLocalStoreTest::testModifyCollection() + job = mStore->modifyCollection( Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -447,7 +447,7 @@ void AbstractLocalStoreTest::testModifyCollection() + job = mStore->modifyCollection( Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -502,7 +502,7 @@ void AbstractLocalStoreTest::testMoveCollection() + job = mStore->moveCollection( Collection(), Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -513,7 +513,7 @@ void AbstractLocalStoreTest::testMoveCollection() + job = mStore->moveCollection( Collection(), Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -528,7 +528,7 @@ void AbstractLocalStoreTest::testMoveCollection() + job = mStore->moveCollection( collection, Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -539,7 +539,7 @@ void AbstractLocalStoreTest::testMoveCollection() + job = mStore->moveCollection( collection, parentCollection ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -581,7 +581,7 @@ void AbstractLocalStoreTest::testFetchItems() + job = mStore->fetchItems( Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -592,7 +592,7 @@ void AbstractLocalStoreTest::testFetchItems() + job = mStore->fetchItems( Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -635,7 +635,7 @@ void AbstractLocalStoreTest::testFetchItem() + job = mStore->fetchItem( Item() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -646,7 +646,7 @@ void AbstractLocalStoreTest::testFetchItem() + job = mStore->fetchItem( Item() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -689,7 +689,7 @@ void AbstractLocalStoreTest::testCreateItem() + job = mStore->createItem( Item(), Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -700,7 +700,7 @@ void AbstractLocalStoreTest::testCreateItem() + job = mStore->createItem( Item(), Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -743,7 +743,7 @@ void AbstractLocalStoreTest::testDeleteItem() + job = mStore->deleteItem( Item() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -754,7 +754,7 @@ void AbstractLocalStoreTest::testDeleteItem() + job = mStore->deleteItem( Item() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -797,7 +797,7 @@ void AbstractLocalStoreTest::testModifyItem() + job = mStore->modifyItem( Item() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -808,7 +808,7 @@ void AbstractLocalStoreTest::testModifyItem() + job = mStore->modifyItem( Item() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -849,7 +849,7 @@ void AbstractLocalStoreTest::testMoveItem() + job = mStore->moveItem( Item(), Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -860,7 +860,7 @@ void AbstractLocalStoreTest::testMoveItem() + job = mStore->moveItem( Item(), Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -875,7 +875,7 @@ void AbstractLocalStoreTest::testMoveItem() + job = mStore->moveItem( item, Collection() ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -886,7 +886,7 @@ void AbstractLocalStoreTest::testMoveItem() + job = mStore->moveItem( item, parentCollection ); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidJobContext ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidJobContext ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +@@ -928,7 +928,7 @@ void AbstractLocalStoreTest::testCompactStore() + job = mStore->compactStore(); + QVERIFY( job != 0 ); + QCOMPARE( mStore->mLastCheckedJob, job ); +- QCOMPARE( job->error(), (int)Job::InvalidStoreState ); ++ QCOMPARE( job->error(), (int)Akonadi::FileStore::Job::InvalidStoreState ); + QVERIFY( !job->errorText().isEmpty() ); + + QVERIFY( !job->exec() ); +--- kdepim-runtime-4.9.2/migration/CMakeLists.txt~ 2012-09-28 02:27:15.000000000 +0200 ++++ kdepim-runtime-4.9.2/migration/CMakeLists.txt 2014-04-17 14:12:12.715781262 +0200 +@@ -21,6 +21,5 @@ + add_subdirectory( kjots ) + if (KDEPIMLIBS_KRESOURCES_LIBS) + add_subdirectory( kres ) +- add_subdirectory( tests ) + endif (KDEPIMLIBS_KRESOURCES_LIBS) + diff --git a/kde4-kdepim-runtime.spec b/kde4-kdepim-runtime.spec index fe3190b..369b6c9 100644 --- a/kde4-kdepim-runtime.spec +++ b/kde4-kdepim-runtime.spec @@ -7,12 +7,13 @@ Summary: Runtime Personal Information Management (PIM) for KDE Summary(pl.UTF-8): Zarządca informacji osobistej (PIM) dla KDE Name: kde4-kdepim-runtime Version: 4.9.2 -Release: 2 +Release: 3 License: GPL Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz # Source0-md5: c094ceca4361768cc5874f95f21a7b83 Patch100: %{name}-branch.diff +Patch0: %{name}-build.patch URL: http://www.kde.org/ BuildRequires: Qt3Support-devel >= %{qtver} BuildRequires: QtNetwork-devel >= %{qtver} @@ -89,6 +90,7 @@ bazujących na kdepim-runtime. %prep %setup -q -n %{orgname}-%{version} #%patch100 -p1 +%patch0 -p1 %build install -d build -- 2.44.0