From aeb4ddcc956aba28cbee34aa8d21d98b9a0f749e Mon Sep 17 00:00:00 2001 From: Marc Schiffbauer Date: Fri, 12 Jul 2013 15:06:35 +0000 Subject: Whoops. Fix patch filename. (Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134) --- app-office/akonadi-server/Manifest | 8 ++++---- .../files/akonadi-server-1.10.0-fix-pgsql.patch | 22 ++++++++++++++++++++++ .../files/akonadi-server-1.10.0-pgsql-fix.patch | 22 ---------------------- 3 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 app-office/akonadi-server/files/akonadi-server-1.10.0-fix-pgsql.patch delete mode 100644 app-office/akonadi-server/files/akonadi-server-1.10.0-pgsql-fix.patch (limited to 'app-office') diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest index 04ee638ad9ec..f0141cf692ad 100644 --- a/app-office/akonadi-server/Manifest +++ b/app-office/akonadi-server/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX akonadi-server-1.10.0-pgsql-fix.patch 924 SHA256 d0b5316cd06ed793dff59be1f8c9f37ac8742414e2041584ddacaff996d41556 SHA512 53c899121ec508029286be320a8101794a0e535fc40de94a82c7e501899cdb720c02b847bf79ed8bc5464a067175b784f647f7fc6fb32266310143ea47b821d3 WHIRLPOOL df7f0d96c38fa264a3b2d8140f41ebb7fcdf787bc1f222b971d1a1c6b276ca324d61d32f2528c67aa07432ea4b61134204f18d25ffa2a03f904ab923267d5d9d +AUX akonadi-server-1.10.0-fix-pgsql.patch 924 SHA256 d0b5316cd06ed793dff59be1f8c9f37ac8742414e2041584ddacaff996d41556 SHA512 53c899121ec508029286be320a8101794a0e535fc40de94a82c7e501899cdb720c02b847bf79ed8bc5464a067175b784f647f7fc6fb32266310143ea47b821d3 WHIRLPOOL df7f0d96c38fa264a3b2d8140f41ebb7fcdf787bc1f222b971d1a1c6b276ca324d61d32f2528c67aa07432ea4b61134204f18d25ffa2a03f904ab923267d5d9d DIST akonadi-1.10.0.tar.bz2 227714 SHA256 ae64b965da72ce7332b2409f1c6d7475b28c2414aafca1c9bbca60fb8d632a9e SHA512 08a41b1caeb17fb2ba3faa4a81310315d0695c526d8b47b61f0c6f2ad414700ba5c31fe85f936cb218e7e96f72ee4cebdf06291f6b81e4f23d2c651b4d3daf6e WHIRLPOOL ab980907de4c0039c5123eb46c58370cd87082d1c885f8813ce45a017e5a2e7e535e9c63fddc0993daaf20c57570132419feb71e98297faef540a57e35b8fce3 DIST akonadi-1.9.2.tar.bz2 220599 SHA256 e712f3ee59731d613935df78df1cd65f80680d86d1f6642ff118061cd461bfd9 SHA512 9c281315cbb4801490acb0c6afa8bde6e42a73cfd0ba4ab0cb2b0b50a63ae55d350efcf8535b7f3251d93da0ba63c51e7920c250496fedcb3d90e1d8644c1b7f WHIRLPOOL 3415b70bc03ba451ae4e8216de0eeeb0f0c7f53c4f6433cc21f4725167f24493bee3f6dfe188f7d3633b4f5e4471d3a02ffc5407b90def86c439db6e711a1cce EBUILD akonadi-server-1.10.0-r1.ebuild 3146 SHA256 06053f242faad9b4a4f5df7be463b3671058cf66ea6df72addf88d09f07c727c SHA512 df188d4b717661bf5274f85ffbf1338aee5120d82a7c3483659a9b33de12c027f1ff7ba9673c8322c7c0ee7d6fcaccc46788fc7e466df009debc508df2b1a736 WHIRLPOOL 497c2e3af6864fd4d15509b65447fe116dc3642dbc097805277e26b112e2e90a0336d771980265cda8efeafdfe2c7b5c3df9e0d4ba4842a18d8f5c8c6c4582fa @@ -12,7 +12,7 @@ MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iD8DBQFR4BmKKWxsyjWmQTQRCJZXAJ0UXr8QXDsrEF1DS/zufM1ODNnsRgCgmg3y -ms3JUK6akqGgePqsyhW4Kvs= -=nw0A +iD8DBQFR4Br0KWxsyjWmQTQRCNr8AKCaG4swK1j87vb3x5Yy3Sk9hvavTwCfW439 +TP/AbTtdBClBw6WQe5IScbw= +=zLt1 -----END PGP SIGNATURE----- diff --git a/app-office/akonadi-server/files/akonadi-server-1.10.0-fix-pgsql.patch b/app-office/akonadi-server/files/akonadi-server-1.10.0-fix-pgsql.patch new file mode 100644 index 000000000000..253b405aae72 --- /dev/null +++ b/app-office/akonadi-server/files/akonadi-server-1.10.0-fix-pgsql.patch @@ -0,0 +1,22 @@ +commit fdedc830ca5061f45cd2412c11566ca84806c427 +Author: Andras Mantia +Date: Fri Jul 12 15:03:36 2013 +0300 + + Unbreak akonadi on Postgres + +diff --git a/server/src/storage/datastore.cpp b/server/src/storage/datastore.cpp +index f5a1bc6..93e1ff2 100644 +--- a/server/src/storage/datastore.cpp ++++ b/server/src/storage/datastore.cpp +@@ -208,8 +208,9 @@ bool DataStore::setItemsFlags( const PimItem::List &items, const QVector & + } + + QueryBuilder qb2( PimItemFlagRelation::tableName(), QueryBuilder::Insert ); +- qb2.setColumnValue( PimItemFlagRelation::leftFullColumnName(), insIds ); +- qb2.setColumnValue( PimItemFlagRelation::rightFullColumnName(), insFlags ); ++ qb2.setColumnValue( PimItemFlagRelation::leftColumn(), insIds ); ++ qb2.setColumnValue( PimItemFlagRelation::rightColumn(), insFlags ); ++ qb2.setIdentificationColumn( QString() ); + if ( !qb2.exec() ) { + return false; + } diff --git a/app-office/akonadi-server/files/akonadi-server-1.10.0-pgsql-fix.patch b/app-office/akonadi-server/files/akonadi-server-1.10.0-pgsql-fix.patch deleted file mode 100644 index 253b405aae72..000000000000 --- a/app-office/akonadi-server/files/akonadi-server-1.10.0-pgsql-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit fdedc830ca5061f45cd2412c11566ca84806c427 -Author: Andras Mantia -Date: Fri Jul 12 15:03:36 2013 +0300 - - Unbreak akonadi on Postgres - -diff --git a/server/src/storage/datastore.cpp b/server/src/storage/datastore.cpp -index f5a1bc6..93e1ff2 100644 ---- a/server/src/storage/datastore.cpp -+++ b/server/src/storage/datastore.cpp -@@ -208,8 +208,9 @@ bool DataStore::setItemsFlags( const PimItem::List &items, const QVector & - } - - QueryBuilder qb2( PimItemFlagRelation::tableName(), QueryBuilder::Insert ); -- qb2.setColumnValue( PimItemFlagRelation::leftFullColumnName(), insIds ); -- qb2.setColumnValue( PimItemFlagRelation::rightFullColumnName(), insFlags ); -+ qb2.setColumnValue( PimItemFlagRelation::leftColumn(), insIds ); -+ qb2.setColumnValue( PimItemFlagRelation::rightColumn(), insFlags ); -+ qb2.setIdentificationColumn( QString() ); - if ( !qb2.exec() ) { - return false; - } -- cgit v1.2.3-65-gdbad