diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-15 03:39:26 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-15 03:39:26 +0000 |
| commit | 5487602e78e7e57f791dc01afed02b83fc70949b (patch) | |
| tree | a2de484ddcdf450aa0966a295eac1a69cfbf9102 | |
| parent | 8df84b1a2c7d93b25322584146586fbf2ac90163 (diff) | |
| parent | 18b31b669a67fd9dbfdf043d21817ce42831ee16 (diff) | |
merge of 'dbd927aa7f527978c46055666748b6cad475dc40'
and 'e9f90698372f656405245674904d4454e0c7554b'
| -rw-r--r-- | packages/libopie/libopie2.inc | 8 | ||||
| -rw-r--r-- | packages/libopie/libopie2_1.2.2.bb | 2 | ||||
| -rw-r--r-- | packages/libopie/libopie2_cvs.bb | 2 |
3 files changed, 8 insertions, 4 deletions
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" |