Merge bk://oe-devel@oe-devel.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/11/28 03:29:12+01:00 uni-frankfurt.de!mickeyl
make zbedic 0.9.2-cvs compile

2004/11/28 02:35:32+01:00 uni-frankfurt.de!mickeyl
wellenreiter: ensure the kernel's wireless.h gets picked up

2004/11/28 02:08:52+01:00 uni-frankfurt.de!mickeyl
networkapplet: ensure the kernel's wireless.h gets picked up

2004/11/28 02:08:28+01:00 uni-frankfurt.de!mickeyl
wirelessapplet: ensure the kernel's wireless.h gets picked up

2004/11/28 01:13:16+01:00 uni-frankfurt.de!mickeyl
ship libopiobex0 in opie-image

2004/11/28 00:02:56+01:00 uni-frankfurt.de!mickeyl
make opie-networksettings pick up the kernel's wireless.h

2004/11/27 23:51:12+01:00 uni-frankfurt.de!mickeyl
make libopie pick up the kernel's wireless.h

2004/11/27 18:53:59+01:00 uni-frankfurt.de!mickeyl
make wireless-tools pick up the kernel's wireless.h

BKrev: 41a9c282CzUBHaxVZPfCILOfAoitvw

16 files changed, 79 insertions, 27 deletions

diff --git a/libopie/libopie2_1.1.7.oe b/libopie/libopie2_1.1.7.oe
index 3f6dbfdb1c..f49dc6f086 100644
--- a/libopie/libopie2_1.1.7.oe
+++ b/libopie/libopie2_1.1.7.oe
@@ -6,6 +6,7 @@ LICENSE = "LGPL"
 I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
 DEPENDS = "libqpe-opie sqlite3 libpcap-0.7.2 virtual/kernel"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
+PR = "r1"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
@@ -14,6 +15,9 @@ S = "${WORKDIR}/libopie2"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
 
 EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index 368e03800f..48cd7040c6 100644
--- a/libopie/libopie2_cvs.oe
+++ b/libopie/libopie2_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
 DEPENDS = "libqpe-opie sqlite3 libpcap-0.7.2 virtual/kernel"
-PR = "r4"
+PR = "r5"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
 PV = "1.1.7+cvs-${CVSDATE}"
 
@@ -15,6 +15,9 @@ S = "${WORKDIR}/libopie2"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
 
 EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
diff --git a/meta/opie-collections.inc b/meta/opie-collections.inc
index 159d8cea2e..11da680940 100644
--- a/meta/opie-collections.inc
+++ b/meta/opie-collections.inc
@@ -37,7 +37,7 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
 
 OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh opie-style-metal opie-style-web opie-style-phase"
 
-OPIE_BASE_DEPENDS = "ipkg ntp bluez-utils-nodbus irda-utils openobex-apps"
+OPIE_BASE_DEPENDS = "ipkg ntp bluez-utils-nodbus irda-utils openobex-apps libopieobex0"
 OPIE_BASE_RDEPENDS = "ntpdate opie-handwriting-classicset bluez-utils-nodbus openobex-apps libopieobex0"
 
 #
diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index 6d97e43d7a..1043dd7ed3 100644
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -4,7 +4,7 @@ export IMAGE_LINGUAS = ""
 FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie"
 FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/0.8/feed/opie"
 
-PR = "r6"
+PR = "r7"
 
 include opie-collections.inc
 
diff --git a/opie-networkapplet/opie-networkapplet_1.1.7.oe b/opie-networkapplet/opie-networkapplet_1.1.7.oe
index 634f1db3f4..d654acd2d5 100644
--- a/opie-networkapplet/opie-networkapplet_1.1.7.oe
+++ b/opie-networkapplet/opie-networkapplet_1.1.7.oe
@@ -4,17 +4,19 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-networksettings"
-
+PR = "r1"
 APPNAME = "networkapplet"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
-
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
diff --git a/opie-networkapplet/opie-networkapplet_cvs.oe b/opie-networkapplet/opie-networkapplet_cvs.oe
index ed909783a1..af189d2129 100644
--- a/opie-networkapplet/opie-networkapplet_cvs.oe
+++ b/opie-networkapplet/opie-networkapplet_cvs.oe
@@ -9,11 +9,13 @@ APPNAME = "networkapplet"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/networkapplet \
 	   ${HANDHELDS_CVS};module=opie/pics"
