switch to trunk, one patch fails
This commit is contained in:
parent
9b49533d8e
commit
ea4d50885d
1 changed files with 2 additions and 2 deletions
|
@ -23,7 +23,7 @@ BUILD=1
|
|||
|
||||
|
||||
#BRANCH=latest-tracemonkey
|
||||
BRANCH=${BRANCH:=latest-mozilla-aurora}
|
||||
BRANCH=${BRANCH:=latest-trunk}
|
||||
|
||||
if [ $KEEP_TAR == "NO" ]; then
|
||||
[ -e firefox-*.en-US.linux-x86_64.tar.bz2 ] && for f in firefox-*.en-US.linux-x86_64.tar.bz2 ; do mv $f $f.orig ; done
|
||||
|
@ -47,7 +47,7 @@ mkdir -p $PKG/usr/lib$LIBSUFFIX
|
|||
cd firefox-$VERSION
|
||||
sed -i -e "s/usr\/local/usr/" firefox
|
||||
# zcat $CWD/mozilla-firefox-mimeTypes-fix.diff.gz | patch -p1 --verbose --suffix=.orig || exit 1
|
||||
zcat $CWD/firefox.moz_plugin_path.diff.gz | sed "s|/lib/|/lib$LIBSUFFIX/|g" | sed "s|firefox-3.0|firefox-$VERSION|g" | patch -p1 --verbose --suffix=.orig || exit 1
|
||||
# zcat $CWD/firefox.moz_plugin_path.diff.gz | sed "s|/lib/|/lib$LIBSUFFIX/|g" | sed "s|firefox-3.0|firefox-$VERSION|g" | patch -p1 --verbose --suffix=.orig || exit 1
|
||||
rm -f defaults/pref/firefox.js.orig
|
||||
cd $PKG/usr/lib$LIBSUFFIX/firefox-$VERSION
|
||||
# There's really no reason to save this .orig:
|
||||
|
|
Loading…
Reference in a new issue