[oe-commits] Paul Eggleton : libopie2: tidy up for 1.2.5

[git version control]

Module: openembedded.git
Branch: master
Commit: 5e8e131ffa66f22ee65e1db0891199ddeca9283a
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=5e8e131ffa66f22ee65e1db0891199ddeca9283a

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sat Jun  4 13:55:38 2011 +0100

libopie2: tidy up for 1.2.5

* Move opimmemosortvector.h handling to .inc file
* Remove DEFAULT_PREFERENCE = "-1"
* Remove comment about SQL not supporting sync

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 recipes/libopie/libopie2.inc      |    7 ++++---
 recipes/libopie/libopie2_1.2.5.bb |   11 +----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/recipes/libopie/libopie2.inc b/recipes/libopie/libopie2.inc
index a5a5cef..cb15679 100644
--- a/recipes/libopie/libopie2.inc
+++ b/recipes/libopie/libopie2.inc
@@ -21,14 +21,14 @@ EXTRA_QMAKEVARS_POST += 'DEFINES+=OPIE_NEW_MALLOC \
 
 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.
+# (known not to fit in 16MB).
 #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"
-PRIVATE = "opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h"
+PRIVATE = "opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h \
+           opimtodosortvector.h vobject_p.h opimeventsortvector.h opimmemosortvector.h"
 
 # uclibc doesn't have backtrace()
 python __anonymous () {
@@ -68,6 +68,7 @@ do_stage() {
 	install -m 0644 opiepim/ui/opimrecurrencebase.h ${STAGING_INCDIR}/opie2/
 	install -m 0644 opieui/otimepickerbase.h ${STAGING_INCDIR}/opie2/
 	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
+	install -m 0644 opiepim/ui/opimalarmdlgbase.h ${STAGING_INCDIR}/opie2/
 }
 
 do_install() {
diff --git a/recipes/libopie/libopie2_1.2.5.bb b/recipes/libopie/libopie2_1.2.5.bb
index 4525ad7..ee9c687 100644
--- a/recipes/libopie/libopie2_1.2.5.bb
+++ b/recipes/libopie/libopie2_1.2.5.bb
@@ -1,8 +1,6 @@
 require ${PN}.inc
 
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
+PR = "r2"
 
 SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_libopie2.tar.bz2;name=split_libopie2 \
            file://gcc45_opiemm_include.patch \
@@ -10,13 +8,6 @@ SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_libopie2.tar.bz2;nam
 SRC_URI[split_libopie2.md5sum] = "7258c4154c91b28a24030e029782da6f"
 SRC_URI[split_libopie2.sha256sum] = "5e1d831c9e5acbba15a3ec78aba5eff5f5dbf5e27cf469f6de693176fc7cd621"
 
-PRIVATE += " opimmemosortvector.h"
-
 # FIXME remove this!
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch"
 
-do_stage_append() {
-        # special case for uic-created header files
-        install -m 0644 opiepim/ui/opimalarmdlgbase.h ${STAGING_INCDIR}/opie2/
-}
-