libre/{icecat,iceweasel-libre}: run through moz-normalize-*

2 files changed, 46 insertions, 39 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index cc5889c7a..9f901f3b6 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/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>
 
 # 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'
@@ -17,9 +17,18 @@ _pgo=false
 pkgname=icecat
 pkgver=17.0.1
 pkgrel=1
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
-arch=(i686 x86_64 mips64el)
-license=(GPL2 MPL LGPL)
+arch=(
+  i686
+  mips64el
+  x86_64
+)
+license=(
+  GPL2
+  LGPL
+  MPL
+)
 depends=(
   alsa-lib
   dbus-glib
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 5df8547f7..934ea9f0d 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -1,60 +1,58 @@
 . $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 --disable-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
 
-# Icecat
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
+# 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
 
+# Application settings
 ac_add_options --disable-official-branding
 ac_add_options --with-branding=browser/branding/unofficial
 ac_add_options --with-distribution-id=org.gnu.gnuzilla
 ac_add_options --with-user-appdir=.gnuzilla
+# Icecat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
 
-# ConnochaetOS
-#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
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Build-generated