[oe-commits] org.oe.dev firefox 3.0.1: remove js hack

[koen commit]

firefox 3.0.1: remove js hack

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 7768e79f8a911ff167d6c33d63e2fd28711d61e9
ViewMTN: http://monotone.openembedded.org/revision/info/7768e79f8a911ff167d6c33d63e2fd28711d61e9
Files:
1
packages/mozilla/firefox_3.0.1.bb
Diffs:

#
# mt diff -r5146c536eb0cda2645e9d50facaffc91be3a1d98 -r7768e79f8a911ff167d6c33d63e2fd28711d61e9
#
#
#
# patch "packages/mozilla/firefox_3.0.1.bb"
#  from [e800f5fc68d52f3d23542508ba23d6c9c39f6379]
#    to [3cc3084dbdb8556bcde37d7a6be2f522197a3431]
#
============================================================
--- packages/mozilla/firefox_3.0.1.bb	e800f5fc68d52f3d23542508ba23d6c9c39f6379
+++ packages/mozilla/firefox_3.0.1.bb	3cc3084dbdb8556bcde37d7a6be2f522197a3431
@@ -1,5 +1,5 @@ DEPENDS += "cairo"
 DEPENDS += "cairo"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
@@ -10,7 +10,6 @@ SRC_URI = "http://ftp.mozilla.org/pub/mo
 	file://Bug405992.atomic.nspr.diff;patch=1 \
 	file://random_to_urandom.diff;patch=1 \
 	file://jemalloc-tls.patch;patch=1 \
-	http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz \
 	http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0~rc2-2.diff.gz;patch=1 \	
         file://0001-Remove-Werror-from-build.patch;patch=1 \
         file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
@@ -25,10 +24,6 @@ export HOST_LIBIDL_CONFIG = "${STAGING_B
 
 export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
 
-do_unpack2() {
-	cp -pPr ${WORKDIR}/js/src* ${S}/js/
-}
-
 do_compile_prepend() {
 	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
 	sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk
@@ -47,4 +42,3 @@ do_stage() {
         sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h
 }
 
-addtask unpack2 after do_unpack before do_patch