-
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
diff --git a/opie-networksettings/opie-networksettings_1.1.7.oe b/opie-networksettings/opie-networksettings_1.1.7.oe
index bd491aa98c..779cd9c7c1 100644
--- a/opie-networksettings/opie-networksettings_1.1.7.oe
+++ b/opie-networksettings/opie-networksettings_1.1.7.oe
@@ -5,17 +5,20 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 APPNAME = "networksettings"
+PR = "r1"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/root"
-
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
 
 do_install() {
diff --git a/opie-networksettings/opie-networksettings_cvs.oe b/opie-networksettings/opie-networksettings_cvs.oe
index 0a0ac15f9c..4c0c8f6370 100644
--- a/opie-networksettings/opie-networksettings_cvs.oe
+++ b/opie-networksettings/opie-networksettings_cvs.oe
@@ -5,18 +5,20 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 PV = "1.1.7+cvs-${CVSDATE}"
-
+PR = "r1"
 APPNAME = "networksettings"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/apps \
 	   ${HANDHELDS_CVS};module=opie/root"
-
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
 
 do_install() {
diff --git a/opie-wellenreiter/opie-wellenreiter_1.0.3.oe b/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
index 0136aeb428..835b928084 100644
--- a/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
+++ b/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RRECOMMENDS = "manufacturers"
-PR = "r3"
+PR = "r4"
 
 APPNAME = "wellenreiter"
 APPTYPE = "binary"
@@ -18,6 +18,9 @@ S = "${WORKDIR}/wellenreiter"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 do_install() {
         install -d ${D}/${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
diff --git a/opie-wellenreiter/opie-wellenreiter_cvs.oe b/opie-wellenreiter/opie-wellenreiter_cvs.oe
index 7b5996e6fe..299ce459ff 100644
--- a/opie-wellenreiter/opie-wellenreiter_cvs.oe
+++ b/opie-wellenreiter/opie-wellenreiter_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RRECOMMENDS = "manufacturers"
 PV = "1.0.3+cvs-${CVSDATE}"
-
+PR = "r1"
 APPNAME = "wellenreiter"
 APPTYPE = "binary"
 
@@ -16,6 +16,9 @@ S = "${WORKDIR}/wellenreiter"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 do_install() {
         install -d ${D}/${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
diff --git a/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe b/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
index 582086387b..b49f9ecdab 100644
--- a/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
+++ b/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
@@ -3,16 +3,18 @@ SECTION = "opie/applets"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-
+PR = "r1"
 APPNAME = "wirelessapplet"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
-
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
@@ -29,7 +31,3 @@ if [ -n "$D" ]; then exit 1; fi
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 }
 
-# FILES plugins/applets/libwirelessapplet.so*
-do_install() {
-}
-
diff --git a/opie-wirelessapplet/opie-wirelessapplet_cvs.oe b/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
index 4bb241f8cd..7e05031b02 100644
--- a/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
+++ b/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
@@ -5,13 +5,16 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "wirelessapplet"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet"
-
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
+# we need to pick up the kernel's wireless.h or else the WE will be broken
+export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}"
+
 pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
@@ -27,8 +30,3 @@ pkg_postrm() {
 if [ -n "$D" ]; then exit 1; fi
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 }
-
-# FILES plugins/applets/libwirelessapplet.so*
-do_install() {
-}
-
diff --git a/wireless-tools/wireless-tools_26.oe b/wireless-tools/wireless-tools_26.oe
index ee54a69bba..07f1c1561f 100644
--- a/wireless-tools/wireless-tools_26.oe
+++ b/wireless-tools/wireless-tools_26.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "virtual/kernel"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \
 	   file://man.patch;patch=1 \
@@ -14,13 +14,12 @@ S = "${WORKDIR}/wireless_tools.${PV}"
 inherit module-base
 
 do_configure() {
-	rm -rf wireless.h
-	ln -s ${STAGING_KERNEL_DIR}/include/linux/wireless.h wireless.h
+	rm -f wireless.h
 }
 
 do_compile() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-        oe_runmake KERNEL_SRC=${KERNEL_PATH} KERNEL_VERSION=${KERNEL_VERSION} BUILD_SHARED=y
+        oe_runmake KERNEL_SRC=${KERNEL_SOURCE} KERNEL_VERSION=${KERNEL_VERSION} BUILD_SHARED=y
 }
 
 do_install() {
diff --git a/zbedic/files/file.cpp b/zbedic/files/file.cpp
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/zbedic/files/file.cpp
diff --git a/zbedic/files/file.h b/zbedic/files/file.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/zbedic/files/file.h
diff --git a/zbedic/zbedic_cvs.oe b/zbedic/zbedic_cvs.oe
index e69de29bb2..80de980a7e 100644
--- a/zbedic/zbedic_cvs.oe
+++ b/zbedic/zbedic_cvs.oe
@@ -0,0 +1,35 @@
+DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}/zbedic/misc"
+PV = "0.9.1+0.9.2-cvs-${CVSDATE}"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/bedic;module=zbedic \
+           cvs://anonymous@cvs.sourceforge.net/cvsroot/bedic;module=libbedic \
+           file://file.h file://file.cpp"
+S = "${WORKDIR}/libbedic"
+ZS = "${WORKDIR}/zbedic"
+
+inherit opie
+export OE_QMAKE_LINK="${CXX}"
+
+do_configure() {
+	qmake -project && qmake -makefile -t lib -spec ${QMAKESPEC} CONFIG=console CONFIG+=staticlib -after \
+        INCLUDEPATH+=../include TARGET=bedic DESTDIR=${STAGING_LIBDIR} HEADERS+=src/file.h SOURCES+=src/file.cpp
+	cd ${ZS} && rm -rf *~ && qmake -project && qmake -makefile -spec ${QMAKESPEC} -after \
+        INCLUDEPATH=${S}/include DEFINES+=QWS LIBS+=-lqpe LIBS+=-lbedic DESTDIR=${S} TARGET=zbedic
+}
+
+do_compile() {
+	install -m 0644 ${WORKDIR}/file.* ${S}/src/
+	oe_runmake
+	cd ${ZS} && oe_runmake
+}
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0655 ${ZS}/misc/*.png ${D}/${palmtopdir}/pics/
+}