Date: Monday, April 30, 2012 @ 03:19:12
Author: ibiru
Revision: 157955
archrelease: copy trunk to extra-i686
Added:
firefox/repos/extra-i686/PKGBUILD
(from rev 157950, firefox/trunk/PKGBUILD)
firefox/repos/extra-i686/firefox-install-dir.patch
(from rev 157951, firefox/trunk/firefox-install-dir.patch)
firefox/repos/extra-i686/firefox.desktop
(from rev 157951, firefox/trunk/firefox.desktop)
firefox/repos/extra-i686/firefox.install
(from rev 157951, firefox/trunk/firefox.install)
firefox/repos/extra-i686/gcc47.patch
(from rev 157951, firefox/trunk/gcc47.patch)
firefox/repos/extra-i686/mozconfig
(from rev 157951, firefox/trunk/mozconfig)
firefox/repos/extra-i686/vendor.js
(from rev 157951, firefox/trunk/vendor.js)
Deleted:
firefox/repos/extra-i686/PKGBUILD
firefox/repos/extra-i686/firefox-install-dir.patch
firefox/repos/extra-i686/firefox.desktop
firefox/repos/extra-i686/firefox.install
firefox/repos/extra-i686/gcc47.patch
firefox/repos/extra-i686/mozconfig
firefox/repos/extra-i686/vendor.js
---------------------------+
PKGBUILD | 138 ++++++++++++++++++-------------------
firefox-install-dir.patch | 56 +++++++--------
firefox.desktop | 162 ++++++++++++++++++++++----------------------
firefox.install | 26 +++----
gcc47.patch | 154 ++++++++++++++++++++---------------------
mozconfig | 90 ++++++++++++------------
vendor.js | 18 ++--
7 files changed, 322 insertions(+), 322 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2012-04-30 07:19:11 UTC (rev 157954)
+++ PKGBUILD 2012-04-30 07:19:12 UTC (rev 157955)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ib...@archlinux.org>
-# Contributor: Jakub Schmidtke <sja...@gmail.com>
-
-pkgname=firefox
-pkgver=12.0
-pkgrel=2
-pkgdesc="Standalone web browser from mozilla.org"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.3' 'libxt' 'hunspell'
'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite' 'libnotify'
'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme')
-makedepends=('unzip' 'zip' 'diffutils' 'python2' 'wireless_tools' 'yasm'
'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb' 'imake')
-url="http://www.mozilla.org/projects/firefox";
-install=firefox.install
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
- mozconfig firefox.desktop firefox-install-dir.patch vendor.js
- gcc47.patch)
-md5sums=('80c3e5927274de7f181fb5f931ac5fd4'
- 'db6d2bd4671831859566f403a086fdf2'
- 'bdeb0380c7fae30dd0ead6d2d3bc5873'
- '594523c536a9be951b52c90dd85aff18'
- '0d053487907de4376d67d8f499c5502b'
- '5a8563f8fda7ad30405c86764267a19c')
-
-build() {
- cd "mozilla-release"
-
- cp "$srcdir/mozconfig" .mozconfig
- patch -Np1 -i "$srcdir/firefox-install-dir.patch"
- patch -Np1 -i "$srcdir/gcc47.patch"
-
- # Fix PRE_RELEASE_SUFFIX
- sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
- browser/base/Makefile.in
-
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
- export PYTHON="/usr/bin/python2"
-
- LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0
1280x1024x24 :99 &
- LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild
MOZ_MAKE_FLAGS="$MAKEFLAGS"
- kill $! || true
-}
-
-package() {
- cd "mozilla-release"
- make -j1 -f client.mk DESTDIR="$pkgdir" install
-
- install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/firefox/defaults/pref"
-
- for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
- install -Dm644 browser/branding/official/default${i/x*/}.png \
- "$pkgdir/usr/share/icons/hicolor/$i/apps/firefox.png"
- done
-
- install -Dm644 "$srcdir/firefox.desktop" \
- "$pkgdir/usr/share/applications/firefox.desktop"
-
- rm -rf "$pkgdir"/usr/lib/firefox/{dictionaries,hyphenation}
- ln -sf /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
- ln -sf /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
-
-
- # We don't want the development stuff
- rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl}
-
- #workaround for now
- #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
- ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
-}
Copied: firefox/repos/extra-i686/PKGBUILD (from rev 157950,
firefox/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2012-04-30 07:19:12 UTC (rev 157955)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer : Ionut Biru <ib...@archlinux.org>
+# Contributor: Jakub Schmidtke <sja...@gmail.com>
+
+pkgname=firefox
+pkgver=12.0
+pkgrel=2
+pkgdesc="Standalone web browser from mozilla.org"
+arch=('i686' 'x86_64')
+license=('MPL' 'GPL' 'LGPL')
+depends=('gtk2' 'mozilla-common' 'nss>=3.13.3' 'libxt' 'hunspell'
'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite' 'libnotify'
'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme')
+makedepends=('unzip' 'zip' 'diffutils' 'python2' 'wireless_tools' 'yasm'
'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb' 'imake')
+url="http://www.mozilla.org/projects/firefox";
+install=firefox.install
+source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.bz2
+ mozconfig firefox.desktop firefox-install-dir.patch vendor.js
+ gcc47.patch)
+md5sums=('80c3e5927274de7f181fb5f931ac5fd4'
+ 'db6d2bd4671831859566f403a086fdf2'
+ 'bdeb0380c7fae30dd0ead6d2d3bc5873'
+ '594523c536a9be951b52c90dd85aff18'
+ '0d053487907de4376d67d8f499c5502b'
+ '5a8563f8fda7ad30405c86764267a19c')
+
+build() {
+ cd "mozilla-release"
+
+ cp "$srcdir/mozconfig" .mozconfig
+ patch -Np1 -i "$srcdir/firefox-install-dir.patch"
+ patch -Np1 -i "$srcdir/gcc47.patch"
+
+ # Fix PRE_RELEASE_SUFFIX
+ sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
+ browser/base/Makefile.in
+
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
+ export PYTHON="/usr/bin/python2"
+
+ LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0
1280x1024x24 :99 &
+ LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild
MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ kill $! || true
+}
+
+package() {
+ cd "mozilla-release"
+ make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+ install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/firefox/defaults/pref"
+
+ for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+ install -Dm644 browser/branding/official/default${i/x*/}.png \
+ "$pkgdir/usr/share/icons/hicolor/$i/apps/firefox.png"
+ done
+
+ install -Dm644 "$srcdir/firefox.desktop" \
+ "$pkgdir/usr/share/applications/firefox.desktop"
+
+ rm -rf "$pkgdir"/usr/lib/firefox/{dictionaries,hyphenation}
+ ln -sf /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
+ ln -sf /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
+
+
+ # We don't want the development stuff
+ rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl}
+
+ #workaround for now
+ #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+ ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
+}
Deleted: firefox-install-dir.patch
===================================================================
--- firefox-install-dir.patch 2012-04-30 07:19:11 UTC (rev 157954)
+++ firefox-install-dir.patch 2012-04-30 07:19:12 UTC (rev 157955)
@@ -1,28 +0,0 @@
-diff -Nur mozilla-release.orig/config/autoconf.mk.in
mozilla-release/config/autoconf.mk.in
---- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048
+0000
-+++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469
+0000
-@@ -68,8 +68,8 @@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in
mozilla-release/js/src/config/autoconf.mk.in
---- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06
14:06:45.586263727 +0000
-+++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06
14:21:01.770993669 +0000
-@@ -61,8 +61,8 @@
- datadir = @datadir@
- mandir = @mandir@
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- TOP_DIST = @TOP_DIST@
- ifneq (,$(filter /%,$(TOP_DIST)))
Copied: firefox/repos/extra-i686/firefox-install-dir.patch (from rev 157951,
firefox/trunk/firefox-install-dir.patch)
===================================================================
--- firefox-install-dir.patch (rev 0)
+++ firefox-install-dir.patch 2012-04-30 07:19:12 UTC (rev 157955)
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in
mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048
+0000
++++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469
+0000
+@@ -68,8 +68,8 @@
+ mandir = @mandir@
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in
mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06
14:06:45.586263727 +0000
++++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06
14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir = @datadir@
+ mandir = @mandir@
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST = @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
Deleted: firefox.desktop
===================================================================
--- firefox.desktop 2012-04-30 07:19:11 UTC (rev 157954)
+++ firefox.desktop 2012-04-30 07:19:12 UTC (rev 157955)
@@ -1,81 +0,0 @@
-[Desktop Entry]
-Name=Firefox
-Name[bn]=ফায়ারফক্স
-Name[eo]=Fajrovulpo
-Name[fi]=Firefox
-Name[pa]=ਫਾਇਰਫੋਕਸ
-Name[tg]=Рӯбоҳи оташин
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-Exec=firefox %u
-Icon=firefox
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
Copied: firefox/repos/extra-i686/firefox.desktop (from rev 157951,
firefox/trunk/firefox.desktop)
===================================================================
--- firefox.desktop (rev 0)
+++ firefox.desktop 2012-04-30 07:19:12 UTC (rev 157955)
@@ -0,0 +1,81 @@
+[Desktop Entry]
+Name=Firefox
+Name[bn]=ফায়ারফক্স
+Name[eo]=Fajrovulpo
+Name[fi]=Firefox
+Name[pa]=ਫਾਇਰਫੋਕਸ
+Name[tg]=Рӯбоҳи оташин
+GenericName=Web Browser
+GenericName[af]=Web Blaaier
+GenericName[ar]=متصفح ويب
+GenericName[az]=Veb Səyyahı
+GenericName[bg]=Браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[br]=Furcher ar Gwiad
+GenericName[bs]=WWW Preglednik
+GenericName[ca]=Fullejador web
+GenericName[cs]=WWW prohlížeč
+GenericName[cy]=Porydd Gwe
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής Ιστού
+GenericName[eo]=TTT-legilo
+GenericName[es]=Navegador web
+GenericName[et]=Veebilehitseja
+GenericName[eu]=Web arakatzailea
+GenericName[fa]=مرورگر وب
+GenericName[fi]=WWW-selain
+GenericName[fo]=Alnótsfar
+GenericName[fr]=Navigateur web
+GenericName[gl]=Navegador Web
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[is]=Vafri
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lo]=ເວັບບຣາວເຊີ
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Web Pārlūks
+GenericName[mk]=Прелистувач на Интернет
+GenericName[mn]=Веб-Хөтөч
+GenericName[nb]=Nettleser
+GenericName[nds]=Nettkieker
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[nso]=Seinyakisi sa Web
+GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ro]=Navigator de web
+GenericName[ru]=Веб-браузер
+GenericName[se]=Fierpmádatlogan
+GenericName[sk]=Webový prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sr]=Веб претраживач
+GenericName[sr@Latn]=Veb pretraživač
+GenericName[ss]=Ibrawuza yeWeb
+GenericName[sv]=Webbläsare
+GenericName[ta]=வலை உலாவி
+GenericName[tg]=Тафсиргари вэб
+GenericName[th]=เว็บบราวเซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[uz]=Веб-браузер
+GenericName[ven]=Buronza ya Webu
+GenericName[vi]=Trình duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[xh]=Umkhangeli zincwadi we Web
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+GenericName[zu]=Umcingi we-Web
+Exec=firefox %u
+Icon=firefox
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+StartupNotify=true
+Categories=Network;WebBrowser;
Deleted: firefox.install
===================================================================
--- firefox.install 2012-04-30 07:19:11 UTC (rev 157954)
+++ firefox.install 2012-04-30 07:19:12 UTC (rev 157955)
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: firefox/repos/extra-i686/firefox.install (from rev 157951,
firefox/trunk/firefox.install)
===================================================================
--- firefox.install (rev 0)
+++ firefox.install 2012-04-30 07:19:12 UTC (rev 157955)
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Deleted: gcc47.patch
===================================================================
--- gcc47.patch 2012-04-30 07:19:11 UTC (rev 157954)
+++ gcc47.patch 2012-04-30 07:19:12 UTC (rev 157955)
@@ -1,77 +0,0 @@
-
-# HG changeset patch
-# User Martin Stránský <stran...@redhat.com>
-# Date 1328886461 -3600
-# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
-# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049
-Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
-
-diff --git a/ipc/chromium/src/base/file_util_linux.cc
b/ipc/chromium/src/base/file_util_linux.cc
---- a/ipc/chromium/src/base/file_util_linux.cc
-+++ b/ipc/chromium/src/base/file_util_linux.cc
-@@ -1,15 +1,18 @@
- // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <string>
- #include <vector>
-
- #include "base/eintr_wrapper.h"
- #include "base/file_path.h"
- #include "base/string_util.h"
-
-diff --git a/ipc/chromium/src/base/message_pump_libevent.cc
b/ipc/chromium/src/base/message_pump_libevent.cc
---- a/ipc/chromium/src/base/message_pump_libevent.cc
-+++ b/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -1,16 +1,19 @@
- // Copyright (c) 2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/message_pump_libevent.h"
-
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "third_party/libevent/event.h"
-
-diff --git a/ipc/chromium/src/base/time_posix.cc
b/ipc/chromium/src/base/time_posix.cc
---- a/ipc/chromium/src/base/time_posix.cc
-+++ b/ipc/chromium/src/base/time_posix.cc
-@@ -8,16 +8,19 @@
- #include <mach/mach_time.h>
- #endif
- #include <sys/time.h>
- #ifdef ANDROID
- #include <time64.h>
- #else
- #include <time.h>
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <limits>
-
- #include "base/basictypes.h"
- #include "base/logging.h"
-
- namespace base {
-
-
Copied: firefox/repos/extra-i686/gcc47.patch (from rev 157951,
firefox/trunk/gcc47.patch)
===================================================================
--- gcc47.patch (rev 0)
+++ gcc47.patch 2012-04-30 07:19:12 UTC (rev 157955)
@@ -0,0 +1,77 @@
+
+# HG changeset patch
+# User Martin Stránský <stran...@redhat.com>
+# Date 1328886461 -3600
+# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
+# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049
+Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
+
+diff --git a/ipc/chromium/src/base/file_util_linux.cc
b/ipc/chromium/src/base/file_util_linux.cc
+--- a/ipc/chromium/src/base/file_util_linux.cc
++++ b/ipc/chromium/src/base/file_util_linux.cc
+@@ -1,15 +1,18 @@
+ // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
+ #include "base/file_util.h"
+
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <string>
+ #include <vector>
+
+ #include "base/eintr_wrapper.h"
+ #include "base/file_path.h"
+ #include "base/string_util.h"
+
+diff --git a/ipc/chromium/src/base/message_pump_libevent.cc
b/ipc/chromium/src/base/message_pump_libevent.cc
+--- a/ipc/chromium/src/base/message_pump_libevent.cc
++++ b/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -1,16 +1,19 @@
+ // Copyright (c) 2008 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
+ #include "base/message_pump_libevent.h"
+
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+ #include "third_party/libevent/event.h"
+
+diff --git a/ipc/chromium/src/base/time_posix.cc
b/ipc/chromium/src/base/time_posix.cc
+--- a/ipc/chromium/src/base/time_posix.cc
++++ b/ipc/chromium/src/base/time_posix.cc
+@@ -8,16 +8,19 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
+ #include <time.h>
+ #endif
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <limits>
+
+ #include "base/basictypes.h"
+ #include "base/logging.h"
+
+ namespace base {
+
+
Deleted: mozconfig
===================================================================
--- mozconfig 2012-04-30 07:19:11 UTC (rev 157954)
+++ mozconfig 2012-04-30 07:19:12 UTC (rev 157955)
@@ -1,45 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON)
$(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
Copied: firefox/repos/extra-i686/mozconfig (from rev 157951,
firefox/trunk/mozconfig)
===================================================================
--- mozconfig (rev 0)
+++ mozconfig 2012-04-30 07:19:12 UTC (rev 157955)
@@ -0,0 +1,45 @@
+. $topsrcdir/browser/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON)
$(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
Deleted: vendor.js
===================================================================
--- vendor.js 2012-04-30 07:19:11 UTC (rev 157954)
+++ vendor.js 2012-04-30 07:19:12 UTC (rev 157955)
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
Copied: firefox/repos/extra-i686/vendor.js (from rev 157951,
firefox/trunk/vendor.js)
===================================================================
--- vendor.js (rev 0)
+++ vendor.js 2012-04-30 07:19:12 UTC (rev 157955)
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
