diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-12-24 22:36:10 -0600 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-12-24 22:36:10 -0600 |
| commit | 14f1f7de0e32b27172968722644d5dbced226f52 (patch) | |
| tree | 251a5208ec65fd5551cb2ca7dab3afaf096e0409 /libre/icecat | |
| parent | ebef5099cd5f2ec0686b8f46d389c43ea5a53cac (diff) | |
| parent | 27fcef2038e5275af70e08f3f7249767b69a3e92 (diff) | |
Merge remote-tracking branch 'libre/master'
Conflicts:
libre/aspell-pl-libre/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/icecat/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/lame-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
libre/metalog/PKGBUILD
libre/p7zip-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/sdl-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
libre/thunderbird-libre/PKGBUILD
social/batctl/PKGBUILD
social/ffingerd/PKGBUILD
social/libowfat/PKGBUILD
social/miniupnpc/PKGBUILD
social/opentracker/PKGBUILD
~lukeshu/android-udev/51-android.rules
~lukeshu/android-udev/PKGBUILD
~lukeshu/openni-unstable/PKGBUILD
~mtjm/zbar/PKGBUILD
Diffstat (limited to 'libre/icecat')
| -rw-r--r-- | libre/icecat/PKGBUILD | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 05507bbaa..e45da8749 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -83,8 +83,11 @@ build() { #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" #patch -Np1 -i "$srcdir/firefox-version.patch" +<<<<<<< HEAD [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig +======= +>>>>>>> libre/master # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in |