[kdepim-runtime] Enable SQLite support in akonadi

[Radek Novacek]

commit fced6ab2966a8c901f805e3086ca9ab8f42ba522
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Tue Sep 20 17:47:04 2011 +0200

    Enable SQLite support in akonadi

 kdepim-runtime-4.7.1-sqlite-support.patch |   62 +++++++++++++++++++++++++++++
 kdepim-runtime.spec                       |    9 ++++-
 2 files changed, 70 insertions(+), 1 deletions(-)
---
diff --git a/kdepim-runtime-4.7.1-sqlite-support.patch b/kdepim-runtime-4.7.1-sqlite-support.patch
new file mode 100644
index 0000000..99be7b0
--- /dev/null
+++ b/kdepim-runtime-4.7.1-sqlite-support.patch
@@ -0,0 +1,62 @@
+diff -up kdepim-runtime-4.7.1/kcm/serverconfigmodule.cpp.sqlite-support kdepim-runtime-4.7.1/kcm/serverconfigmodule.cpp
+--- kdepim-runtime-4.7.1/kcm/serverconfigmodule.cpp.sqlite-support	2011-05-21 01:11:05.000000000 +0200
++++ kdepim-runtime-4.7.1/kcm/serverconfigmodule.cpp	2011-09-20 17:43:26.908150816 +0200
+@@ -57,6 +57,7 @@ ServerConfigModule::ServerConfigModule( 
+   // supported drivers
+   ui_driver.driverBox->addItem( "Mysql", QVariant( "QMYSQL" ) );
+   ui_driver.driverBox->addItem( "PostgreSQL", QVariant( "QPSQL" ) );
++  ui_driver.driverBox->addItem( "SQLite", QVariant( "QSQLITE" ) );
+ 
+   setButtons( KCModule::Default | KCModule::Apply );
+ 
+@@ -69,6 +70,12 @@ ServerConfigModule::ServerConfigModule( 
+   m_psqlWidget = new QWidget( this );
+   m_stackWidget->addWidget( m_psqlWidget );
+   ui_psql.setupUi( m_psqlWidget );
++
++  // SQLite
++  m_sqliteWidget = new QWidget( this );
++  m_stackWidget->addWidget( m_sqliteWidget );
++  // ui_sqlite.setupUi( m_sqliteWidget );
++
+   m_stackWidget->setCurrentWidget( m_mysqlWidget );
+ 
+   QWidget *widget = new QWidget( this );
+@@ -156,6 +163,12 @@ void ServerConfigModule::save()
+   settings.setValue( "Port", ui_psql.port->text() );
+   settings.endGroup();
+ 
++  // sqlite group
++  settings.beginGroup( "SQLITE" );
++  // TODO: make it configurable
++  settings.setValue( "Name", "akonadi" );
++  settings.endGroup();
++
+   // selected driver
+   settings.beginGroup( "GENERAL" );
+   settings.setValue( "Driver", ui_driver.driverBox->itemData( ui_driver.driverBox->currentIndex() ).toString() );
+@@ -210,9 +223,12 @@ void ServerConfigModule::driverChanged( 
+   if( ui_driver.driverBox->itemData( index ).toString() == "QMYSQL" ) {
+     m_stackWidget->setCurrentWidget( m_mysqlWidget );
+   }
+-  else {
++  else if( ui_driver.driverBox->itemData( index ).toString() == "QPSQL" ) {
+     m_stackWidget->setCurrentWidget( m_psqlWidget );
+   }
++  else {
++    m_stackWidget->setCurrentWidget( m_sqliteWidget );
++  }
+ }
+ 
+ #include "serverconfigmodule.moc"
+diff -up kdepim-runtime-4.7.1/kcm/serverconfigmodule.h.sqlite-support kdepim-runtime-4.7.1/kcm/serverconfigmodule.h
+--- kdepim-runtime-4.7.1/kcm/serverconfigmodule.h.sqlite-support	2011-05-21 01:11:05.000000000 +0200
++++ kdepim-runtime-4.7.1/kcm/serverconfigmodule.h	2011-09-20 17:43:26.908150816 +0200
+@@ -56,6 +56,7 @@ class ServerConfigModule : public KCModu
+     QStackedWidget *m_stackWidget;
+     QWidget *m_mysqlWidget;
+     QWidget *m_psqlWidget;
++    QWidget *m_sqliteWidget;
+ 
+     QComboBox *m_driverBox;
+ };
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index 26db4a9..5beffa7 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -5,7 +5,7 @@ Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Epoch:   1
 Version: 4.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -16,6 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # show the Akonadi KCM in System Settings (#565420)
 Patch0: kdepim-runtime-4.4.93-show_akonadi_kcm.patch
 
+# Enable SQLite support in akonadi
+Patch1: kdepim-runtime-4.7.1-sqlite-support.patch
+
 Provides: kdepim4-runtime = %{version}-%{release}
 
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
@@ -62,6 +65,7 @@ Install %{name}-devel if you want to write or compile %{name} plugins.
 %setup -q -n kdepim-runtime-%{version}%{?pre}
 
 %patch0 -p1 -b .show_akonadi_kcm
+%patch1 -p1 -b .sqlite-support
 
 
 %build
@@ -142,6 +146,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 20 2011 Radek Novacek <rnovacek at redhat.com> 1:4.7.1-2
+- Enable SQLite support in akonadi
+
 * Fri Sep 02 2011 Than Ngo <than at redhat.com> - 1:4.7.1-1
 - 4.7.1