libre/icecat-6.0-1

PGO support!

1 files changed, 43 insertions, 45 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index ca29d2a2d..af3a0250c 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -7,6 +7,8 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 # Changelog
+# =6.0
+# * Build with PGO support
 # =3.6.13
 # * Installed Privacy Extension by default
 # * DDG is now the default search engine
@@ -19,18 +21,19 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=5.0
-pkgrel=2
+pkgver=6.0
+pkgrel=1
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
 arch=('i686' 'x86_64' 'mips64el')
+license=('MPL' 'GPL' 'LGPL')
+depends=('gtk2' 'gcc-libs' '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=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm'
+             'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb')
+options=(!buildflags)
 url="http://www.gnu.org/software/gnuzilla/"
-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=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
@@ -45,56 +48,65 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
 		yacy.xml
         duck-duck-go-ssl.xml
         duck-duck-go-lite.xml
+        Makefile.in
 # Default options
         firefox.js
         region.properties)
+md5sums=('9b752e408717ccb50d50f0bafe18a552'
+         'e7fe1de533599f4ae645ea1661e4006a'
+         'e81ad01dbc16ba28bf92ba4b7c309ca7'
+         'd93fe402b87cd000a869e1fd6badc6c9'
+         'bd5db57c23c72a02a489592644f18995'
+         '462c68585461f8cdc23c93c46f6ee4cf'
+         '2d492295c4308f9bba9ece28d8b3af2d'
+         '937ac0e5392b060d93bd33e761fbfa51'
+         'cf97082e77e3ef5f1bd74b1db9329965'
+         '24528ca3f7f1e1a0ba735231aa3ac1de'
+         'c5f00b6b24222aacd5a749d1f59c4d24'
+         'e1bda0854de7d764f7401c81bb82b5ef'
+         'ff83f1796ee13d3aec494649491d93cc'
+         '9952048383966926eea6d67384102425'
+         'f1c76e7e244257856a386ca2de69bdf0')
 
 build() {
-
   ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
-  msg2 "Patching some files..."
   cd "${srcdir}/${pkgname}-${pkgver}/"
   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/
+
+# 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/
 
-  msg2 "Starting build..."
   cp "${srcdir}/mozconfig" .mozconfig
 
   # Kill @PRE_RELEASE_SUFFIX@ from browser.xul because it
   # gets set to \177 for an unknown reason
   sed -i 's/@PRE_RELEASE_SUFFIX@//g' \
-    browser/base/content/browser.xul
+      browser/base/content/browser.xul
 
-  ## Don't generate startup cache. Unbreaks make install
-  sed -i 's/^GENERATE_CACHE .*/GENERATE_CACHE = true/' \
-    toolkit/mozapps/installer/packager.mk
+  export LDFLAGS="-Wl,-rpath,/usr/lib/icecat-$pkgver -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
+  export PYTHON="/usr/bin/python2"
 
-  export LDFLAGS="-Wl,-rpath,${ICECATDIR} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
-  export PYTHON="/usr/bin/python2" 
-    
   # PGO
   sed -i '/^NO_PROFILE_GUIDED_OPTIMIZE = 1$/d' \
     memory/jemalloc/Makefile.in
   echo 'LDFLAGS += -lX11 -lXrender' \
     >> layout/build/Makefile.in
 
-  # Start build
-  ./configure
-  make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-
-#  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX :99 &
-#  LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
-#  kill $! || true
+  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() {
   ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
   cd "${srcdir}/${pkgname}-${pkgver}/"
-  make install DESTDIR="${pkgdir}"
+  make -j1 -f client.mk install DESTDIR="${pkgdir}"
 
   msg2 "Finishing..."
   install -m755 -d ${pkgdir}/usr/share/applications
@@ -108,9 +120,9 @@ package() {
 
   # 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"
+  rm -rf "$pkgdir/usr/lib/icecat-$pkgver/dictionaries"
+  ln -sf /usr/share/myspell/dicts \
+    "$pkgdir/usr/lib/icecat-$pkgver/dictionaries"
 
   # We don't want the development stuff
   rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
@@ -121,17 +133,3 @@ package() {
   install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/
   install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
 }
-md5sums=('3fd4f4c2bfdacdd52bbd6e197ceda95f'
-         '105f2e5d98d719c37cba5601a59b8593'
-         'e81ad01dbc16ba28bf92ba4b7c309ca7'
-         'd93fe402b87cd000a869e1fd6badc6c9'
-         'bd5db57c23c72a02a489592644f18995'
-         '462c68585461f8cdc23c93c46f6ee4cf'
-         '2d492295c4308f9bba9ece28d8b3af2d'
-         '937ac0e5392b060d93bd33e761fbfa51'
-         'cf97082e77e3ef5f1bd74b1db9329965'
-         '24528ca3f7f1e1a0ba735231aa3ac1de'
-         'c5f00b6b24222aacd5a749d1f59c4d24'
-         'e1bda0854de7d764f7401c81bb82b5ef'
-         '9952048383966926eea6d67384102425'
-         'f1c76e7e244257856a386ca2de69bdf0')