[kdepim-runtime/f15] Enable SQLite support in akonadi kcm

[Rex Dieter]

commit 4a07081eed51346aff5e01c5f716268be08a7af8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Feb 8 07:43:48 2012 -0600

    Enable SQLite support in akonadi kcm

 kdepim-runtime-4.7.1-sqlite-support.patch |   62 +++++++++++++++++++++++++++++
 kdepim-runtime.spec                       |   12 +++++-
 2 files changed, 72 insertions(+), 2 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..b3fbc44
--- /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( "QSQLITE3" ) );
+ 
+   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 bf2278e..0e097b8 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -3,7 +3,7 @@ Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Epoch:   1
 Version: 4.4.11.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -14,7 +14,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # show the Akonadi KCM in System Settings (#565420)
 Patch1: kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch
 
-# upstream patches
+## upstreamable patches
+# Enable SQLite support in akonadi kcm
+Patch50: kdepim-runtime-4.7.1-sqlite-support.patch
+
+## upstream patches
 
 Provides: kdepim4-runtime = %{version}-%{release}
 
@@ -63,6 +67,7 @@ Install %{name}-devel if you want to write or compile %{name} plugins.
 %setup -q -n kdepim-runtime-%{version}
 
 %patch1 -p1 -b .show-akonadi-kcm-kde45
+%patch50 -p1 -b .sqlite-support
 
 
 %build
@@ -144,6 +149,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb 08 2012 Rex Dieter <rdieter at fedoraproject.org> 1:4.4.11.1-2
+- Enable SQLite support in akonadi kcm
+
 * Thu Apr 21 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.4.11.1-1
 - 4.4.11.1