libre/icecat-5.0-2

1 files changed, 41 insertions, 20 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 89f6755fb..ca29d2a2d 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,22 +56,38 @@ 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/
 
   msg2 "Starting build..."
   cp "${srcdir}/mozconfig" .mozconfig
-  unset CFLAGS
-  unset CXXFLAGS
 
-  export LDFLAGS="-Wl,-rpath,${ICECATDIR}"
+  # 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
 
+  ## 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,${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}"
-  msg2 "Build complete"
 
+#  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
 }
 
 package() {
@@ -92,19 +106,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'