From b453854f5cbc46a46f1a35fb853e252e18951885 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 12 Jan 2013 16:01:34 -0500
Subject: libre/{icecat,iceweasel-libre}: run through moz-normalize-*

---
 libre/iceweasel-libre/PKGBUILD  | 53 +++++++++++++++++++++++++++++++----
 libre/iceweasel-libre/mozconfig | 62 ++++++++++++++++++++---------------------
 2 files changed, 77 insertions(+), 38 deletions(-)

(limited to 'libre/iceweasel-libre')

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 56f1e4dfa..b58061577 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -8,7 +8,7 @@
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
+# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
 
 _pgo=false
 
@@ -29,11 +29,52 @@ if $_pgo; then
   pkgname+='-pgo'
 fi
 
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification')
-makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'zip')
+arch=(
+  'i586'
+  'i686'
+  'mips64el'
+  'x86_64'
+)
+license=(
+  'GPL2'
+  'LGPL'
+  'MPL'
+)
+depends=(
+  'alsa-lib'
+  'dbus-glib'
+  'desktop-file-utils'
+  'gtk2'
+  'hicolor-icon-theme'
+  'hunspell'
+  'libevent'
+  'libnotify'
+  'libvpx'
+  'libxt'
+  'mime-types'
+  'mozilla-common'
+  'mozilla-searchplugins'
+  'nss>=3.13.1'
+  'sqlite3'
+  'startup-notification'
+)
+makedepends=(
+  'autoconf2.13'
+  'diffutils'
+  'imagemagick'
+  'libidl2'
+  'librsvg'
+  'libxslt'
+  'mesa'
+  'pkg-config'
+  'python2'
+  'quilt'
+  'unzip'
+  'wireless_tools'
+  'zip'
+)
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 if $_pgo; then
   makedepends+=('xorg-server-xvfb')
@@ -93,7 +134,7 @@ build() {
   patch -Np1 -i "$srcdir/shared-libs.patch"
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-  
+
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index e79896323..619398aae 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -1,55 +1,53 @@
 . $topsrcdir/browser/config/mozconfig
 
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
 # System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-pixman
+ac_add_options --enable-system-sqlite
 ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
 
 # Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-installer
+ac_add_options --disable-mochitest
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --enable-gio
+ac_add_options --enable-startup-notification
 
+# Vendor settings
 # Optimization
 ac_add_options --enable-optimize
-
+ac_add_options --libdir=/usr/lib
+ac_add_options --prefix=/usr
+export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
-# Iceweasel
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# ConnochaetOS
+# Platform settings
 #ac_add_options --build=i586-pc-linux-gnu
 #ac_add_options --host=i586-pc-linux-gnu
 #export USE_SHORT_LIBNAME=1
 #mk_add_options USE_SHORT_LIBNAME=1
 
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
+# Application settings
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/branding
+
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Build-generated
-- 
cgit v1.2.3