diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-01-15 15:51:06 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-01-15 15:51:06 +0000 |
| commit | e620a93810f7a2b4be0ea3b87a9fe0d82ca045fe (patch) | |
| tree | 2c8d0e68e02ab2c487f7c4c3ba1378bc8b49314d /packages/libopie | |
| parent | 46d8ea463e08dfeed19f68984e45c8b8426e5894 (diff) | |
| parent | da9c892043b06960916b10ad03d8ecdfafb7f4fe (diff) | |
merge of '851fb3bc90f76a09f544dfc656dab7639a1c44d8'
and 'bf66fd0535a23dbb3816e8282f71b114360bca19'
Diffstat (limited to 'packages/libopie')
| -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 | 3 |
3 files changed, 8 insertions, 5 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 78cc00e619..1635a5b1a3 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,13 +1,12 @@ require ${PN}.inc PV = "1.2.2+cvs${SRCDATE}" -PR = "r1" +PR = "r3" DEFAULT_PREFERENCE = "-1" SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \ - file://keyboardless-buttonmap.patch;patch=1 \ file://include.pro" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" |