Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dd46f50137c28483a2e923ae9e2f457d8a73ccae

commit dd46f50137c28483a2e923ae9e2f457d8a73ccae
Author: crazy <cr...@frugalware.org>
Date:   Wed Aug 11 12:45:44 2010 +0200

Revert "akonadi-1.4.0-1-i686"
* revert a0e10bcb6d8b3ca9d57e57292da5fd12419d11ef we need 1.3.* for kde 4.4*

diff --git a/source/xapps/akonadi/FrugalBuild b/source/xapps/akonadi/FrugalBuild
index 1031d9e..38e339d 100644
--- a/source/xapps/akonadi/FrugalBuild
+++ b/source/xapps/akonadi/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Michel Hermier <herm...@frugalware.org>

pkgname=akonadi
-pkgver=1.4.0
-pkgrel=1
+pkgver=1.3.1
+pkgrel=4
pkgdesc="PIM layer, which provides an asynchronous API to access all kind of 
PIM data"
archs=('i686' 'x86_64' 'ppc')
Finclude kde
@@ -15,8 +15,8 @@ rodepends=("${rodepen...@]}" 'libxslt')
groups=('xapps')
up2date="Flasttar http://download.akonadi-project.org";
source=(http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2 
sqlite-default.patch fix-missing-quote.patch)
-sha1sums=('a83943aa46537fee4e07953fedf29f5c13487937' \
-          '055ce94a01880fac9469099658326e03934db5b3' \
+sha1sums=('b6e97634878fe52785f3dec7d6394a18579d4a50' \
+          '2f3c140f9c77a9fa82f4a5acf9570c72d80f503a' \
'f5b25ee73212d219f61c1039ea223de54f36b976')

# optimization OK
diff --git a/source/xapps/akonadi/sqlite-default.patch 
b/source/xapps/akonadi/sqlite-default.patch
index 35095ae..f70bf2c 100644
--- a/source/xapps/akonadi/sqlite-default.patch
+++ b/source/xapps/akonadi/sqlite-default.patch
@@ -1,12 +1,12 @@
-diff -Naur akonadi-1.4.0/server/src/storage/dbconfig.cpp 
akonadi-1.4.0-sqlite/server/src/storage/dbconfig.cpp
---- akonadi-1.4.0/server/src/storage/dbconfig.cpp      2010-07-31 
18:12:25.000000000 +0200
-+++ akonadi-1.4.0-sqlite/server/src/storage/dbconfig.cpp       2010-08-01 
22:48:24.000000000 +0200
-@@ -62,7 +62,7 @@
-     QSettings settings( serverConfigFile, QSettings::IniFormat );
+diff -Naur akonadi-1.2.1/server/src/storage/dbconfig.cpp 
akonadi-1.2.1-sqlite/server/src/storage/dbconfig.cpp
+--- akonadi-1.2.1/server/src/storage/dbconfig.cpp      2009-08-28 
16:19:55.000000000 +0200
++++ akonadi-1.2.1-sqlite/server/src/storage/dbconfig.cpp       2010-02-02 
20:52:55.000000000 +0100
+@@ -38,7 +38,7 @@
+       QSettings settings( serverConfigFile, QSettings::IniFormat );

-     // determine driver to use
--    const QString defaultDriver = QLatin1String( "QMYSQL" );
-+    const QString defaultDriver = QLatin1String( "QSQLITE" );
-     QString driverName = settings.value( QLatin1String( "General/Driver" ), 
defaultDriver ).toString();
-     if ( driverName.isEmpty() )
-       driverName = defaultDriver;
+       // determine driver to use
+-      const QString defaultDriver = QLatin1String("QMYSQL");
++      const QString defaultDriver = QLatin1String("QSQLITE");
+       mDriverName = settings.value( QLatin1String("General/Driver"), 
defaultDriver ).toString();
+       if ( mDriverName.isEmpty() )
+         mDriverName = defaultDriver;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to