fennec: add icon, apply js crosscompile patch (seriously, mozilla dudes, fix that already) and silence staging errors

5 files changed, 52 insertions, 2 deletions

diff --git a/packages/mozilla/fennec/jsautocfg-dontoverwrite.patch b/packages/mozilla/fennec/jsautocfg-dontoverwrite.patch
new file mode 100644
index 0000000000..39978cfd11
--- /dev/null
+++ b/packages/mozilla/fennec/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/fennec/mozilla-fennec.desktop b/packages/mozilla/fennec/mozilla-fennec.desktop
new file mode 100644
index 0000000000..5c56d1d21d
--- /dev/null
+++ b/packages/mozilla/fennec/mozilla-fennec.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Version=0.7
+Encoding=UTF-8
+Name=Fennec
+Comment=Fennec mobile browser
+GenericName=Fennec
+Exec=/usr/lib/fennec/fennec
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=mozilla-fennec
+Categories=Application;Network;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;
+StartupWMClass=Fennec
+StartupNotify=true
+X-Osso-Service=Mozilla.Fennec
+
diff --git a/packages/mozilla/fennec/mozilla-fennec.png b/packages/mozilla/fennec/mozilla-fennec.png
new file mode 100644
index 0000000000..b940df9b1e
--- /dev/null
+++ b/packages/mozilla/fennec/mozilla-fennec.png
diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb
index 24ff40dd2e..cb56c949d0 100644
--- a/packages/mozilla/fennec_hg.bb
+++ b/packages/mozilla/fennec_hg.bb
@@ -1,11 +1,12 @@
 DEPENDS += "cairo alsa-lib "
 
 PV = "0.7"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=7352ef83055a \
            hg://hg.mozilla.org/;module=mobile-browser;rev=767c0315369c \
            file://jsautocfg.h \
+           file://jsautocfg-dontoverwrite.patch;patch=1 \
 "
 
 S = "${WORKDIR}/mozilla-central"
@@ -49,7 +50,16 @@ do_install() {
 	tar xjf ${S}/objdir/mobile/dist/fennec-${PV}*.tar.bz2 -C ${D}/${libdir}
 	# remove x86 binary
 	rm ${D}/${libdir}/fennec/xulrunner/nsinstall
+        install -d ${D}${datadir}/applications
+        install -d ${D}${datadir}/pixmaps
+        install -m 0644 ${WORKDIR}/mozilla-${PN}.desktop ${D}${datadir}/applications/
+        install -m 0644 ${WORKDIR}/mozilla-${PN}.png ${D}${datadir}/pixmaps/
 }
 
+do_stage() {
+	:
+}	
+
+
 FILES_${PN} += "${libdir}/fennec" 
 
diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index 76f12df365..5b9acf9580 100644
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -1,4 +1,4 @@
-SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
+SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop"
 
 PACKAGES =+ "${PN}-inspector"