diff options
23 files changed, 160 insertions, 15 deletions
diff --git a/packages/dates/dates_svn.bb b/packages/dates/dates_svn.bb index 22c821b98b..3d658aae54 100644 --- a/packages/dates/dates_svn.bb +++ b/packages/dates/dates_svn.bb @@ -4,13 +4,13 @@ DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" MAINTAINER = "Chris Lord <chris@openedhand.com>" DESCRIPTION = "Dates is a calendar application." -PR = "r4" +PR = "r5" PV = "0.0+svn${SRCDATE}" -S = "${WORKDIR}/${PN}" +S = "${WORKDIR}/trunk" -SRC_URI = "svn://svn.o-hand.com/repos/;module=${PN};proto=http" +SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" inherit autotools pkgconfig -CFLAGS_prepend = " -DFRAMES=5 " +CFLAGS_prepend = " -DFRAMES=3 " diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index d6decfb709..2b0a63af90 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -95,6 +95,7 @@ if [ -f ${libdir}/locale/locale-archive ]; then cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ fi localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s --prefix=/tmp/locale %s +mkdir -p ${libdir}/locale/ mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ rm -rf ${TMP_LOCALE} } diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index c8f1d56841..d009f2714c 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -84,6 +84,11 @@ do_munge() { # Integrate ports into tree mv ${WORKDIR}/ports ${S} + # Need to copy some extra folder content for sh arch. - OE bug #954 + case ${TARGET_ARCH} in + sh*) cp ${WORKDIR}/libc/sysdeps/sh/${TARGET_ARCH}/*.S ${WORKDIR}/libc/sysdeps/sh;; + esac + # http://www.handhelds.org/hypermail/oe/51/5135.html # Some files were moved around between directories on # 2005-12-21, which means that any attempt to check out diff --git a/packages/gtkhtml2/gtkhtml2_cvs.bb b/packages/gtkhtml2/gtkhtml2_cvs.bb index 1223254e91..01360b2077 100644 --- a/packages/gtkhtml2/gtkhtml2_cvs.bb +++ b/packages/gtkhtml2/gtkhtml2_cvs.bb @@ -4,14 +4,15 @@ DESCRIPTION = "A GTK+ HTML rendering library." LICENSE = "GPL" MAINTAINER = "Chris Lord <chris@openedhand.com>" PV = "2.11.0+cvs${SRCDATE}" -PR = "r2" +PR = "r3" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gtkhtml2 \ http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;patch=1;pnum=0 \ http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch;patch=1;pnum=0 \ http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch;patch=1;pnum=0 \ - http://svn.o-hand.com/repos/web/trunk/patches/fix-margin-inherit.patch;patch=1;pnum=0 \ - http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch;patch=1;pnum=0" + http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/add-dom-functions.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/iain-mem-leak.patch;patch=1;pnum=0" S = "${WORKDIR}/${PN}" @@ -25,3 +26,4 @@ do_stage() { ( for i in css document dom dom/core dom/events dom/html dom/traversal dom/views graphics layout layout/html util view; do install -d ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml/$i; install -m 0644 ${S}/libgtkhtml/$i/*.h ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml/$i; done ) install -m 0644 ${S}/libgtkhtml/*.h ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml } + diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb index 7ba1398329..301cb37a5e 100644 --- a/packages/libgpevtype/libgpevtype_cvs.bb +++ b/packages/libgpevtype/libgpevtype_cvs.bb @@ -8,7 +8,7 @@ DEPENDS = "libmimedir" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.14+cvs${SRCDATE}" +PV = "0.16+cvs${SRCDATE}" PR = "r0" inherit pkgconfig gpe autotools diff --git a/packages/libhandoff/.mtn2git_empty b/packages/libhandoff/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libhandoff/.mtn2git_empty diff --git a/packages/libhandoff/libhandoff_cvs.bb b/packages/libhandoff/libhandoff_cvs.bb new file mode 100644 index 0000000000..d0812a9c38 --- /dev/null +++ b/packages/libhandoff/libhandoff_cvs.bb @@ -0,0 +1,19 @@ +LICENSE = "GPL" +DESCRIPTION = "handoff library for GPE calendar" +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "libgpewidget" +PV = "0.1+cvs${SRCDATE}" +PR = "r0" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +DEFAULT_PREFERENCE = "-1" + +inherit pkgconfig gpe autotools + +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" + +S = ${WORKDIR}/${PN} + +do_stage () { +autotools_stage_all +} diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb index 65e3f8b25b..2f471223e6 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" INHIBIT_DEFAULT_DEPS = "1" -PR = "r1" +PR = "r2" SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \ file://keyboard.patch;patch=1" @@ -41,6 +41,7 @@ do_configure () { cp -pPR include/asm/arch-ebsa285 include/asm/arch elif test "$ARCH" = "sh"; then cp -pPR include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu" + cp -pPR include/asm/cpu/* include/asm fi } diff --git a/packages/meta/task-gpe.bb b/packages/meta/task-gpe.bb index 7fb4de851f..806ace7c6d 100644 --- a/packages/meta/task-gpe.bb +++ b/packages/meta/task-gpe.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Palmtop Environment" -PR = "r1" +PR = "r2" LICENSE = MIT ALLOW_EMPTY = "1" @@ -89,7 +89,8 @@ RDEPENDS_gpe-task-apps := "\ gpe-aerial \ gpe-soundbite \ rosetta \ - gpe-screenshot" + gpe-screenshot \ + gpe-windowlist" RDEPENDS_gpe-task-games := "\ gpe-go \ diff --git a/packages/pcmciautils/pcmciautils-013/.mtn2git_empty b/packages/pcmciautils/pcmciautils-013/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pcmciautils/pcmciautils-013/.mtn2git_empty diff --git a/packages/pcmciautils/pcmciautils-013/makefile_fix.patch b/packages/pcmciautils/pcmciautils-013/makefile_fix.patch new file mode 100644 index 0000000000..a45f9e20e3 --- /dev/null +++ b/packages/pcmciautils/pcmciautils-013/makefile_fix.patch @@ -0,0 +1,20 @@ +Hardcoded paths are bad... + +Index: pcmciautils-013/Makefile +=================================================================== +--- pcmciautils-013.orig/Makefile 2006-03-26 11:56:41.000000000 +0100 ++++ pcmciautils-013/Makefile 2006-05-09 22:10:16.000000000 +0100 +@@ -69,11 +69,11 @@ + mandir = ${prefix}/usr/share/man + srcdir = . + +-INSTALL = /usr/bin/install -c ++INSTALL = install -c + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_SCRIPT = ${INSTALL_PROGRAM} +-SYMLINK = /usr/bin/ln -sf ++SYMLINK = ln -sf + + # place to put our hotplug scripts nodes + hotplugdir = ${etcdir}/hotplug diff --git a/packages/pcmciautils/pcmciautils-013/version_workaround.patch b/packages/pcmciautils/pcmciautils-013/version_workaround.patch new file mode 100644 index 0000000000..ff34e139b3 --- /dev/null +++ b/packages/pcmciautils/pcmciautils-013/version_workaround.patch @@ -0,0 +1,16 @@ +PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly +under arm gcc 3.4.x so we work around it. + +Index: pcmciautils-013/src/pccardctl.c +=================================================================== +--- pcmciautils-013.orig/src/pccardctl.c 2006-03-26 11:56:41.000000000 +0100 ++++ pcmciautils-013/src/pccardctl.c 2006-05-09 22:11:09.000000000 +0100 +@@ -350,7 +350,7 @@ + } + + static void print_header(void) { +- printf("pcmciautils %s\n", PCMCIAUTILS_VERSION); ++ printf("pcmciautils 013\n"); + printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n"); + printf("Report errors and bugs to <linux-pcmcia@lists.infradead.org>, please.\n"); + } diff --git a/packages/pcmciautils/pcmciautils_013.bb b/packages/pcmciautils/pcmciautils_013.bb new file mode 100644 index 0000000000..3dde683012 --- /dev/null +++ b/packages/pcmciautils/pcmciautils_013.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem" +DEPENDS = "sysfsutils udev module-init-tools" +RDEPENDS = "udev module-init-tools" +HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" +SECTION = "kernel/userland" +PRIORITY = "optional" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \ + file://makefile_fix.patch;patch=1 \ + file://version_workaround.patch;patch=1" +S = "${WORKDIR}/pcmciautils-${PV}" + +PR = "r0" + +export HOSTCC = "${BUILD_CC}" +export etcdir = "${sysconfdir}" +export sbindir = "${base_sbindir}" +export pcmciaconfdir = "${sysconfdir}/pcmcia" +export udevrulesdir = "${sysconfdir}/udev/rules.d" +export UDEV = 1 +LD = "${CC}" +CFLAGS =+ "-I${S}/src" +CFLAGS =+ '-DPCMCIAUTILS_VERSION=013' + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} + +CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" +RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/sylpheed/sylpheed-claws-extra-plugins.inc b/packages/sylpheed/sylpheed-claws-extra-plugins.inc index 624abc105a..e3b7a9e388 100644 --- a/packages/sylpheed/sylpheed-claws-extra-plugins.inc +++ b/packages/sylpheed/sylpheed-claws-extra-plugins.inc @@ -10,3 +10,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sylpheed-claws/sylpheed-claws-extra-plugins-${P inherit autotools pkgconfig +FILES_${PN} = "${libdir}/sylpheed-claws/plugins/*.so" + diff --git a/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10_2.2.0.bb b/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10_2.2.0.bb new file mode 100644 index 0000000000..bc21b36a01 --- /dev/null +++ b/packages/sylpheed/sylpheed-claws-plugin-gtkhtml2-viewer-0.10_2.2.0.bb @@ -0,0 +1,6 @@ +include sylpheed-claws-extra-plugins.inc + +DEPENDS_append = " gtkhtml2" + +S = ${WORKDIR}/sylpheed-claws-extra-plugins-${PV}/gtkhtml2_viewer-0.10 + diff --git a/packages/sylpheed/sylpheed-claws-plugin-rssyl_2.2.0.bb b/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.4cvs8_2.2.0.bb index 6299da3d5d..3c95ee1b17 100644 --- a/packages/sylpheed/sylpheed-claws-plugin-rssyl_2.2.0.bb +++ b/packages/sylpheed/sylpheed-claws-plugin-rssyl-0.4cvs8_2.2.0.bb @@ -4,5 +4,3 @@ DEPENDS_append = " libxml2 curl glib-2.0 gtk+" S = ${WORKDIR}/sylpheed-claws-extra-plugins-${PV}/rssyl-0.4cvs8 -FILES_${PN} = "${libdir}/sylpheed-claws/plugins/rssyl.so" - diff --git a/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up b/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up new file mode 100644 index 0000000000..4c8e95bf2a --- /dev/null +++ b/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up @@ -0,0 +1,34 @@ +#!/bin/sh +# +# /etc/network/if-pre-up.d/zzz-wireless +# by Stefan Tomanek (stefan@pico.ruhr.de) + + +IWCONFIG=/sbin/iwconfig +IFCONFIG=/sbin/ifconfig +GREP=/bin/grep +LOGGER=/usr/bin/logger +SLEEP=/bin/sleep + +# How long do we wait for association? +RETRIES=15 +SLEEPTIME=1 + +# Only sleep if we use DHCP (add others methods seperated by spaces) +ONLY_FOR="static dhcp" + +if [ -z "$IF_WIRELESS_TYPE" ] && echo "$ONLY_FOR" | grep -q "$METHOD" ; then + $IFCONFIG $IFACE up + $LOGGER Checking for WLAN association... + while ( [ $RETRIES -gt 0 ] && ($IWCONFIG "$IFACE" | $GREP -q "Access Point: Not-Associated") ); do + $LOGGER No association yet, $RETRIES retries until timeout + RETRIES=$(($RETRIES-1)) + $SLEEP $SLEEPTIME + done + + if [ $RETRIES -eq 0 ]; then + $LOGGER Timeout waiting for association, continuing anyway... + else + $LOGGER Found association! + fi +fi diff --git a/packages/wireless-tools/wireless-tools_28-pre13.bb b/packages/wireless-tools/wireless-tools_28-pre13.bb index 0888646d36..c961a25f83 100644 --- a/packages/wireless-tools/wireless-tools_28-pre13.bb +++ b/packages/wireless-tools/wireless-tools_28-pre13.bb @@ -4,11 +4,12 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre13.tar.gz \ file://man.patch;patch=1 \ - file://wireless-tools.if-pre-up" + file://wireless-tools.if-pre-up \ + file://zzz-wireless.if-pre-up" S = "${WORKDIR}/wireless_tools.28" CFLAGS =+ "-I${S}" @@ -32,6 +33,7 @@ do_install() { oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install -d ${D}${sysconfdir}/network/if-pre-up.d install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools + install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless } PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc" diff --git a/packages/xlibs/libx11-native_6.2.1.bb b/packages/xlibs/libx11-native_6.2.1.bb index f27ab343a4..9513c4237e 100644 --- a/packages/xlibs/libx11-native_6.2.1.bb +++ b/packages/xlibs/libx11-native_6.2.1.bb @@ -1,4 +1,5 @@ SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" include libx11_${PV}.bb inherit native DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" diff --git a/packages/xlibs/libxau-native_0.1.1.bb b/packages/xlibs/libxau-native_0.1.1.bb index 3897fa6afe..ecb71ce3d6 100644 --- a/packages/xlibs/libxau-native_0.1.1.bb +++ b/packages/xlibs/libxau-native_0.1.1.bb @@ -1,4 +1,5 @@ SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" include libxau_${PV}.bb inherit native DEPENDS = "xproto-native" diff --git a/packages/xlibs/libxau-native_cvs.bb b/packages/xlibs/libxau-native_cvs.bb index eee93dd44c..cd070033ce 100644 --- a/packages/xlibs/libxau-native_cvs.bb +++ b/packages/xlibs/libxau-native_cvs.bb @@ -1,4 +1,5 @@ SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" include libxau_cvs.bb inherit native DEPENDS = "xproto-native" diff --git a/packages/xlibs/libxdmcp-native_0.1.3.bb b/packages/xlibs/libxdmcp-native_0.1.3.bb index bd6d990f53..8d7162b351 100644 --- a/packages/xlibs/libxdmcp-native_0.1.3.bb +++ b/packages/xlibs/libxdmcp-native_0.1.3.bb @@ -1,4 +1,5 @@ SECTION = "x11/libs" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp" include libxdmcp_${PV}.bb inherit native DEPENDS = "xproto-native" diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb index 295bae2584..9294b080b7 100644 --- a/packages/xlibs/libxext-native_cvs.bb +++ b/packages/xlibs/libxext-native_cvs.bb @@ -1,4 +1,5 @@ SECTION = "unknown" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext" include libxext_${PV}.bb inherit native DEPENDS = "libx11-native xextensions-native" |