diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
| commit | 60f323f25d2c0addbce5832ffbda060b0410d14f (patch) | |
| tree | 644b9212e37f1a63dcef3977159033dee2f04392 /libre/icecat/PKGBUILD | |
| parent | 9e2eedaa4921b8d57c364fb3e2a8c9e2e96b8e69 (diff) | |
| parent | 817e58c278cb8ebee7743205877d0f67c431fcec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/inetutils/PKGBUILD
extra/audacious/PKGBUILD
extra/cvs/PKGBUILD
kde-unstable/libkipi/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/psutils-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
staging/kdebase-runtime/PKGBUILD
Diffstat (limited to 'libre/icecat/PKGBUILD')
| -rw-r--r-- | libre/icecat/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 05507bbaa..49df54186 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -70,18 +70,18 @@ build() { ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR cd "${srcdir}/${pkgname}-${pkgver}/" - #patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" # Solve missing reporter locales and preprocessor.pl -# cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ + cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ # Default prefs, remove Google stuff cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/ cp "$srcdir/mozconfig" .mozconfig - #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" - #patch -Np1 -i "$srcdir/firefox-version.patch" + patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" + patch -Np1 -i "$srcdir/firefox-version.patch" [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig |