diff options
21 files changed, 75 insertions, 53 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 8b9b58ebc5..821a3a1ce5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1554,9 +1554,9 @@ sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057 md5=c0b57a115e24005f9828ca7b53908779 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd -[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz] -md5=4476c423b8f74266136964e42ea88028 -sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56 +[http://www.cmake.org/files/v2.4/cmake-2.4.8.tar.gz] +md5=f5dd061c31765a49dc17ae8bdc986779 +sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1 [ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz] md5=4cd3ce38efbd27c6cf4223f0ced2a5b5 diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 156b5b21a3..02e2399e4e 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -509,7 +509,7 @@ PREFERRED_VERSION_gnomesword ?= "2.1.2" PREFERRED_VERSION_gnuchess ?= "5.05" PREFERRED_VERSION_gnumeric ?= "1.6.3" PREFERRED_VERSION_gnupg ?= "1.4.2.2" -PREFERRED_VERSION_gnuplot ?= "4.2.0" +PREFERRED_VERSION_gnuplot ?= "4.2.2" PREFERRED_VERSION_gnuradio ?= "3.0.4" PREFERRED_VERSION_gnutls ?= "1.6.3" PREFERRED_VERSION_gob2 ?= "2.0.14" diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR77.bb b/packages/altboot/altboot_1.1.1+wip-SVNR78.bb index 425efec8fd..b74bc7baa4 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR77.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR78.bb @@ -2,7 +2,7 @@ require altboot.inc PR = "r0" -SVN_REV = "77" +SVN_REV = "78" SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \ " diff --git a/packages/apex/apex-nslu2-1.5.13/defconfig b/packages/apex/apex-nslu2-1.5.13/defconfig index 91517025bf..264f8539fc 100644 --- a/packages/apex/apex-nslu2-1.5.13/defconfig +++ b/packages/apex/apex-nslu2-1.5.13/defconfig @@ -136,7 +136,8 @@ CONFIG_AUTOBOOT=y CONFIG_AUTOBOOT_DELAY=10 CONFIG_ENV_STARTUP_KERNEL_COPY=y # CONFIG_ENV_REGION_KERNEL_SWAP is not set -# CONFIG_ENV_STARTUP_PREFIX_P is not set +CONFIG_ENV_STARTUP_PREFIX_P=y +CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m" # # Regions diff --git a/packages/apex/apex-nslu2-16mb-1.5.13/defconfig b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig index 420e0a61fd..11658813d5 100644 --- a/packages/apex/apex-nslu2-16mb-1.5.13/defconfig +++ b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig @@ -136,7 +136,8 @@ CONFIG_AUTOBOOT=y CONFIG_AUTOBOOT_DELAY=10 CONFIG_ENV_STARTUP_KERNEL_COPY=y # CONFIG_ENV_REGION_KERNEL_SWAP is not set -# CONFIG_ENV_STARTUP_PREFIX_P is not set +CONFIG_ENV_STARTUP_PREFIX_P=y +CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m" # # Regions diff --git a/packages/apex/apex-nslu2-16mb_1.5.13.bb b/packages/apex/apex-nslu2-16mb_1.5.13.bb index 5fc835fc00..2937876c03 100644 --- a/packages/apex/apex-nslu2-16mb_1.5.13.bb +++ b/packages/apex/apex-nslu2-16mb_1.5.13.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ file://defconfig" diff --git a/packages/apex/apex-nslu2_1.5.13.bb b/packages/apex/apex-nslu2_1.5.13.bb index ac3858f3a5..7fc7ea65b6 100644 --- a/packages/apex/apex-nslu2_1.5.13.bb +++ b/packages/apex/apex-nslu2_1.5.13.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ file://defconfig" diff --git a/packages/cmake/cmake-native_2.4.7.bb b/packages/cmake/cmake-native_2.4.8.bb index fcfdda1c1a..fcfdda1c1a 100644 --- a/packages/cmake/cmake-native_2.4.7.bb +++ b/packages/cmake/cmake-native_2.4.8.bb diff --git a/packages/cmake/cmake_2.4.7.bb b/packages/cmake/cmake_2.4.8.bb index 619aea9701..619aea9701 100644 --- a/packages/cmake/cmake_2.4.7.bb +++ b/packages/cmake/cmake_2.4.8.bb diff --git a/packages/fastjar/fastjar-native_0.95.bb b/packages/fastjar/fastjar-native_0.95.bb index 520235d799..3d003306b8 100644 --- a/packages/fastjar/fastjar-native_0.95.bb +++ b/packages/fastjar/fastjar-native_0.95.bb @@ -4,6 +4,8 @@ SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL" +PR = "r1" + DEPENDS = "zlib-native" SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz" @@ -20,7 +22,8 @@ do_configure () { } do_stage() { + #we should teach autotools.bbclass:autotools_stage_all() about ${STAGING_BINDIR} install -d ${STAGING_BINDIR} - install -m 755 fastjar ${STAGING_BINDIR}/fastjar - install -m 755 grepjar ${STAGING_BINDIR} + install -m 755 .libs/fastjar ${STAGING_BINDIR}/fastjar + install -m 755 .libs/grepjar ${STAGING_BINDIR} } diff --git a/packages/gnuplot/files/subdirs.patch b/packages/gnuplot/files/subdirs.patch index 69c7753973..8c7d1f0d35 100644 --- a/packages/gnuplot/files/subdirs.patch +++ b/packages/gnuplot/files/subdirs.patch @@ -1,16 +1,11 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- gnuplot-4.0.0/Makefile.am~nodocs -+++ gnuplot-4.0.0/Makefile.am +--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 ++++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- AUTOMAKE_OPTIONS = foreign 1.2h --SUBDIRS = config m4 term src docs lisp man demo tutorial -+SUBDIRS = config m4 term src man tutorial +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man share EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ diff --git a/packages/gnuplot/files/term.patch b/packages/gnuplot/files/term.patch index 2979b5ec9e..41aa8e7a97 100644 --- a/packages/gnuplot/files/term.patch +++ b/packages/gnuplot/files/term.patch @@ -1,14 +1,14 @@ ---- gnuplot-4.0.0/src/term.h.old 2005-03-01 15:17:46.424111687 +0000 -+++ gnuplot-4.0.0/src/term.h 2005-03-01 15:18:50.961405665 +0000 -@@ -54,6 +54,7 @@ +--- gnuplot-4.2.0/src/term.h.old 2007-11-16 01:21:09.000000000 -0600 ++++ gnuplot-4.2.0/src/term.h 2007-11-16 01:22:45.000000000 -0600 +@@ -70,6 +70,7 @@ */ #ifdef SHORT_TERMLIST # include "dumb.trm" /* dumb terminal */ +# include "qtopia.trm" /* QTopia terminal */ - # include "post.trm" /* postscript */ - # include "table.trm" /* built-in, but used for the documentation */ - # if !(defined(OS2) || defined(MSDOS) || defined(_Windows) || defined(ATARI) || defined(MTOS) || defined(AMIGA)) -@@ -432,6 +433,9 @@ + + # ifdef GP_ENH_EST + # include "estimate.trm" /* used for enhanced text processing */ +@@ -436,6 +437,9 @@ /* TeXDraw drawing package for LaTeX */ #include "texdraw.trm" diff --git a/packages/gnuplot/gnuplot-4.2.0/.mtn2git_empty b/packages/gnuplot/gnuplot-4.0.0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnuplot/gnuplot-4.2.0/.mtn2git_empty +++ b/packages/gnuplot/gnuplot-4.0.0/.mtn2git_empty diff --git a/packages/gnuplot/files/debian-separate-x11-package.patch b/packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch index 7afa0ee00e..7afa0ee00e 100644 --- a/packages/gnuplot/files/debian-separate-x11-package.patch +++ b/packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch diff --git a/packages/gnuplot/files/matrix.patch b/packages/gnuplot/gnuplot-4.0.0/matrix.patch index 10f56d9f6a..10f56d9f6a 100644 --- a/packages/gnuplot/files/matrix.patch +++ b/packages/gnuplot/gnuplot-4.0.0/matrix.patch diff --git a/packages/gnuplot/gnuplot-4.2.0/subdirs.patch b/packages/gnuplot/gnuplot-4.0.0/subdirs.patch index 8c7d1f0d35..69c7753973 100644 --- a/packages/gnuplot/gnuplot-4.2.0/subdirs.patch +++ b/packages/gnuplot/gnuplot-4.0.0/subdirs.patch @@ -1,11 +1,16 @@ ---- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- gnuplot-4.0.0/Makefile.am~nodocs ++++ gnuplot-4.0.0/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- AUTOMAKE_OPTIONS = foreign 1.2h --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share +-SUBDIRS = config m4 term src docs lisp man demo tutorial ++SUBDIRS = config m4 term src man tutorial EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ diff --git a/packages/gnuplot/gnuplot-4.0.0/term.patch b/packages/gnuplot/gnuplot-4.0.0/term.patch new file mode 100644 index 0000000000..2979b5ec9e --- /dev/null +++ b/packages/gnuplot/gnuplot-4.0.0/term.patch @@ -0,0 +1,20 @@ +--- gnuplot-4.0.0/src/term.h.old 2005-03-01 15:17:46.424111687 +0000 ++++ gnuplot-4.0.0/src/term.h 2005-03-01 15:18:50.961405665 +0000 +@@ -54,6 +54,7 @@ + */ + #ifdef SHORT_TERMLIST + # include "dumb.trm" /* dumb terminal */ ++# include "qtopia.trm" /* QTopia terminal */ + # include "post.trm" /* postscript */ + # include "table.trm" /* built-in, but used for the documentation */ + # if !(defined(OS2) || defined(MSDOS) || defined(_Windows) || defined(ATARI) || defined(MTOS) || defined(AMIGA)) +@@ -432,6 +433,9 @@ + /* TeXDraw drawing package for LaTeX */ + #include "texdraw.trm" + ++/* Qtopia */ ++#include "qtopia.trm" ++ + /* METAFONT */ + #include "metafont.trm" + diff --git a/packages/gnuplot/gnuplot-4.2.0/term.patch b/packages/gnuplot/gnuplot-4.2.0/term.patch deleted file mode 100644 index 41aa8e7a97..0000000000 --- a/packages/gnuplot/gnuplot-4.2.0/term.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gnuplot-4.2.0/src/term.h.old 2007-11-16 01:21:09.000000000 -0600 -+++ gnuplot-4.2.0/src/term.h 2007-11-16 01:22:45.000000000 -0600 -@@ -70,6 +70,7 @@ - */ - #ifdef SHORT_TERMLIST - # include "dumb.trm" /* dumb terminal */ -+# include "qtopia.trm" /* QTopia terminal */ - - # ifdef GP_ENH_EST - # include "estimate.trm" /* used for enhanced text processing */ -@@ -436,6 +437,9 @@ - /* TeXDraw drawing package for LaTeX */ - #include "texdraw.trm" - -+/* Qtopia */ -+#include "qtopia.trm" -+ - /* METAFONT */ - #include "metafont.trm" - diff --git a/packages/gnuplot/gnuplot_4.2.0.bb b/packages/gnuplot/gnuplot_4.2.2.bb index 1df0c9fa21..478f6e2b0f 100644 --- a/packages/gnuplot/gnuplot_4.2.0.bb +++ b/packages/gnuplot/gnuplot_4.2.2.bb @@ -1,6 +1,6 @@ require gnuplot.inc -PR = "r1" +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \ http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \ diff --git a/packages/gnuplot/gnuplot_cvs.bb b/packages/gnuplot/gnuplot_cvs.bb new file mode 100644 index 0000000000..d63d31a492 --- /dev/null +++ b/packages/gnuplot/gnuplot_cvs.bb @@ -0,0 +1,17 @@ +require gnuplot.inc + +PV = "4.3.0+cvs${SRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous@gnuplot.cvs.sourceforge.net/cvsroot/${PN};module=${PN} \ + http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \ + file://subdirs.patch;patch=1 \ + file://term.patch;patch=1 \ + file://gnuplot.desktop \ + file://gnuplot.png" + +S = "${WORKDIR}/${PN}" + +do_configure_prepend() { + ./prepare +} diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc index b74eda45c3..939caf0f78 100644 --- a/packages/opie-taskbar/opie-taskbar-images.inc +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -54,4 +54,4 @@ python do_package_prepend () { } PACKAGE_ARCH = "all" -PACKAGES =+ "${PN}-dbg ${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320" +PACKAGES = "${PN}-dbg ${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320" |