Thu Mar 1 03:21:19 UTC 2012

1 files changed, 16 insertions, 13 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 0c2159889..6628c2f9b 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -38,6 +38,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         icecat-safe.desktop
         mozilla-firefox-1.0-lang.patch
         firefox-version.patch
+        firefox-install-dir.patch
 	libvpx.patch
 # Search engines
 		internet-archive.xml
@@ -52,12 +53,13 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         firefox.js
         region.properties)
 md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7'
-         '927c3ac9ad0ba682e0ec9b66ed8cc4d3'
+         'da4ed59ea64fe92fe326981a8efb3b75'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
          'bd5db57c23c72a02a489592644f18995'
-         'ff4654144499faf630271cddc2261b7c'
-         'e5d6c83b98d2d2ac69ff4d277702ff55'
+         '8f555198a7885f7d33d7525a101a6550'
+         '1e4bcac59e93d21fffa6a1d1ad235247'
+         '5d418ecdbdb9f40597df6b978b0b5ee5'
          '462c68585461f8cdc23c93c46f6ee4cf'
          '2d492295c4308f9bba9ece28d8b3af2d'
          '937ac0e5392b060d93bd33e761fbfa51'
@@ -73,6 +75,7 @@ build() {
   ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
   cd "${srcdir}/${pkgname}-${pkgver}/"
+  patch -Np1 -i "$srcdir/firefox-install-dir.patch"
   patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
   patch -Np1 -i "${srcdir}/libvpx.patch"
 
@@ -83,15 +86,15 @@ build() {
   cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
   cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/
 
-  cp "$srcdir/mozconfig" .mozconfig
-  patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch"
-  patch -Np1 -i "$srcdir/firefox-version.patch"
+  cp "${srcdir}/mozconfig" .mozconfig
+  patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
+  patch -Np1 -i "${srcdir}/firefox-version.patch"
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
       browser/base/Makefile.in
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-7.0"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-${pkgver}"
   export PYTHON="/usr/bin/python2"
 
   LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
@@ -103,7 +106,7 @@ package() {
   ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
   cd "${srcdir}/${pkgname}-${pkgver}/"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
+  make -j1 -f client.mk DESTDIR="${pkgdir}" install
 
   msg2 "Finishing..."
   install -m755 -d ${pkgdir}/usr/share/applications
@@ -115,16 +118,16 @@ package() {
   cd ${pkgdir}/usr/lib
   ln -s ${ICECATDIR} icecat
 
-  rm -rf "$pkgdir"/usr/lib/icecat-7.0/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/icecat-7.0/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/icecat-7.0/hyphenation"
+  rm -rf "${pkgdir}"/usr/lib/icecat-${pkgver}/{dictionaries,hyphenation}
+  ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/icecat-${pkgver}/dictionaries"
+  ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/icecat-${pkgver}/hyphenation"
 
   # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
+  rm -r "${pkgdir}"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
 
   #workaround for now
   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf /usr/lib/icecat-7.0/icecat-bin "$pkgdir/usr/lib/icecat-7.0/icecat"
+  ln -sf /usr/lib/icecat-${pkgver}/icecat-bin "${pkgdir}/usr/lib/icecat-${pkgver}/icecat"
 
   msg2 "Removing proprietary and anti-privacy search engines"
   rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml