summaryrefslogtreecommitdiff
path: root/packages/libopie
diff options
context:
space:
mode:
Diffstat (limited to 'packages/libopie')
-rw-r--r--packages/libopie/libopie2.inc0
-rw-r--r--packages/libopie/libopie2/include-cvs.pro36
-rw-r--r--packages/libopie/libopie2/include.pro36
-rw-r--r--packages/libopie/libopie2_1.1.9.bb85
-rw-r--r--packages/libopie/libopie2_1.2.0.bb0
-rw-r--r--packages/libopie/libopie2_cvs.bb88
6 files changed, 41 insertions, 204 deletions
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libopie/libopie2.inc
diff --git a/packages/libopie/libopie2/include-cvs.pro b/packages/libopie/libopie2/include-cvs.pro
deleted file mode 100644
index 119d298ad4..0000000000
--- a/packages/libopie/libopie2/include-cvs.pro
+++ /dev/null
@@ -1,36 +0,0 @@
-# we don't want to modify subdir .pro's
-!contains( TEMPLATE, subdirs ) {
-# if it's already a lib, we ignore it
-!contains( TEMPLATE, lib ) {
-
- contains( CONFIG, quick-app ) {
- message ( Building a quicklaunch application )
- TEMPLATE = lib
- CONFIG += plugin
- DEFINES += OPIE_APP_INTERFACE
- DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
-
- system ( touch visibility_qmake_test.c )
- # Test if the compiler supports visibility
- system ( $$(CC) -fvisibility=hidden -c -o visibility_qmake_test.o visibility_qmake_test.c ) {
- message ( Your compiler does support visibility, we will use it )
- DEFINES += GCC_SUPPORTS_VISIBILITY
- QMAKE_CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
- QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
- system ( rm visibility_qmake_test.o )
- }
- system ( rm visibility_qmake_test.c )
-
- }
-
- !contains ( CONFIG, quick-app ) {
- message( Building a standalone application )
- TEMPLATE = app
- DEFINES -= OPIE_APP_INTERFACE
- DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
- }
-}
-}
-
-DEFINES += OPIE_NEW_MALLOC
-DEFINES += OPIE_NO_ERASE_RECT_HACKFIX
diff --git a/packages/libopie/libopie2/include.pro b/packages/libopie/libopie2/include.pro
index e69de29bb2..c76634a239 100644
--- a/packages/libopie/libopie2/include.pro
+++ b/packages/libopie/libopie2/include.pro
@@ -0,0 +1,36 @@
+# we don't want to modify subdir .pro's
+!contains( TEMPLATE, subdirs ) {
+# if it's already a lib, we ignore it
+!contains( TEMPLATE, lib ) {
+
+ contains( CONFIG, quick-app ) {
+ message ( Building a quicklaunch application )
+ TEMPLATE = lib
+ CONFIG += plugin
+ DEFINES += OPIE_APP_INTERFACE
+ DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
+
+ system ( touch visibility_qmake_test.c )
+ # Test if the compiler supports visibility
+ system ( $$(CC) -fvisibility=hidden -c -o visibility_qmake_test.o visibility_qmake_test.c ) {
+ message ( "Your compiler does support visibility, we will use it" )
+ DEFINES += GCC_SUPPORTS_VISIBILITY
+ QMAKE_CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+ QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+ system ( rm visibility_qmake_test.o )
+ }
+ system ( rm visibility_qmake_test.c )
+
+ }
+
+ !contains ( CONFIG, quick-app ) {
+ message( Building a standalone application )
+ TEMPLATE = app
+ DEFINES -= OPIE_APP_INTERFACE
+ DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
+ }
+}
+}
+
+DEFINES += OPIE_NEW_MALLOC
+DEFINES += OPIE_NO_ERASE_RECT_HACKFIX
diff --git a/packages/libopie/libopie2_1.1.9.bb b/packages/libopie/libopie2_1.1.9.bb
deleted file mode 100644
index 6a1b95cae3..0000000000
--- a/packages/libopie/libopie2_1.1.9.bb
+++ /dev/null
@@ -1,85 +0,0 @@
-DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment"
-HOMEPAGE = "http://opie.handhelds.org"
-SECTION = "opie/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "LGPL"
-I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
-DEPENDS = "libqpe-opie sqlite3 libpcap"
-PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
-PR = "r0"
-
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
- file://include.pro"
-S = "${WORKDIR}/libopie2"
-
-inherit opie
-
-PARALLEL_MAKE = ""
-
-#FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
-
-EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
- DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \
- DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
- LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
-
-EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
-
-# uclibc doesn't have backtrace()
-python __anonymous () {
- import bb, re
- if (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
- bb.data.setVar("EXTRA_QMAKEVARS_POST_append", " DEFINES+=OPIE_NO_BACKTRACE ", d)
-}
-
-do_compile() {
- install -d ${STAGING_INCDIR}/opie2
- install -d ${STAGING_INCDIR}/opie2/private
- for i in `find . -name "*.h"`
- do
- install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
- done
-
- for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h
- do
- install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/
- done
-
- oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
-}
-
-LIBS = "core2 ui2 db2 mm2 net2 pim2 security2"
-
-# need some special case for uic-created header files here
-do_stage() {
- for f in ${LIBS}
- do
- oe_libinstall -so libopie$f ${STAGING_LIBDIR}/
- done
-
- install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/
- 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/
-}
-
-do_install() {
- install -d ${D}${palmtopdir}/lib
- for f in ${LIBS}
- do
- oe_libinstall -so libopie$f ${D}${palmtopdir}/lib
- done
-}
-
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
-
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
-
-#FIXME: Add individual package descriptions and dependencies
diff --git a/packages/libopie/libopie2_1.2.0.bb b/packages/libopie/libopie2_1.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libopie/libopie2_1.2.0.bb
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 2b6cf8086f..a5cf0c8c34 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,85 +1,7 @@
-DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment"
-HOMEPAGE = "http://opie.handhelds.org"
-SECTION = "opie/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "LGPL"
-I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
-DEPENDS = "libqpe-opie sqlite3 libpcap"
-PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
-PR = "r12"
-PV = "1.1.9+cvs-${CVSDATE}"
+include ${PN}.inc
+
+PV = "1.2.0+cvs-${CVSDATE}"
+PR = "r0"
SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
- file://include-cvs.pro"
-S = "${WORKDIR}/libopie2"
-
-inherit opie
-
-PARALLEL_MAKE = ""
-
-#FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
-
-EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
- DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \
- DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
- LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
-
-EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
-
-# uclibc doesn't have backtrace()
-python __anonymous () {
- import bb, re
- if (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
- bb.data.setVar("EXTRA_QMAKEVARS_POST_append", " DEFINES+=OPIE_NO_BACKTRACE ", d)
-}
-
-do_compile() {
- install -d ${STAGING_INCDIR}/opie2
- install -d ${STAGING_INCDIR}/opie2/private
- for i in `find . -name "*.h"`
- do
- install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
- done
-
- for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h
- do
- install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/
- done
-
- oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
-}
-
-LIBS = "core2 ui2 db2 mm2 net2 pim2 security2"
-
-# need some special case for uic-created header files here
-do_stage() {
- for f in ${LIBS}
- do
- oe_libinstall -so libopie$f ${STAGING_LIBDIR}/
- done
-
- install -m 0644 ${WORKDIR}/include-cvs.pro ${OPIEDIR}/include.pro
- 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/
-}
-
-do_install() {
- install -d ${D}${palmtopdir}/lib
- for f in ${LIBS}
- do
- oe_libinstall -so libopie$f ${D}${palmtopdir}/lib
- done
-}
-
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
-
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
-
-#FIXME: Add individual package descriptions and dependencies
+ file://include.pro"