From c3f41f14797cb2f0340a60237f5daeb3a1fcdc05 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 12 Jan 2013 17:00:09 -0500
Subject: libre/icecat: tidy up, rename files

PKGBUILD-only:
 * do the build in "mozilla-release", to match firefox
PKGBUILD and file changes:
 * mv {,bug-}xulrunner-copy-stub.patch
 * rm cairo.patch # was unapplied
 * mv {icecat,firefox}-install-dir.patch
 * mv {icecat,firefox}.install
 * rm gcc47.patch # was unapplied
 * rm icecat-safe.desktop # no longer offered for firefox
 * add shared-libs.patch from firefox, this was done by a sed script

 *
---
 libre/icecat/PKGBUILD | 79 +++++++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 50 deletions(-)

(limited to 'libre/icecat/PKGBUILD')

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 2cb4f355f..e82263c30 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -14,9 +14,6 @@
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
 
-# If you are updating this package, don't forget to update the version number in
-# the value for 'browser.dictionaries.download.url' in 'libre.patch'
-
 # Version Configuration ##############################################
 
 _pgo=false
@@ -72,7 +69,6 @@ makedepends=(
   'librsvg'
   'libxslt'
   'mesa'
-  'pkg-config'
   'python2'
   'unzip'
   'wireless_tools'
@@ -85,48 +81,34 @@ if $_pgo; then
 fi
 optdepends=('wireless_tools: Location detection via available WiFi networks')
 url=http://www.gnu.org/software/gnuzilla/
-install=$pkgname.install
-source=(
-  ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
-  mozconfig
-  mozconfig.pgo
-  xulrunner-copy-stub.patch
-  libre.patch
-  $pkgname.desktop
-  $pkgname-safe.desktop
-  $pkgname-install-dir.patch
-  vendor.js
-  #cairo.patch
-)
-md5sums=(
-  c88a29aa92fc41a07e777a0e63ac5f7e
-  a22327391a1995703436ed42fe703d3f
-  ac29b01c189f20abae2f3eef1618ffc0
-  3009b176cc5f9b1e416b1bf7c45b064b
-  f4cffe48e84283026da634424f4bbee6
-  e81ad01dbc16ba28bf92ba4b7c309ca7
-  d93fe402b87cd000a869e1fd6badc6c9
-  64826fcf48816b13090042eefddbaa58
-  0d053487907de4376d67d8f499c5502b
-  #c8552d030494443218d88792f4dbbd0f
-)
+install=firefox.install
+options=(!emptydirs)
+source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
+	mozilla-bug-756390.patch::https://bugzilla.mozilla.org/attachment.cgi?id=629706
+        bug-xulrunner-copy-stub.patch libre.patch mozconfig.pgo
+        mozconfig $pkgbase.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
+md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
+         '78bbfc17be8ef2104699875300a22316'
+         '3009b176cc5f9b1e416b1bf7c45b064b'
+         'f4cffe48e84283026da634424f4bbee6'
+         'e4cd438a0b2a42dfb14bc7716e901e5f'
+         'd35394f58d9893609a352cd4c82731dc'
+         'e81ad01dbc16ba28bf92ba4b7c309ca7'
+         '64826fcf48816b13090042eefddbaa58'
+         '0d053487907de4376d67d8f499c5502b'
+         '52e52f840a49eb1d14be1c0065b03a93')
 
 build() {
-  mv $pkgname-$pkgver $srcdir/gnuzilla-build
-  cd $srcdir/gnuzilla-build
+  mv $pkgname-$pkgver mozilla-release
+  cd mozilla-release
 
   cp ../mozconfig .mozconfig
-  if $_pgo; then
-    cat ../mozconfig.pgo >> .mozconfig
-  fi
-  patch -Np1 -i ../$pkgname-install-dir.patch
-  patch -Np1 -i ../xulrunner-copy-stub.patc
+  if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
+  patch -Np1 -i ../firefox-install-dir.patch
+  patch -Np1 -i ../shared-libs.patch
   patch -Np1 -i ../libre.patch
-  #patch -Np1 -i ../cairo.patch
-
-  # Fix for use nspr, sqlite and nss external
-  sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
-    browser/installer/Makefile.in
+  patch -Np1 -i ../bug-xulrunner-copy-stub.patch
+  patch -Np1 -i ../mozilla-bug-756390.patch
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
@@ -146,8 +128,6 @@ build() {
       echo 'ac_add_options --disable-jemalloc' >> .mozconfig
   fi
 
-  chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
-
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
   export PYTHON="/usr/bin/python2"
   export MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -169,20 +149,19 @@ build() {
 }
 
 package() {
-  cd $srcdir/gnuzilla-build
+  cd mozilla-release
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
 
   brandingdir=browser/branding/unofficial
-  icondir=$pkgdir/usr/share/icons/hicolor
-  for i in 16x16 32x32 48x48; do
-    install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgbase.png
+  for i in 16 32 48; do
+      install -Dm644 $brandingdir/default$i.png \
+        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgbase.png"
   done
 
-  for d in $pkgname $pkgname-safe; do
-    install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
-  done
+  install -Dm644 ../$pkgbase.desktop \
+    "$pkgdir/usr/share/applications/$pkgbase.desktop"
 
   # Use system-provided dictionaries
   rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
-- 
cgit v1.2.3