diff options
| author | Holger Freyther <zecke@selfish.org> | 2006-05-19 18:56:24 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-19 18:56:24 +0000 |
| commit | 684502a9636212f499f8d4cc637f90b999e1a265 (patch) | |
| tree | f83e9205cf880f6c34783170ecdd8f3210b8c351 /packages | |
| parent | 8353bbe2df4d2be67fd97976ec37a0a5e48e9ae2 (diff) | |
| parent | 51538b03e4297f621ab596b118c15b9c5913be01 (diff) | |
merge of 3d66f5adca4bb88d74e07587eafa41c603b98fc5
and db35473bb38fcebbef8e336933b5ea5ed873b886
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/bluez/bluez-utils.inc | 1 | ||||
| -rw-r--r-- | packages/bluez/files/no-user-include.patch | 18 | ||||
| -rw-r--r-- | packages/libhandoff/libhandoff_cvs.bb | 2 | ||||
| -rw-r--r-- | packages/libopieobex/libopieobex0.inc | 4 | ||||
| -rw-r--r-- | packages/libopieobex/libopieobex0_1.2.1.bb | 2 | ||||
| -rw-r--r-- | packages/libopieobex/libopieobex0_cvs.bb | 2 |
6 files changed, 25 insertions, 4 deletions
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index c68df7bd47..db5ddf066d 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -8,6 +8,7 @@ LICENSE = "GPL" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ file://blueboxes.patch;patch=1 \ + file://no-user-include.patch;patch=1 \ file://hcid.conf \ file://bluetooth.default \ file://bluetooth.conf \ diff --git a/packages/bluez/files/no-user-include.patch b/packages/bluez/files/no-user-include.patch new file mode 100644 index 0000000000..8c1b1b6d6d --- /dev/null +++ b/packages/bluez/files/no-user-include.patch @@ -0,0 +1,18 @@ +Do not add -I/usr/include to the compile line just because we will +install bluez-utils there says zecke... + +Index: bluez-utils-2.25/acinclude.m4 +=================================================================== +--- bluez-utils-2.25.orig/acinclude.m4 2006-05-18 12:39:57.473577920 +0200 ++++ bluez-utils-2.25/acinclude.m4 2006-05-19 00:58:52.694599848 +0200 +@@ -69,7 +69,9 @@ + ac_save_LDFLAGS=$LDFLAGS + + BLUEZ_CFLAGS="" +- test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include" ++ if test "$cross_compiling" = no; then ++ test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include" ++ fi + + CPPFLAGS="$CPPFLAGS $BLUEZ_CFLAGS" + AC_CHECK_HEADER(bluetooth/bluetooth.h, dummy=yes, AC_MSG_ERROR(Bluetooth header files not found)) diff --git a/packages/libhandoff/libhandoff_cvs.bb b/packages/libhandoff/libhandoff_cvs.bb index d0812a9c38..54ffafc5e9 100644 --- a/packages/libhandoff/libhandoff_cvs.bb +++ b/packages/libhandoff/libhandoff_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "handoff library for GPE calendar" SECTION = "gpe/libs" PRIORITY = "optional" -DEPENDS = "libgpewidget" +DEPENDS = "glib" PV = "0.1+cvs${SRCDATE}" PR = "r0" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc index 7a514fa68a..15640c530d 100644 --- a/packages/libopieobex/libopieobex0.inc +++ b/packages/libopieobex/libopieobex0.inc @@ -3,7 +3,7 @@ SECTION = "opie/libs" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "LGPL" -DEPENDS = "opie-taskbar openobex-apps" +DEPENDS = "libopietooth1 opie-taskbar openobex-apps" RDEPENDS = "openobex-apps" APPNAME = "obex" @@ -11,6 +11,8 @@ S = "${WORKDIR}/obex" inherit opie +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/opietooth" + do_install() { install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ diff --git a/packages/libopieobex/libopieobex0_1.2.1.bb b/packages/libopieobex/libopieobex0_1.2.1.bb index d80a2a664f..5e7c51e7cc 100644 --- a/packages/libopieobex/libopieobex0_1.2.1.bb +++ b/packages/libopieobex/libopieobex0_1.2.1.bb @@ -1,6 +1,6 @@ include libopieobex0.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index c51ca8ecc6..ed160d86c8 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,6 +1,6 @@ include libopieobex0.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ ${HANDHELDS_CVS};module=opie/pics" |