Merge branch 'master' of vparabola:~/abslibre-pre-mips64el

Conflicts:
	community/mingw32-gcc/PKGBUILD
	extra/transmission/PKGBUILD
	libre/icecat/PKGBUILD
	multilib/nspluginwrapper/PKGBUILD

2 files changed, 37 insertions, 29 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index b18691b41..5fc57db23 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -19,27 +19,25 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=4.0.1
+pkgver=5.0
 pkgrel=2
-_xulver=2.0.1
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gnuzilla/"
-license=('GPL2' 'MPL' 'LGPL')
-depends=("xulrunner=${_xulver}" 'desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
-provides=("firefox=${pkgver}")
-conflicts=('firefox')
-replaces=('firefox')
+license=('GPL' 'MPL' 'LGPL')
+depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss>=3.12.10' 'libxt'
+         'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib'
+         'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'desktop-file-utils'
+         'libvpx' 'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo')
+makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools'
+             'yasm' 'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb')
 install=icecat.install
-source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
+source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
         icecat.desktop
         icecat-safe.desktop
         mozilla-firefox-1.0-lang.patch
-	    xulrunner-copy-stub.patch
 # Search engines
-		arch-linux-wiki.xml
 		internet-archive.xml
 		jamendo-en.xml
 		logless-search.xml
@@ -58,7 +56,6 @@ build() {
   msg2 "Patching some files..."
   cd "${srcdir}/${pkgname}-${pkgver}/"
   patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
-  patch -Np0 -i "${srcdir}/xulrunner-copy-stub.patch"
   
   cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
   cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/
@@ -66,16 +63,16 @@ build() {
   msg2 "Starting build..."
   cp "${srcdir}/mozconfig" .mozconfig
 
-  [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig
-
-  unset CFLAGS
-  unset CXXFLAGS
-
-  export LDFLAGS="-Wl,-rpath,${ICECATDIR}"
+  if [ "$CARCH" = "mips64el" ]: then
+    echo "ac_add_options --disable-ipc" >> .mozconfig
+    unset CFLAGS
+    unset CXXFLAGS
+    export LDFLAGS="-Wl,-rpath,${ICECATDIR}"
+  fi
 
+  # Start build
   ./configure
   make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-  msg2 "Build complete"
 
 }
 
@@ -95,19 +92,26 @@ package() {
   cd ${pkgdir}/usr/lib
   ln -s ${ICECATDIR} icecat
 
+  # Remove included dictionaries, add symlink to system myspell path
+  # Note: this will cause file conflicts when users have installed dictionaries in the old location
+  #rm -rf "${pkgdir}/usr/lib/firefox-$pkgver/dictionaries"
+  #ln -sf /usr/share/myspell/dicts \
+  #  "${pkgdir}/usr/lib/firefox-$pkgver/dictionaries"
+
+  # We don't want the development stuff
+  rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
+
   msg2 "Removing proprietary and anti-privacy search engines"
   rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml
   msg2 "And provide better ones..."
   install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/
   install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
 }
-md5sums=('1b4d44ee5badc28fd332cba564ecde0a'
-         '436db1f6167ffe82fcd71a53ffd80d0e'
+md5sums=('3fd4f4c2bfdacdd52bbd6e197ceda95f'
+         '105f2e5d98d719c37cba5601a59b8593'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
          'bd5db57c23c72a02a489592644f18995'
-         '5a1938673a367b20ecfa009a5eb767aa'
-         '3403175087e584a8c5e840cc62310cd9'
          '462c68585461f8cdc23c93c46f6ee4cf'
          '2d492295c4308f9bba9ece28d8b3af2d'
          '937ac0e5392b060d93bd33e761fbfa51'
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 0162c51ac..442dfe76d 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -10,9 +10,11 @@ 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-cairo
+ac_add_options --enable-system-lcms
 ac_add_options --with-pthreads
 
 ac_add_options --enable-default-toolkit=cairo-gtk2
@@ -21,13 +23,11 @@ ac_add_options --disable-safe-browsing
 ac_add_options --enable-extensions=default
 ac_add_options --enable-startup-notification
 ac_add_options --enable-pango
-ac_add_options --enable-strip
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --enable-smil
 ac_add_options --enable-canvas3d
 ac_add_options --enable-places
-ac_add_options --enable-shared-js
 ac_add_options --enable-url-classifier
 
 ac_add_options --enable-optimize
@@ -37,21 +37,19 @@ ac_add_options --enable-jemalloc
 ac_add_options --enable-xterm-updates
 ac_add_options --enable-printing
 ac_add_options --enable-xinerama
-ac_add_options --enable-libxul
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-2.0
-ac_add_options --with-branding=browser/branding/unofficial
 ac_add_options --with-distribution-id=org.gnu.gnuzilla
 ac_add_options --with-user-appdir=.gnuzilla
+ac_add_options --with-branding=browser/branding/unofficial
 
 ac_add_options --disable-javaxpcom
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-xprint
 ac_add_options --disable-mochitest
 ac_add_options --disable-debug
 ac_add_options --disable-installer
 ac_add_options --disable-pedantic
+ac_add_options --disable-static
 
 ac_add_options --enable-gio
 ac_add_options --disable-gnomevfs
@@ -62,3 +60,9 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
+
+# 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'