diff options
78 files changed, 4010 insertions, 649 deletions
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 2045697516..cb03650b48 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -24,6 +24,7 @@ gnome_stage_includes() { do_install_append() { rm -rf ${D}${localstatedir}/lib/scrollkeeper/* + rm -rf ${D}${localstatedir}/scrollkeeper/* rm -f ${D}${datadir}/applications/*.cache } diff --git a/conf/checksums.ini b/conf/checksums.ini index 808cc119cf..ec2651aca4 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1330,6 +1330,10 @@ sha256=9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f md5=593aa8001e5c301cdcdb4bb3b63abc33 sha256=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826 +[http://www.angstrom-distribution.org/unstable/sources/XML-Twig-3.33-upstream-keeps-changing-this-tarball-so-we-mirror-our-own.tar.gz] +md5=918f8fba33efe9cf5bc07907c6e46556 +sha256=630241ba64685a264d6037cbfed29476ab36fce652746ad5966fcfc9d810abdc + [http://xmltwig.com/xmltwig/XML-Twig-3.33.tar.gz] md5=495fd8c320f67a0c8e0b90ccb060f0ea sha256=d87ff8c2e1d594808a58373ea72aa6f6e42a9a19d550a569b3f5fd22b53efebd @@ -1974,6 +1978,10 @@ sha256=1828cbd348d1418287b29337e1047cfc3d6c092e18691cd9c6dfc2d6535bcebd md5=cebfeb99c4a7c2a6cee2564770415fe7 sha256=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 +[http://mesh.dl.sourceforge.net/project/asciidoc/asciidoc/8.5.1/asciidoc-8.5.1.tar.gz] +md5=412fb0c86c3dcb4cc159ef63bd274c90 +sha256=ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20 + [http://downloads.sourceforge.net/asio/asio-1.1.1.tar.bz2] md5=3e6bcedc549cb4c014227f882969db5c sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e @@ -6758,6 +6766,10 @@ sha256=d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae md5=0b6ccb1e50d96b7127a18a69399fcf05 sha256=b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4 +[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.5/source/firefox-3.5.5.source.tar.bz2] +md5=b3d92dfb40584141dc1068efc9bdfccc +sha256=2abe7b5561267c230df27951d1d8c6c5853d06ca2426997fdf0a63c5db689feb + [http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2] md5=ff6bf463300cb56bcf750973b2af3d80 sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d @@ -10602,6 +10614,10 @@ sha256=d864fbd0bf6dea24e4f71736da9902a1cae86d0a1a893b5fe17118927257ec3e md5=cd3f3eb54446be6003156158d51f4884 sha256=4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b +[http://grun.googlecode.com/files/grun-0.9.3.tar.gz] +md5=7788783e5a18221ae591606075d3a8ee +sha256=c484d80e4636a69c6ad6491a4769f555be20595e67cb4bfd34c3c91e501b95dd + [ftp://ftp.gnu.org/gnu/gsl/gsl-1.10.tar.gz] md5=d67be4f2e5560d6cf907e18a428becdc sha256=ea3968b58bfc7619f47bf5ff64a7198a38c72419d24b844e71e48823a4776ff0 @@ -11518,6 +11534,10 @@ sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06 md5=0524dd10ad986285ff4eeb3507f7471c sha256=689a413119c4d670ed95b9ac24511655c4805db678ad93866ab1036a0ba4d6bf +[ftp://ftp.gnu.org/gnu/help2man/help2man-1.36.4.tar.gz] +md5=d31a0a38c2ec71faa06723f6b8bd3076 +sha256=a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2 + [http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2] md5=1d9420e8b5a6d5fa491c458ffafd4adb sha256=b60a5358e56e676529e7d3d655d5107a76b9a2434e38952711fea794f65721ce @@ -16950,6 +16970,10 @@ sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f md5=7a80058a6382e5108cdb5554d1609615 sha256=d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f +[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.4.tar.bz2] +md5=ae7fde9fd0ae0d8ac12a1e1536d6d3ce +sha256=e63041db1ef666ca43293762c8aaec27bd4b54b6d86aee68ebb090c1b66584f4 + [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.tar.bz2] md5=84c077a37684e4cbfa67b18154390d8a sha256=0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512 @@ -19018,6 +19042,10 @@ sha256=86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff md5=14d9464043848eddd0bd0d35bbe63415 sha256=3761b27da474b71194ff900e7941c005be608a00fe0ba1f216390ce1ba9cba72 +[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.28/nautilus-2.28.1.tar.bz2] +md5=e759af11a0844828e2b484ff42ee0498 +sha256=197147d04529ee14e63609fa4755c9effff19842f77594ff8cce6e2433d0bec0 + [http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-2.6.1.tar.bz2] md5=50c5732c0c9736b7026bce1c6b0007dc sha256=83f1d6623e142af30a9b3fa9135ecf973fbb8c89f1dc36a218de0c0fef6ddf07 @@ -25230,6 +25258,10 @@ sha256=6c3b8fa619749cbb28ca0f8847e56773d13e0bb92f1ea34287420950373640c2 md5=59c92b223f69cc7e50ae6cd9d1539db1 sha256=38f24694983f20e5bffa2ebc1d35a7c3abea50479a6df6449cc900bf2732891d +[http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2] +md5=a8a9193c0ac1bec2f3ca7be40a5a82eb +sha256=d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1 + [ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.8a.tar.bz2] md5=0f429f87de9f20d6c0d952e63bf8e3fa sha256=efcda677be7ef093757d965736dff3b5af8c9fd36b3e7d3db09289a4a1d5d013 @@ -29630,6 +29662,10 @@ sha256=e17aa1a26119966258a3656a262bbba0f0b036eecb6d9bf192cf4b497686f4c3 md5=b006f72f45a3e7be3e64f88813275403 sha256=aa9acb0c56f0e40f574e16b762fb590fbd0004bccac9847e2e710c041b90d412 +[http://downloads.sourceforge.net/xmltv/xmltv-0.5.56.tar.bz2] +md5=308c01dc50f9f138bd9ada7483e2877b +sha256=9159dc21418f611b37520bf71f32a0ca3b44cc490bb9620e9a1a812315685d1c + [http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2] md5=03a85cfc5e1877a2e1f7be4fa1d3f63c sha256=ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index 0ec6782076..a9cf5773ee 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -2,16 +2,18 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -TARGET_ARCH = "i486" +TARGET_ARCH = "i586" require conf/machine/include/tune-geode.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" +PREFERRED_PROVIDER_virtual/kernel = "linux" +MACHINE_EXTRA_RDEPENDS = "kernel grub" +MACHINE_FEATURES = "kernel26 pci ext2 x86" +MACHINE_KERNEL_VERSION = "2.6" udevdir = "/dev" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586" diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf index f8874fd966..7316f2d747 100644 --- a/conf/machine/geodelx.conf +++ b/conf/machine/geodelx.conf @@ -2,7 +2,7 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -TARGET_ARCH = "i486" +TARGET_ARCH = "i586" require conf/machine/include/tune-geode.inc @@ -11,5 +11,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586" SELECTED_OPTIMIZATION_pn-glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}" diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 3978e8778f..5f33b46090 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # MIT Licensed # Initial version by Graeme 'XorA' Gregory, Further changes by Koen Kooi @@ -32,7 +32,7 @@ cat files-remote files-local | sort | uniq -u >files-uniq cat files-uniq files-local | sort | uniq -d > files-trans # Remove SGX files -rm -f upload-queue/bigbuck* upload-queue/*libgles* upload-queue/*3.00.* +rm -f upload-queue/bigbuck* upload-queue/*libgles* upload-queue/*kdrive*sgx* upload-queue/*3.00.* # Copy over non-duplicate files echo "Starting rsync..." diff --git a/recipes/asciidoc/asciidoc_8.5.1.bb b/recipes/asciidoc/asciidoc_8.5.1.bb new file mode 100644 index 0000000000..7e7fde7e91 --- /dev/null +++ b/recipes/asciidoc/asciidoc_8.5.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." +HOMEPAGE = "http://www.methods.co.nz/asciidoc/" +LICENSE = "GPLv2" + +SRC_URI = "http://mesh.dl.sourceforge.net/project/asciidoc/asciidoc/${PV}/asciidoc-${PV}.tar.gz" + +inherit distutils-base autotools_stage pkgconfig + +export vimdir = "${D}${sysconfdir}/vim" +export DESTDIR = "${D}" + +do_install() { + sed -i -e s:/etc/vim::g ${S}/Makefile + oe_runmake -e install +} + +FILES_${PN} += "${sysconfdir}" + +# TODO: only depend on codecs, csv, doctest, fnmatch, getopt, HTMLParser, locale, optparse, os, re, shutil, StringIO, subprocess, sys, tempfile, time, traceback, urlparse, zipfile +RDEPENDS_${PN} += "python-modules" diff --git a/recipes/gnome-mplayer/gecko-mediaplayer/extensions/flash@alwaysinnovating.com/chrome/content/ai-flash.js b/recipes/gnome-mplayer/gecko-mediaplayer/extensions/flash@alwaysinnovating.com/chrome/content/ai-flash.js index c21ad58847..e1486ab2dd 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer/extensions/flash@alwaysinnovating.com/chrome/content/ai-flash.js +++ b/recipes/gnome-mplayer/gecko-mediaplayer/extensions/flash@alwaysinnovating.com/chrome/content/ai-flash.js @@ -1,6 +1,18 @@ +// ==UserScript== +// @name Flash AI +// @description Flash AI add-on +// @include * +// ==/UserScript== -window.addEventListener("load", function() { myExtension.init(); }, false); +var firefox = true; +if (navigator.userAgent.match("midori")) firefox = false; + +if (!firefox){ + window.addEventListener("load", function() { myExtension.onPageLoad(); }, true); +}else{ + window.addEventListener("load", function() { myExtension.init(); }, false); +} var myExtension = { init: function() { var appcontent = document.getElementById("appcontent"); // browser @@ -17,7 +29,7 @@ var myExtension = { } - var idInterval=-1; +var idInterval=-1; var stUrl = ""; var timeout=2000; @@ -67,8 +79,12 @@ function getBrowserForDocument(aDocument) { } function checkPageOnLoad(aEvent) { - - var doc=aEvent.originalTarget; + var doc; + if(firefox){ + doc=aEvent.originalTarget; + }else{ + doc=document; + } var loc=doc.location.href; var host=doc.location.hostname; idInterval=-1; @@ -97,7 +113,7 @@ function checkPageOnLoad(aEvent) { } if (host.match(/youtube\./i)!=null) { - embmedia=doc.embeds; + embmedia=doc.embeds; if ((embmedia!=null)&&(idInterval==-1)) { embid=embmedia[0].getAttribute('id'); flashvars=unescape(embmedia[0].getAttribute('flashvars')); @@ -121,7 +137,7 @@ function checkPageOnLoad(aEvent) { embmedia=doc.embeds; if ((embmedia!=null)&&(idInterval==-1)) { - + // Myspace loves embedded flash ads, so we have to find the good one for the video... for(i=0;i<embmedia.length;i++){ source=unescape(embmedia[i].getAttribute('src')); @@ -132,11 +148,11 @@ function checkPageOnLoad(aEvent) { if(source.match(/videoid=/i)!=null){ // regular video id = (source.split("videoid=")[1]).split("&")[0]; + }else if (source.match(/m=/i)!=null){ // video channels myspace or hot stuff id = (source.split("m=")[1]).split("&")[0].split(",")[0]; } - if(id!=-1){ stUrl=getMySpaceURL(doc, id); idInterval = setInterval(replaceTag, timeout, doc, " ", new Array(embmedia[i])); @@ -150,24 +166,7 @@ function checkPageOnLoad(aEvent) { if (host.match(/video.yahoo\./i)!=null) { embmedia=doc.embeds; - if ((embmedia!=null)&&(idInterval==-1)) { - for(i=0;i<embmedia.length;i++){ - embid = embmedia[i].getAttribute('id'); - if(embid=="video1"){ - stUrl = getURLfromKeepVid(loc); - if (stUrl != null){ - this.replaceTag(doc, embid, new Array(embmedia[i])); - return; - } - } - } - } - setTimeout(checkPageOnLoad,timeout,aEvent); - return; - } - if (host.match(/video.yahoo\./i)!=null) { - embmedia=doc.embeds; if ((embmedia!=null)&&(idInterval==-1)) { for(i=0;i<embmedia.length;i++){ embid = embmedia[i].getAttribute('id'); @@ -183,8 +182,7 @@ function checkPageOnLoad(aEvent) { setTimeout(checkPageOnLoad,timeout,aEvent); return; } - - + //if (loc.match(/my\.yahoo\..*\/\?rd\=nux/i)!=null) { // atag=doc.getElementsByTagName('a'); @@ -197,7 +195,6 @@ function checkPageOnLoad(aEvent) { //} if (host.match(/dailymotion\./i)!=null) { - embmedia=doc.embeds; if ((embmedia!=null)&&(idInterval==-1)) { embid=embmedia[0].getAttribute('id'); diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb index 9dca7cb6b6..a9260836da 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb +++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "firefox gtk+ gconf dbus-glib" RDEPENDS = "firefox gnome-mplayer" -PR = "r4" +PR = "r7" inherit autotools @@ -13,21 +13,23 @@ SRC_URI = "http://gecko-mediaplayer.googlecode.com/files/${P}.tar.gz \ file://extensions \ " -# Yes, this needs to match the firefox version you are building *exactly* -MOZILLA_HOME = "firefox-3.5.4" - do_install_append() { - install -d ${D}${libdir}/${MOZILLA_HOME}/extensions/ cp -dpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/ - ln -sf ${libdir}/mozilla/extensions/flash@alwaysinnovating.com ${D}${libdir}/${MOZILLA_HOME}/extensions/ } PACKAGES =+ "${PN}-firefox-hack" RDEPENDS_${PN}-firefox-hack = "${PN}" -FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions ${libdir}/${MOZILLA_HOME}" +FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions" FILES_${PN} += "${sysconfdir}/* \ - ${libdir}/mozilla/* ${libdir}/${MOZILLA_HOME}" + ${libdir}/mozilla/*" FILES_${PN}-dbg += "${libdir}/mozilla*/plugins/.debug/*" +pkg_postinst_${PN}-firefox-hack() { +for firefoxdir in $D${libdir}/firefox-* ; do + if [ -e $firefoxdir/extensions/ ] ; then + ln -sf ${libdir}/mozilla/extensions/flash@alwaysinnovating.com $firefoxdir/extensions/ + fi +done +} diff --git a/recipes/gnome/gnome-icon-theme_1.3.3.bb b/recipes/gnome/gnome-icon-theme_1.3.3.bb deleted file mode 100644 index c601d2a5d0..0000000000 --- a/recipes/gnome/gnome-icon-theme_1.3.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2" -DEPENDS = "glib-2.0 intltool-native" -PR ="r1" - -FILES_${PN} += "${datadir}/*" - -EXTRA_OECONF = "--disable-hicolor-check" - -inherit autotools pkgconfig |
