From 2d8e4dfc5684f8787fee879b9a4d95a6868b31dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 8 Nov 2009 18:23:00 +0100 Subject: wv: fix compile problem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit base_do_compile() checks if there's Makefile or makefile in source directory, and then it runs oe_runmake. Since there's GNUmakefile generated, change do_compile accordingly. Signed-off-by: Petr Štetiar --- recipes/wv/wv_1.2.0.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/wv/wv_1.2.0.bb b/recipes/wv/wv_1.2.0.bb index 7f06f587c4..b3114a5325 100644 --- a/recipes/wv/wv_1.2.0.bb +++ b/recipes/wv/wv_1.2.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Programs for accessing Microsoft Word documents" HOMEPAGE = "http://wvware.sourceforge.net/" LICENSE = "GPLv2" DEPENDS = "libgsf glib-2.0" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \ file://pkgconfig.patch;patch=1" @@ -16,3 +16,7 @@ EXTRA_OECONF = "" do_stage () { autotools_stage_all } + +do_compile () { + oe_runmake -f GNUmakefile +} -- cgit v1.2.3 From c78f8925f4beebce208898d2dfe4088118e6cb87 Mon Sep 17 00:00:00 2001 From: Alexandre Tisserant Date: Sun, 8 Nov 2009 21:06:45 +0100 Subject: gecko-mediaplayer: make ai-flash.js work with midori as well * midori only supports scripts in ~/.local/share/midori/scripts so users will have to do mkdir -p ~/.local/share/midori/scripts ; cp /usr/lib/mozilla/extensions/flash@alwaysinnovating.com/chrome/content/ai-flash.js ~/.local/share/midori/scripts/ --- .../chrome/content/ai-flash.js | 51 ++++++++++------------ recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb | 2 +- 2 files changed, 25 insertions(+), 28 deletions(-) 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