Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre

Conflicts:
	libre/kernel26-libre-lts/PKGBUILD
	libre/kernel26-libre-lts/config.x86_64

1 files changed, 18 insertions, 19 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 39259f447..b2af0eaf1 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -19,22 +19,20 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=4.0rc1
-_pkgver=4.0-rc1
-pkgrel=2
-_xulver=2.0
+pkgver=4.0.1
+pkgrel=1
+_xulver=2.0.1
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
-arch=('i686' 'x86_64')
+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')
 conflicts=('firefox')
-replaces=("firefox=${_pkgver}")
+replaces=("firefox=${pkgver}")
 install=icecat.install
-#source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
-source=(ftp://alpha.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz2
+source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
         icecat.desktop
         icecat-safe.desktop
@@ -50,15 +48,15 @@ source=(ftp://alpha.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz
         duck-duck-go-ssl.xml
         duck-duck-go-lite.xml
 # Default options
-	firefox.js
+        firefox.js
         region.properties)
 
 build() {
 
-  ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR
+  ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
   msg2 "Patching some files..."
-  cd "${srcdir}/${pkgname}-${_pkgver}/"
+  cd "${srcdir}/${pkgname}-${pkgver}/"
   patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
   patch -Np0 -i "${srcdir}/xulrunner-copy-stub.patch"
   
@@ -72,34 +70,35 @@ build() {
 
   export LDFLAGS="-Wl,-rpath,${ICECATDIR}"
 
-  #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
   ./configure
   make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
   msg2 "Build complete"
+
 }
 
 package() {
-  ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR
+  ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
-  cd "${srcdir}/${pkgname}-${_pkgver}/"
-  #make -j1 -f client.mk DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}-${pkgver}/"
   make install DESTDIR="${pkgdir}"
 
   msg2 "Finishing..."
-
   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
+  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/
 
+  cd ${pkgdir}/usr/lib
+  ln -s ${ICECATDIR} icecat
+
   msg2 "Removing proprietary and anti-privacy search engines"
-  rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo}.xml
+  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=('0aefdb2b3fedf7eca5719939a25abf77'
+md5sums=('1b4d44ee5badc28fd332cba564ecde0a'
          '436db1f6167ffe82fcd71a53ffd80d0e'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'