icecat-4rc1-2

1 files changed, 31 insertions, 56 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 6fb517f35..39259f447 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,5 +1,7 @@
-# Contributor: figue <ffigue at gmail>
+# Maintainer: Figue <ffigue at gmail>
+# Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contrubutor (Parabola): vando <facundo@esdebian.org>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
@@ -17,27 +19,27 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=3.6.15
-_pkgver=3.6
-pkgrel=1
-_xulver=1.9.2.15
+pkgver=4.0rc1
+_pkgver=4.0-rc1
+pkgrel=2
+_xulver=2.0
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gnuzilla/"
 license=('GPL2' 'MPL' 'LGPL')
-depends=("xulrunner=$_xulver" 'desktop-file-utils' 'mime-types' 'shared-mime-info' 'libnotify')
-makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'autoconf2.13')
+depends=("xulrunner=${_xulver}" 'desktop-file-utils')
+makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
 provides=('firefox')
 conflicts=('firefox')
-replaces=("firefox=$pkgver")
+replaces=("firefox=${_pkgver}")
 install=icecat.install
-source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
+#source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
+source=(ftp://alpha.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz2
         mozconfig
         icecat.desktop
         icecat-safe.desktop
         mozilla-firefox-1.0-lang.patch
 	    xulrunner-copy-stub.patch
-    	python2.7.patch
 # Search engines
 		arch-linux-wiki.xml
 		internet-archive.xml
@@ -48,21 +50,20 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         duck-duck-go-ssl.xml
         duck-duck-go-lite.xml
 # Default options
-        firefox.js
+	firefox.js
         region.properties)
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/"
 
-  ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR
+  ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR
 
   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"
-  patch -Np0 -i "${srcdir}/python2.7.patch"
   
-  cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/
   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
@@ -71,65 +72,39 @@ build() {
 
   export LDFLAGS="-Wl,-rpath,${ICECATDIR}"
 
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
+  #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+  ./configure
+  make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
   msg2 "Build complete"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/"
-  ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR
+  ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR
 
-  make -j1 DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}-${_pkgver}/"
+  #make -j1 -f client.mk DESTDIR="${pkgdir}" install
+  make install DESTDIR="${pkgdir}"
 
   msg2 "Finishing..."
-  mv ${pkgdir}/usr/lib/${pkgname}-${pkgver} ${pkgdir}${ICECATDIR}
-  cd ${pkgdir}${ICECATDIR}
-  ln -s ${pkgname} firefox
-  ln -s ${pkgname}-bin firefox-bin
-  cd ${pkgdir}/usr/bin
-  ln -sf ${ICECATDIR}/icecat icecat
-  cd ${pkgdir}/usr/lib
-  ln -s ${ICECATDIR} icecat
 
   install -m755 -d ${pkgdir}/usr/share/applications
   install -m755 -d ${pkgdir}/usr/share/pixmaps
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png || return 1
-  install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/ || return 1
-  install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/ || return 1
-
-  ##copy default prefs manually, icecat fails to start otherwise
-  cp -rf ${srcdir}/${pkgname}-${pkgver}/dist/bin/defaults/preferences ${pkgdir}${ICECATDIR}/defaults
+  install -m644 ${srcdir}/${pkgname}-${_pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
+  install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/
+  install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/
 
   msg2 "Removing proprietary and anti-privacy search engines"
   rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo}.xml
-
   msg2 "And provide better ones..."
+  install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/
   install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
 }
-md5sums=('367ae51a84b290fff548721bf83bb8b4'
-         'df304f6eb858922a0703bac7903aecc8'
-         'e81ad01dbc16ba28bf92ba4b7c309ca7'
-         'd93fe402b87cd000a869e1fd6badc6c9'
-         'bd5db57c23c72a02a489592644f18995'
-         '5a1938673a367b20ecfa009a5eb767aa'
-         'ab3dc9aecae7f08b9492fb3c00a5fd28'
-         '3403175087e584a8c5e840cc62310cd9'
-         '462c68585461f8cdc23c93c46f6ee4cf'
-         '2d492295c4308f9bba9ece28d8b3af2d'
-         '937ac0e5392b060d93bd33e761fbfa51'
-         'cf97082e77e3ef5f1bd74b1db9329965'
-         '24528ca3f7f1e1a0ba735231aa3ac1de'
-         'c5f00b6b24222aacd5a749d1f59c4d24'
-         'e1bda0854de7d764f7401c81bb82b5ef'
-         'eeac4b61ea403d18efa9597921741075'
-         'f1c76e7e244257856a386ca2de69bdf0')
-md5sums=('5ee4cd447cf51afb0539d958f6f13c97'
-         'df304f6eb858922a0703bac7903aecc8'
+md5sums=('0aefdb2b3fedf7eca5719939a25abf77'
+         '436db1f6167ffe82fcd71a53ffd80d0e'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
          'bd5db57c23c72a02a489592644f18995'
          '5a1938673a367b20ecfa009a5eb767aa'
-         'ab3dc9aecae7f08b9492fb3c00a5fd28'
          '3403175087e584a8c5e840cc62310cd9'
          '462c68585461f8cdc23c93c46f6ee4cf'
          '2d492295c4308f9bba9ece28d8b3af2d'
@@ -138,5 +113,5 @@ md5sums=('5ee4cd447cf51afb0539d958f6f13c97'
          '24528ca3f7f1e1a0ba735231aa3ac1de'
          'c5f00b6b24222aacd5a749d1f59c4d24'
          'e1bda0854de7d764f7401c81bb82b5ef'
-         'eeac4b61ea403d18efa9597921741075'
+         '9952048383966926eea6d67384102425'
          'f1c76e7e244257856a386ca2de69bdf0')