diff options
Diffstat (limited to 'packages')
72 files changed, 546 insertions, 221 deletions
diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc index cd95777227..3184be72b4 100644 --- a/packages/abiword/abiword-2.5.inc +++ b/packages/abiword/abiword-2.5.inc @@ -1,8 +1,7 @@ DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word" -SECTION = "gnome/office" HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" LICENSE = "GPLv2" - DEPENDS = "perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb index d488820620..0715026684 100644 --- a/packages/abiword/abiword-plugins_2.4.5.bb +++ b/packages/abiword/abiword-plugins_2.4.5.bb @@ -1,15 +1,14 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -LICENSE="GPLv2" - -DEPENDS = "libwpd librsvg goffice poppler" -PR="r1" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" +HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" +LICENSE = "GPLv2" +DEPENDS = "libwpd librsvg goffice poppler" +RDEPENDS='abiword' +PR = "r1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" -RDEPENDS='abiword' inherit autotools diff --git a/packages/abiword/abiword-plugins_2.4.6.bb b/packages/abiword/abiword-plugins_2.4.6.bb index 28d076aaa4..21ac8ea909 100644 --- a/packages/abiword/abiword-plugins_2.4.6.bb +++ b/packages/abiword/abiword-plugins_2.4.6.bb @@ -1,15 +1,13 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -LICENSE="GPLv2" - -DEPENDS = "libwpd librsvg goffice poppler" -PR="r0" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" +HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" +LICENSE = "GPLv2" +DEPENDS = "libwpd librsvg goffice poppler" +RDEPENDS = "abiword" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" -RDEPENDS='abiword' inherit autotools diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc index c8f3243b9c..8569845394 100644 --- a/packages/abiword/abiword.inc +++ b/packages/abiword/abiword.inc @@ -1,8 +1,7 @@ -DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word" -SECTION = "gnome/office" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word" HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" LICENSE = "GPLv2" - DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index 912c419f8c..a22431eaf9 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -11,7 +11,8 @@ LICENSE = "GPL" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ file://02dtl1_cs.sh \ - file://hciattach-ti-bts.patch;patch=1" + file://hciattach-ti-bts.patch;patch=1 \ + file://handle-eintr.patch;patch=1" # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol # Let's default to that instead of 'any' until further notice... @@ -41,6 +42,7 @@ do_install_append() { chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ + install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ } CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ diff --git a/packages/bluez/bluez-utils/handle-eintr.patch b/packages/bluez/bluez-utils/handle-eintr.patch new file mode 100644 index 0000000000..effe5d9696 --- /dev/null +++ b/packages/bluez/bluez-utils/handle-eintr.patch @@ -0,0 +1,23 @@ +--- bluez-utils-3.9.org/tools/hciattach.c 2007-01-28 20:16:48.000000000 +0000 ++++ bluez-utils-3.9/tools/hciattach.c 2007-02-12 16:50:49.000000000 +0000 +@@ -1135,7 +1256,7 @@ + int main(int argc, char *argv[]) + { + struct uart_t *u = NULL; +- int detach, printpid, opt, i, n, ld; ++ int detach, printpid, opt, i, n, ld, err; + int to = 5; + int init_speed = 0; + int send_break = 0; +@@ -1286,7 +1414,10 @@ + + while (!__io_canceled) { + p.revents = 0; +- if (poll(&p, 1, 500)) ++ err = poll(&p, 1, 500); ++ if (err < 0 && errno == EINTR) ++ continue; ++ if (err) + break; + } + diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb index d07c68b7d7..36410ee2ec 100644 --- a/packages/bluez/bluez-utils_3.9.bb +++ b/packages/bluez/bluez-utils_3.9.bb @@ -1 +1,3 @@ require bluez-utils.inc + +PR = "r2" diff --git a/packages/bmon/bmon_2.1.0.bb b/packages/bmon/bmon_2.1.0.bb index 32e956fb26..d6cd03f614 100644 --- a/packages/bmon/bmon_2.1.0.bb +++ b/packages/bmon/bmon_2.1.0.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Portable Bandwidth Monitor and rate estimator" HOMEPAGE = "http://people.suug.ch/~tgr/bmon/" -SECTION = "console/utilities" +SECTION = "console/utils" LICENSE = "MIT" # only works with libnl-0.5.0 DEPENDS = "libnl" -PR = "r0" SRC_URI = "http://people.suug.ch/~tgr/bmon/files/bmon-2.1.0.tar.gz \ file://no-strip.patch;patch=1" diff --git a/packages/ccxstream/ccxstream_1.0.15.bb b/packages/ccxstream/ccxstream_1.0.15.bb index cc42d895ca..466a116ec2 100644 --- a/packages/ccxstream/ccxstream_1.0.15.bb +++ b/packages/ccxstream/ccxstream_1.0.15.bb @@ -1,6 +1,6 @@ DESCRIPTION = "XStream Server" DEPENDS = "readline" -LICENSE = "GPL-2" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \ diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb index 820700d56e..af90d5a20e 100644 --- a/packages/dcop/dcopidl-native_3.5.4.bb +++ b/packages/dcop/dcopidl-native_3.5.4.bb @@ -1,15 +1,13 @@ DESCRIPTION = "DCOP IDL parser" -SECTION = "kde/dev" +SECTION = "kde/devel" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" - SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \ file://dcopidl-compile.patch;patch=1 " S = "${WORKDIR}/dcopidl" - inherit native qmake qt3e export OE_QMAKE_LINK="${CXX}" diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb index 29a4f71d3c..10969db923 100644 --- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb +++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb @@ -1,16 +1,14 @@ DESCRIPTION = "DCOP IDL parser" -SECTION = "kde/dev" +SECTION = "kde/devel" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" - SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp " #\ # file://dcopidl-compile.patch;patch=1 " S = "${WORKDIR}/dcopidl2cpp" - inherit native qmake qt3e export OE_QMAKE_LINK="${CXX}" diff --git a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb index 9e1fc13da6..4abdb6c7b0 100644 --- a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb +++ b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Framebuffer VNC server keyboard events module" -SECTION = "kernel/module" +SECTION = "kernel/modules" LICENSE = "GPL" PR = "r1" diff --git a/packages/freeze/freeze.bb b/packages/freeze/freeze.bb index 48a0ba63d2..fa11fecb97 100644 --- a/packages/freeze/freeze.bb +++ b/packages/freeze/freeze.bb @@ -13,7 +13,7 @@ # as appropriate, directory is the sub-directory of 'packages'. # DESCRIPTION = "Freeze the bitbake files in the build" -SECTION = "console/networking" +SECTION = "console/network" PRIORITY = "optional" LICENSE = "MIT" PR = "r1" diff --git a/packages/freeze/unfreeze.bb b/packages/freeze/unfreeze.bb index ff280dee9c..f2232c304f 100644 --- a/packages/freeze/unfreeze.bb +++ b/packages/freeze/unfreeze.bb @@ -2,7 +2,7 @@ # configuration fails empty (they just contain a comment). # DESCRIPTION = "Unfreeze the bitbake files in the build" -SECTION = "console/networking" +SECTION = "console/network" PRIORITY = "optional" LICENSE = "MIT" PR = "r1" diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb index 3720512150..bef090e22a 100644 --- a/packages/gpephone/linphone_1.5.0.bb +++ b/packages/gpephone/linphone_1.5.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SIP-based IP phone" HOMEPAGE = "http://www.linphone.org/?lang=us" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "libosip2 speex libogg alsa-lib readline" PR = "r0" diff --git a/packages/ipsec-tools/ipsec-tools_0.6.6.bb b/packages/ipsec-tools/ipsec-tools_0.6.6.bb index 0e2a82e370..9b0676aece 100644 --- a/packages/ipsec-tools/ipsec-tools_0.6.6.bb +++ b/packages/ipsec-tools/ipsec-tools_0.6.6.bb @@ -1,10 +1,9 @@ DESCRIPTION = "IPsec-Tools is a port of KAME's IPsec utilities to the \ Linux-2.6 IPsec implementation." HOMEPAGE = "http://ipsec-tools.sourceforge.net/" -SECTION = "console/net" +SECTION = "console/network" LICENSE = "BSD" DEPENDS = "virtual/kernel openssl readline flex" -PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2 \ file://racoon-search-missing.patch;patch=1" diff --git a/packages/libaal/libaal_1.0.4.bb b/packages/libaal/libaal_1.0.4.bb index 0acfccc48d..af847f50c6 100644 --- a/packages/libaal/libaal_1.0.4.bb +++ b/packages/libaal/libaal_1.0.4.bb @@ -5,7 +5,7 @@ PR = "r1" DESCRIPTION = "Library for user-level code accessing Reiser4 filesystems" HOMEPAGE = "http://www.namesys.com" SECTION = "base" -LICENSE = "GPL-2" +LICENSE = "GPLv2" SRC_URI = "ftp://ftp.namesys.com/pub/reiser4progs/old-versions/${P}.tar.gz" diff --git a/packages/libidl/libidl_0.8.2.bb b/packages/libidl/libidl_0.8.2.bb index b8c5ec6966..85114d6524 100644 --- a/packages/libidl/libidl_0.8.2.bb +++ b/packages/libidl/libidl_0.8.2.bb @@ -1,5 +1,5 @@ +SECTION = "x11/gnome/libs" LICENSE = "LGPL" -SECTION = "libs" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2" S = "${WORKDIR}/libIDL-${PV}" diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb index 2ca114be2c..7a5a0d454e 100644 --- a/packages/libidl/libidl_0.8.3.bb +++ b/packages/libidl/libidl_0.8.3.bb @@ -1,6 +1,6 @@ -LICENSE = "LGPL" DESCRIPTION = "Library for parsing CORBA IDL files" -SECTION = "gnome/libs" +SECTION = "x11/gnome/libs" +LICENSE = "LGPL" DEPENDS = "glib-2.0" PR = "r2" diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb index 916bfb6e5f..ccc93e291a 100644 --- a/packages/libidl/libidl_0.8.6.bb +++ b/packages/libidl/libidl_0.8.6.bb @@ -1,6 +1,6 @@ -LICENSE = "LGPL" DESCRIPTION = "Library for parsing CORBA IDL files" -SECTION = "gnome/libs" +SECTION = "x11/gnome/libs" +LICENSE = "LGPL" DEPENDS = "glib-2.0 libidl-native" PR = "r2" diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb index 43b8daa131..563f21440e 100644 --- a/packages/linphone/linphone_1.6.0.bb +++ b/packages/linphone/linphone_1.6.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SIP-based IP phone (console edition)" HOMEPAGE = "http://www.linphone.org/?lang=us" SECTION = "x11/utils" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "intltool libosip2 speex libogg alsa-lib readline" DEPENDS_${PN} = "liblinphone" diff --git a/packages/mozilla/firefox-2.0.0.1/.mtn2git_empty b/packages/mozilla/firefox-2.0.0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/.mtn2git_empty diff --git a/packages/mozilla/firefox-2.0.0.1/arm/.mtn2git_empty b/packages/mozilla/firefox-2.0.0.1/arm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/arm/.mtn2git_empty diff --git a/packages/mozilla/firefox-2.0.0.1/arm/jsautocfg.h b/packages/mozilla/firefox-2.0.0.1/arm/jsautocfg.h new file mode 100644 index 0000000000..dd43fd28e3 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/arm/jsautocfg.h @@ -0,0 +1,52 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* Lovingly crafted by hand avoiding Mozilla stupidity */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 8L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 1L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 2L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch @@ -0,0 +1,23 @@ +--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 ++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 +@@ -319,20 +319,8 @@ + + jsopcode.h jsopcode.c: jsopcode.tbl + +-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) + jsautocfg.h: + touch $@ +-else +-ifeq ($(OS_ARCH),WINCE) +-jsautocfg.h: +- touch $@ +-else +-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) +- @rm -f $@ jsautocfg.tmp +- ./jscpucfg > jsautocfg.tmp +- mv jsautocfg.tmp $@ +-endif +-endif + + # jscpucfg is a strange target + # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch b/packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch new file mode 100644 index 0000000000..028900fa1b --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch @@ -0,0 +1,13 @@ +Index: mozilla/js/src/jsdtoa.c +=================================================================== +--- mozilla.orig/js/src/jsdtoa.c ++++ mozilla/js/src/jsdtoa.c +@@ -175,7 +175,7 @@ + * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that + * avoids underflows on inputs whose result does not underflow. + */ +-#ifdef IS_LITTLE_ENDIAN ++#if defined(IS_LITTLE_ENDIAN) && (!defined(__arm__) || defined(__VFP_FP__)) + #define IEEE_8087 + #else + #define IEEE_MC68k diff --git a/packages/mozilla/firefox-2.0.0.1/mozconfig b/packages/mozilla/firefox-2.0.0.1/mozconfig new file mode 100644 index 0000000000..9737330a77 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/mozconfig @@ -0,0 +1,57 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --disable-necko-disk-cache + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --enable-debug=-ggdb +ac_add_options --disable-gtktest +ac_add_options --disable-tests +ac_add_options --disable-printing +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource + +# build minimal set of image decoders +ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static +ac_add_options --enable-optimize=-O1 diff --git a/packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch b/packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch new file mode 100644 index 0000000000..cb30f896ed --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch @@ -0,0 +1,14 @@ +$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.1 2005/11/03 00:59:43 pvalchev Exp $ +Index: mozilla/nsprpub/pr/src/misc/prdtoa.c +=================================================================== +--- mozilla.orig/nsprpub/pr/src/misc/prdtoa.c ++++ mozilla/nsprpub/pr/src/misc/prdtoa.c +@@ -855,7 +855,7 @@ mult + wc = wa + wb; + if (wc > a->maxwds) + k++; +- c = Balloc(k); ++ c = Balloc(k*2); + for(x = c->x, xa = x + wc; x < xa; x++) + *x = 0; + xa = a->x; diff --git a/packages/mozilla/firefox-2.0.0.1/powerpc/.mtn2git_empty b/packages/mozilla/firefox-2.0.0.1/powerpc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/powerpc/.mtn2git_empty diff --git a/packages/mozilla/firefox-2.0.0.1/powerpc/jsautocfg.h b/packages/mozilla/firefox-2.0.0.1/powerpc/jsautocfg.h new file mode 100644 index 0000000000..93d03744f2 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/powerpc/jsautocfg.h @@ -0,0 +1,52 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 8L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/firefox-2.0.0.1/security-cross.patch b/packages/mozilla/firefox-2.0.0.1/security-cross.patch new file mode 100644 index 0000000000..56c8d04a9e --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/security-cross.patch @@ -0,0 +1,93 @@ +--- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 ++++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 +@@ -52,88 +52,8 @@ + + DEFAULT_COMPILER = gcc + +-ifeq ($(OS_TEST),m68k) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = m68k +-else +-ifeq ($(OS_TEST),ppc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-ifeq ($(USE_64),1) +- ARCHFLAG = -m64 +-endif +-else +-ifeq ($(OS_TEST),ppc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-else +-ifeq ($(OS_TEST),alpha) +- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = alpha +-else +-ifeq ($(OS_TEST),ia64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ia64 +-else +-ifeq ($(OS_TEST),x86_64) +-ifeq ($(USE_64),1) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = x86_64 +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +- ARCHFLAG = -m32 +-endif +-else +-ifeq ($(OS_TEST),sparc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq ($(OS_TEST),sparc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq (,$(filter-out arm% sa110,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = arm +-else +-ifeq ($(OS_TEST),parisc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq ($(OS_TEST),parisc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq ($(OS_TEST),s390) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390 +-else +-ifeq ($(OS_TEST),s390x) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390x +-else +-ifeq ($(OS_TEST),mips) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = mips +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- ++OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++CPU_ARCH = + + LIBC_TAG = _glibc + diff --git a/packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch b/packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch new file mode 100644 index 0000000000..bc0c6f4e5c --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch @@ -0,0 +1,11 @@ +--- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -212,7 +212,7 @@ + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) +- : "r" (&my_params) ++ : "r" (&my_params), "m" (my_params) + : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" + ); + diff --git a/packages/mozilla/firefox-2.0.0.1/xptcstubs.patch b/packages/mozilla/firefox-2.0.0.1/xptcstubs.patch new file mode 100644 index 0000000000..f2645690f4 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.1/xptcstubs.patch @@ -0,0 +1,13 @@ +--- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp ++++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp +@@ -45,7 +45,8 @@ + #endif + + /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ +-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); ++static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch") ++__attribute__((used)); + + static nsresult + PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) + diff --git a/packages/mozilla/firefox_2.0.0.1.bb b/packages/mozilla/firefox_2.0.0.1.bb new file mode 100644 index 0000000000..db3c0f4902 --- /dev/null +++ b/packages/mozilla/firefox_2.0.0.1.bb @@ -0,0 +1,37 @@ +PR = "r1" +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ + file://xptcstubs.patch;patch=1 \ + file://no-xmb.patch;patch=1 \ + file://jsautocfg.h \ + file://extensions-hack.patch;patch=1 \ + file://security-cross.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://xptcinvoke-arm.patch;patch=1 \ + file://jsdtoa-float-type.patch;patch=1 \ + " +S = "${WORKDIR}/mozilla" +DEFAULT_PREFERENCE = "-1" + +inherit mozilla + +require firefox.inc + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk +} + +do_stage() { + + install -d ${STAGING_INCDIR}/${P} + cd dist/sdk/include + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f + done + # removes 2 lines that call absent headers + sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h +} + diff --git a/packages/musicpd/glurp_0.11.3.bb b/packages/musicpd/glurp_0.11.3.bb index 4d9449c904..59cea4f8c9 100644 --- a/packages/musicpd/glurp_0.11.3.bb +++ b/packages/musicpd/glurp_0.11.3.bb @@ -1,9 +1,8 @@ DESCRIPTION = "glurp - frontend for mpd" HOMEPAGE = "http://www.musicpd.org/glurp.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "gtk+ libglade" -PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/glurp/glurp-${PV}.tar.gz" diff --git a/packages/musicpd/gmpc_0.11.2.bb b/packages/musicpd/gmpc_0.11.2.bb index 9468a07249..6ed2ada569 100644 --- a/packages/musicpd/gmpc_0.11.2.bb +++ b/packages/musicpd/gmpc_0.11.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "gtk+ libglade gnome-vfs" PR = "r1" diff --git a/packages/musicpd/gmpc_0.13.0.bb b/packages/musicpd/gmpc_0.13.0.bb index 3d9c668527..f8c99efb36 100644 --- a/packages/musicpd/gmpc_0.13.0.bb +++ b/packages/musicpd/gmpc_0.13.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "libmpd gtk+ libglade gnome-vfs" PR = "r0" diff --git a/packages/musicpd/gmpc_svn.bb b/packages/musicpd/gmpc_svn.bb index 9c03faa395..fbaea3e5f2 100644 --- a/packages/musicpd/gmpc_svn.bb +++ b/packages/musicpd/gmpc_svn.bb @@ -1,11 +1,10 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "libmpd gtk+ libglade gnome-vfs gob2" SRCDATE = "20070120" PV = "0.13.0+svn${SRCDATE}" -PR = "r0" SRC_URI = "svn://svn.musicpd.org/gmpc;module=trunk;proto=https" S = "${WORKDIR}/trunk" diff --git a/packages/musicpd/libmpd_svn.bb b/packages/musicpd/libmpd_svn.bb index eea7b952a3..4c78eb15f4 100644 --- a/packages/musicpd/libmpd_svn.bb +++ b/packages/musicpd/libmpd_svn.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Music Player Daemon (mpd) library" HOMEPAGE = "http://www.musicpd.org" +SECTION = "libs/multimedia" LICENSE = "GPLv2" -SECTION = "lib/multimedia" SRCDATE = "20070120" PV = "0.0.0+svn${SRCDATE}" -PR = "r0" SRC_URI = "svn://svn.musicpd.org/libmpd;module=trunk;proto=https" S = "${WORKDIR}/trunk" diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb index 8806653357..8d3eaa183a 100644 --- a/packages/musicpd/mpc_0.11.2.bb +++ b/packages/musicpd/mpc_0.11.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" HOMEPAGE = "http://www.musicpd.org/mpc.shtml" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz" diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.0.bb index 6d47f9418f..ccd6926fcd 100644 --- a/packages/musicpd/mpc_0.12.0.bb +++ b/packages/musicpd/mpc_0.12.0.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" HOMEPAGE = "http://www.musicpd.org/mpc.shtml" -LICENSE = "GPLv2" SECTION = "console/multimedia" -PR = "r0" +LICENSE = "GPLv2" SRC_URI = "http://www.musicpd.org/uploads/files/mpc-${PV}.tar.bz2" EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \ diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb index 1ba1fabd16..939ecec836 100644 --- a/packages/musicpd/mpd-alsa_0.11.5.bb +++ b/packages/musicpd/mpd-alsa_0.11.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa support" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv" RDEPENDS = "libao-alsa" PR = "r3" diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb index 493f677a50..9d3c5f90b0 100644 --- a/packages/musicpd/mpd_0.11.2.bb +++ b/packages/musicpd/mpd_0.11.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile" PR = "r2" diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb index d501d0e478..7a1d17ef5d 100644 --- a/packages/musicpd/mpd_0.11.5.bb +++ b/packages/musicpd/mpd_0.11.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2" PR = "r8" diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb index 3478bc76fa..5a338aa7d2 100644 --- a/packages/musicpd/mpd_svn.bb +++ b/packages/musicpd/mpd_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio" SRCDATE = "20070120" PV = "0.12.1+svn${SRCDATE}" diff --git a/packages/musicpd/ncmpc_0.11.1.bb b/packages/musicpd/ncmpc_0.11.1.bb index c687f9ea02..32195ccb9d 100644 --- a/packages/musicpd/ncmpc_0.11.1.bb +++ b/packages/musicpd/ncmpc_0.11.1.bb @@ -1,9 +1,8 @@ DESCRIPTION = "Ncurses based Music Player Daemon (mpd) Client" HOMEPAGE = "http://www.musicpd.org/ncmpc.shtml" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "ncurses glib-2.0" -PR = "r0" SRC_URI = "http://mercury.chem.pitt.edu/~shank/ncmpc-${PV}.tar.gz" diff --git a/packages/musicpd/py-libmpdclient_0.10.0.bb b/packages/musicpd/py-libmpdclient_0.10.0.bb index 675567eede..92423f0c88 100644 --- a/packages/musicpd/py-libmpdclient_0.10.0.bb +++ b/packages/musicpd/py-libmpdclient_0.10.0.bb @@ -1,9 +1,8 @@ DESCRIPTION = "Python library for Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org/py-libmpdclient.shtml" +SECTION = "libs/multimedia" LICENSE = "GPLv2" -SECTION = "lib/multimedia" DEPENDS = "libmpd python" -PR = "r0" SRC_URI = "http://mercury.chem.pitt.edu/~shank/py-libmpdclient-${PV}.tar.gz" diff --git a/packages/netcat/netcat_0.7.1.bb b/packages/netcat/netcat_0.7.1.bb index a6361f0731..c7ceccddf2 100644 --- a/packages/netcat/netcat_0.7.1.bb +++ b/packages/netcat/netcat_0.7.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNU Netcat" HOMEPAGE = "http://netcat.sourceforge.net" +SECTION = "console/network" LICENSE = "GPLv2" -SECTION = "console/networking" PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2" diff --git a/packages/nis/nis-all.bb b/packages/nis/nis-all.bb index a0af47b0cb..181a06cd2e 100644 --- a/packages/nis/nis-all.bb +++ b/packages/nis/nis-all.bb @@ -1,12 +1,12 @@ # This meta package is a convenience to build all of the # NIS packages. # -PR = "r0" + DESCRIPTION="NIS services" HOMEPAGE="http://www.linux-nis.org/nis/" -SECTION = "console/networking" +SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPL-2" +LICENSE = "GPLv2" INHIBIT_DEFAULT_DEPS = "1" diff --git a/packages/nis/nis.inc b/packages/nis/nis.inc index 45232881cb..90f7ff50a0 100644 --- a/packages/nis/nis.inc +++ b/packages/nis/nis.inc @@ -5,9 +5,9 @@ # the rpcsvc functionality is not present in uclibc DESCRIPTION ?= "NIS Server and Tools" HOMEPAGE ?= "http://www.linux-nis.org/nis/" -SECTION ?= "console/networking" +SECTION ?= "console/network" PRIORITY ?= "optional" -LICENSE ?= "GPL-2" +LICENSE ?= "GPLv2" # Override these *after* the include file if necessary! SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/${P}.tar.bz2" diff --git a/packages/nonworking/icecast/icecast_2.2.0.bb b/packages/nonworking/icecast/icecast_2.2.0.bb index c4738cb46f..c0f500ac4a 100644 --- a/packages/nonworking/icecast/icecast_2.2.0.bb +++ b/packages/nonworking/icecast/icecast_2.2.0.bb @@ -1,5 +1,5 @@ PR = "r4" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libxslt" diff --git a/packages/opie-bluetoothapplet/files/.mtn2git_empty b/packages/opie-bluetoothapplet/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-bluetoothapplet/files/.mtn2git_empty diff --git a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch b/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch new file mode 100644 index 0000000000..83ee765b12 --- /dev/null +++ b/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch @@ -0,0 +1,40 @@ +--- applet.org/bluezapplet.cpp.org 2007-02-11 16:48:06.000000000 +0000 ++++ applet/bluezapplet.cpp 2007-02-11 16:56:57.000000000 +0000 +@@ -52,6 +52,8 @@ + #include <qtimer.h> + #include <qpopupmenu.h> + #include <qmessagebox.h> ++#include <qfile.h> ++#include <qtextstream.h> + + /* STD */ + #include <device.h> +@@ -124,6 +126,28 @@ + int BluezApplet::setBluezStatus(int c, bool sync) { + + if ( c == 1 ) { ++ ++ QFile cfg("/etc/sysconfig/bluetooth"); ++ if(cfg.open(IO_ReadOnly)) { ++ QTextStream stream (&cfg); ++ QString streamIn = stream.read(); ++ QStringList list = QStringList::split("\n", streamIn); ++ cfg.close(); ++ if(list.grep("BLUETOOTH_PORT=").count() > 0 && ++ list.grep("BLUETOOTH_PROTOCOL=").count() > 0 && ++ list.grep("BLUETOOTH_SPEED=").count() > 0) { ++ btDevice = new Device( list.grep("BLUETOOTH_PORT=")[0]. ++ replace((QString)"BLUETOOTH_PORT=", ""), ++ list.grep("BLUETOOTH_PROTOCOL=")[0]. ++ replace((QString)"BLUETOOTH_PROTOCOL=", ""), ++ list.grep("BLUETOOTH_SPEED=")[0]. ++ replace((QString)"BLUETOOTH_SPEED=", "")); ++ return 0; ++ } ++ } ++ ++ // Device-specific stuff - should be removed ++ + switch ( ODevice::inst()->model() ) { + case Model_iPAQ_H39xx: + btDevice = new Device( "/dev/tts/1", "bcsp", "921600" ); diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index bf9cc5689b..a919c3094b 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -1,6 +1,8 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \ - ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet" + ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \ + file://sysconfig-bluetooth.patch;patch=1" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1.inc b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc index 7c20be565b..de9ea19368 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1.inc +++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc @@ -1,11 +1,9 @@ -DESCRIPTION = "The classic Opie media player" +DESCRIPTION = "The classic Opie media player (core)" SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libqtaux2" RDEPENDS = "opie-mediaplayer2-skin-default" -RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ -opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" APPNAME = "opieplayer" APPTYPE = "binary" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb new file mode 100644 index 0000000000..ca0beacb47 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb @@ -0,0 +1,6 @@ +require ${PN}.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb index 16d71b2333..16d71b2333 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb deleted file mode 100644 index 5f1f6b041f..0000000000 --- a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "OPIE Mediaplayer1 OGG+MP3 pseudo package." -LICENSE = "GPL" -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" -PACKAGE_ARCH = "all" -RDEPENDS = "opie-mediaplayer1 opie-mediaplayer1-libtremorplugin opie-mediaplayer1-libmadplugin" -PR = "r1" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb index ca0beacb47..0ceaac41e4 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb @@ -1,6 +1,10 @@ -require ${PN}.inc - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" +DESCRIPTION = "The classic Opie media player (core+plugins)." +LICENSE = "GPL" +ALLOW_EMPTY = "1" +PACKAGES = "${PN}" +PACKAGE_ARCH = "all" +RDEPENDS = "opie-mediaplayer1-core" +RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ +opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" +PR = "r2" diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb index c19d0ff9c8..14dab423f8 100644 --- a/packages/pam/libpam_0.79.bb +++ b/packages/pam/libpam_0.79.bb @@ -17,7 +17,7 @@ Administrators' Guide." HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam" SECTION = "libs" PRIORITY = "optional" -LICENSE = "GPL-2" +LICENSE = "GPLv2" PR = "r1" # The project is actually called Linux-PAM but that gives diff --git a/packages/reiser4progs/reiser4progs_1.0.4.bb b/packages/reiser4progs/reiser4progs_1.0.4.bb index 8185b8df89..c54b2f1ba4 100644 --- a/packages/reiser4progs/reiser4progs_1.0.4.bb +++ b/packages/reiser4progs/reiser4progs_1.0.4.bb @@ -5,7 +5,7 @@ PR = "r1" DESCRIPTION = "User-level tools for Reiser4 filesystems" HOMEPAGE = "http://www.namesys.com" SECTION = "base" -LICENSE = "GPL-2" +LICENSE = "GPLv2" SRC_URI = "ftp://ftp.namesys.com/pub/${PN}/old-versions/${P}.tar.gz \ file://oid40.c.patch;patch=1 \ diff --git a/packages/treecc/treecc_0.3.6.bb b/packages/treecc/treecc_0.3.6.bb index 9a6c7c8eda..e54beb4810 100644 --- a/packages/treecc/treecc_0.3.6.bb +++ b/packages/treecc/treecc_0.3.6.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Tree Compiler-Compiler from dotGNU" SECTION = "devel" -LICENSE = "GPL-2" +LICENSE = "GPLv2" HOMEPAGE = "http://www.southern-storm.com.au/treecc.html" PRIORITY = "optional" diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb index 638f1cb713..3bcf1eba6c 100644 --- a/packages/uboot-utils/uboot-utils_1.1.2.bb +++ b/packages/uboot-utils/uboot-utils_1.1.2.bb @@ -1,4 +1,5 @@ DESCRIPTION = "U-boot bootloader OS env. access tools for PPC" +SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "mtd-utils" diff --git a/packages/uboot/u-boot.inc b/packages/uboot/u-boot.inc new file mode 100644 index 0000000000..3b26e55f1b --- /dev/null +++ b/packages/uboot/u-boot.inc @@ -0,0 +1,30 @@ +DESCRIPTION = "U-boot bootloader" +HOMEPAGE = "http://u-boot.sf.net" +SECTION = "bootloaders" +PRIORITY = "optional" +LICENSE = "GPL" +PROVIDES = "virtual/bootloader" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" + +UBOOT_MACHINE ?= "${MACHINE}_config" +UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + oe_runmake ${UBOOT_MACHINE} + oe_runmake all +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile + +do_stage() { + install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} +} diff --git a/packages/uboot/u-boot_1.1.2.bb b/packages/uboot/u-boot_1.1.2.bb index 6b87cf9c05..cefaa9b1a1 100644 --- a/packages/uboot/u-boot_1.1.2.bb +++ b/packages/uboot/u-boot_1.1.2.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ file://arm_flags.patch;patch=1 " @@ -13,13 +9,10 @@ SRC_URI_append_mnci = "file://mnci.patch;patch=1 \ file://command-names.patch;patch=1" # TODO: SRC_URI_append_rt3000 -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" TARGET_LDFLAGS = "" -UBOOT_MACHINE ?= "${MACHINE}_config" UBOOT_MACHINE_mnci = "mnci_config" UBOOT_MACHINE_vibren = "pxa255_idp_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" inherit base @@ -28,18 +21,6 @@ do_compile () { oe_runmake all } -do_stage() { - install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile - - ######################################################### RDEPENDS_append_mnci = " hwctrl" diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/uboot/u-boot_1.1.4.bb index ca6baece4c..5c158f2401 100644 --- a/packages/uboot/u-boot_1.1.4.bb +++ b/packages/uboot/u-boot_1.1.4.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc DEFAULT_PREFERENCE = "-1" @@ -30,13 +26,9 @@ SRC_URI_append_dht-walnut= "\ file://u-boot-dht-walnut-df2.patch;patch=1" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}" TARGET_LDFLAGS = "" -UBOOT_MACHINE ?= "${MACHINE}_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" - UBOOT_MACHINE_dht-walnut = "walnut_config" def gumstix_mhz(d): @@ -55,14 +47,3 @@ do_compile () { oe_runmake ${UBOOT_MACHINE} oe_runmake all } - -do_stage() { - install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile diff --git a/packages/uboot/u-boot_1.1.6.bb b/packages/uboot/u-boot_1.1.6.bb index bfd0fb8132..7bd09c6f35 100644 --- a/packages/uboot/u-boot_1.1.6.bb +++ b/packages/uboot/u-boot_1.1.6.bb @@ -1,36 +1,8 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc PR = "r1" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2 \ file://devkit-idp.patch;patch=1" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" - -UBOOT_MACHINE ?= "${MACHINE}_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" - PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_compile () { - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - oe_runmake ${UBOOT_MACHINE} - oe_runmake all -} - -do_stage() { - install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile diff --git a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb index 361d9c876b..c29aba7cd5 100644 --- a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb +++ b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc PR = "r2" @@ -16,31 +12,6 @@ SRC_URI_append_navman-icn330 = " http://www.duff.dk/navman/navman-u-boot-2006-30 S = "${WORKDIR}/git" -#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS=""" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" - -UBOOT_MACHINE ?= "${MACHINE}_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" - PACKAGE_ARCH = "${MACHINE_ARCH}" #inherit base - -do_compile () { - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - oe_runmake ${UBOOT_MACHINE} - oe_runmake all -} - -do_stage() { - install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile diff --git a/packages/uboot/u-boot_git.bb b/packages/uboot/u-boot_git.bb index fa59bab085..9362b62041 100644 --- a/packages/uboot/u-boot_git.bb +++ b/packages/uboot/u-boot_git.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc DEFAULT_PREFERENCE = "-1" @@ -10,31 +6,6 @@ SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " S = "${WORKDIR}/git" -#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS=""" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" - -UBOOT_MACHINE ?= "${MACHINE}_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" - PACKAGE_ARCH = "${MACHINE_ARCH}" #inherit base - -do_compile () { - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - oe_runmake ${UBOOT_MACHINE} - oe_runmake all -} - -do_stage() { - install -m 755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb index 729f176a75..02c41eb42b 100644 --- a/packages/upslug/upslug-native_1.0.bb +++ b/packages/upslug/upslug-native_1.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "NSLU2 binary upload tool" HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug" SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPL-2" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "nslu2" SRC_TAG = "UPSLUG_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}" diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb index 95b340c589..e0d7f2b708 100644 --- a/packages/upslug/upslug-native_cvs.bb +++ b/packages/upslug/upslug-native_cvs.bb @@ -5,7 +5,7 @@ DESCRIPTION = "NSLU2 binary upload tool" HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug" SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPL-2" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "nslu2" # Use releases in preference diff --git a/packages/yeaphone/yeaphone_0.1.bb b/packages/yeaphone/yeaphone_0.1.bb index d17e8c2fcf..e1e06d52e9 100644 --- a/packages/yeaphone/yeaphone_0.1.bb +++ b/packages/yeaphone/yeaphone_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A VoIP SIP phone for the Yealink USB handset" HOMEPAGE = "http://www.devbase.at/voip/" MAINTAINER = "Thomas Reitmayr <treitmayr@yahoo.com>" -LICENSE = "GPL-2" +LICENSE = "GPLv2" PRIORITY = "optional" DEPENDS = "liblinphone" RDEPENDS = "liblinphone" |