From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 15 Jan 2007 03:37:55 +0000 (+0000)
Subject: libopie2: Enable SQL PIM backend.
X-Git-Tag: Release-2010-05/1~9352^2~21^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18b31b669a67fd9dbfdf043d21817ce42831ee16;p=openembedded.git

libopie2: Enable SQL PIM backend.
* Let users store their data reliably. XML backend is still used by default,
user must activate SQLite in config files (see OPIE wiki).
* Regarding concerns due to which is wasn't enabled before: "too large for 16MB
flash devices" - such devices welcome to disable-override it; "no sync" - apparently,
no sync with SQLite backend active, but XML is till by default.
* SQLite backend and opie-pimconvert tested to work OK on hx4700 (on small dataset
though, more tetsing pending). Suprising;y, I had rather weird issues with sqlite3
on qemuarm.
---

diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 17ac4e2605..1e0d4f1b9a 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -19,8 +19,12 @@ EXTRA_QMAKEVARS_POST += 'DEFINES+=OPIE_NEW_MALLOC \
 			DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
 			LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
 
-#NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images
-EXTRA_QMAKEVARS_PRE += 'ENABLE_SQL_PIM_BACKEND=n'
+ENABLE_SQL_PIM_BACKEND = "y"
+# NOTE: Machines with too little amount of flash may want to disable SQL backend support
+# (known not to fit in 16MB). Also, XML backend is still used by default, as SQL doesn't
+# support sync yet.
+#ENABLE_SQL_PIM_BACKEND_smallmachine = "n"
+EXTRA_QMAKEVARS_PRE += 'ENABLE_SQL_PIM_BACKEND=${ENABLE_SQL_PIM_BACKEND}'
 
 MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez"
 LIBS    = "core2    db2    mm2    net2    pim2    security2    ui2 bluez2"
diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb
index 8fcc2fba0a..1bef43c329 100644
--- a/packages/libopie/libopie2_1.2.2.bb
+++ b/packages/libopie/libopie2_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index d8385ceea6..1635a5b1a3 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"