libre/icecat

1 files changed, 110 insertions, 97 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 6628c2f9b..79274ce21 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,137 +1,150 @@
-# Maintainer: Figue <ffigue at gmail>
+# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
+# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
 # Contributor (Parabola): emulatorman <andre.paulista@adinet.com.uy>
+# 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> 
 
-# Changelog
-# =6.0
-# * Build with PGO support
-# =3.6.13
-# * Installed Privacy Extension by default
-# * DDG is now the default search engine
-# =3.6.9
-# * Added libnotify as required by configure
-# =3.6.7
-# * Added duckduckgo.com secure search engine
-# =3.6.4
-# * Disabled SafeBrowsing until we find a non-google alternative (25/6/10)
-# * Disabled ContentHandlers and other Google/Yahoo! related services
-
-pkgname=icecat
+# 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'
+
+_pgo=false
+
+_pkgname=icecat
 pkgver=10.0
 pkgrel=1
-pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
+
+if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
+if $_pgo; then
+  pkgname+='-pgo'
+fi
+
+pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!"
 arch=('i686' 'x86_64' 'mips64el')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite3' 'libnotify' 'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme')
-makedepends=('p7zip-libre' 'zip' 'unzip-libre' 'pkg-config' 'diffutils' 'python2-libre' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb')
-options=(!buildflags !distcc)
+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'
+  'libidl2'
+  'mesa'
+  'pkg-config'
+  'python2'
+  'unzip'
+  'wireless_tools'
+  'yasm'
+  'zip'
+)
+if $_pgo; then
+  makedepends+=('xorg-server-xvfb')
+  options=(!ccache)
+fi
+
 url="http://www.gnu.org/software/gnuzilla/"
 install=icecat.install
 source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
+        mozconfig.pgo
         icecat.desktop
         icecat-safe.desktop
-        mozilla-firefox-1.0-lang.patch
-        firefox-version.patch
+        libre.patch
         firefox-install-dir.patch
-	libvpx.patch
-# Search engines
-		internet-archive.xml
-		jamendo-en.xml
-		logless-search.xml
-		scroogle-ssl-english.xml
-		yacy.xml
-        duck-duck-go-ssl.xml
-        duck-duck-go-lite.xml
-        Makefile.in
-# Default options
-        firefox.js
-        region.properties)
-md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7'
-         'da4ed59ea64fe92fe326981a8efb3b75'
-         'e81ad01dbc16ba28bf92ba4b7c309ca7'
-         'd93fe402b87cd000a869e1fd6badc6c9'
-         'bd5db57c23c72a02a489592644f18995'
-         '8f555198a7885f7d33d7525a101a6550'
-         '1e4bcac59e93d21fffa6a1d1ad235247'
-         '5d418ecdbdb9f40597df6b978b0b5ee5'
-         '462c68585461f8cdc23c93c46f6ee4cf'
-         '2d492295c4308f9bba9ece28d8b3af2d'
-         '937ac0e5392b060d93bd33e761fbfa51'
-         'cf97082e77e3ef5f1bd74b1db9329965'
-         '24528ca3f7f1e1a0ba735231aa3ac1de'
-         'c5f00b6b24222aacd5a749d1f59c4d24'
-         'e1bda0854de7d764f7401c81bb82b5ef'
-         'ff83f1796ee13d3aec494649491d93cc'
-         '9952048383966926eea6d67384102425'
-         'f1c76e7e244257856a386ca2de69bdf0')
+        vendor.js
+        libvpx.patch)
 
-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"
+if [ "$_pkgname" != "$pkgname" ]; then
+  provides+=("$_pkgname")
+  conflicts+=("$_pkgname")
+fi
 
-# Solve missing reporter locales and preprocessor.pl
-  cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/
+build() {
+  mv "$_pkgname-$pkgver" "$srcdir/mozilla-build"
+  cd "$srcdir/mozilla-build"
 
-# Default prefs, remove Google stuff 
-  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 # Load our build config, disable SafeSearch
+  patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
+  patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
+  patch -Np1 -i "$srcdir/libvpx.patch" # patch from Arch
 
-  cp "${srcdir}/mozconfig" .mozconfig
-  patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
-  patch -Np1 -i "${srcdir}/firefox-version.patch"
+  if $_pgo; then
+    cat "$srcdir/mozconfig.pgo" >> .mozconfig
+  fi
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-      browser/base/Makefile.in
+    browser/base/Makefile.in
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-${pkgver}"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
 
-  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-  LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  kill $! || true
+  if $_pgo; then
+    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+    kill $! || true
+  else
+    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  fi
 }
 
 package() {
-  ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
+  cd "$srcdir/mozilla-build"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  cd "${srcdir}/${pkgname}-${pkgver}/"
-  make -j1 -f client.mk DESTDIR="${pkgdir}" install
+  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
 
-  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}/icecat.desktop ${pkgdir}/usr/share/applications/
-  install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/
+  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/$_pkgname.png"
+  done
 
-  cd ${pkgdir}/usr/lib
-  ln -s ${ICECATDIR} icecat
+  install -d                                  "$pkgdir/usr/share/applications"
+  install -m644 "$srcdir/icecat.desktop"      "$pkgdir/usr/share/applications"
+  install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications"
 
-  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"
+  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
+  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
+  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
+  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/plugins"
+  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
 
   # We don't want the development stuff
-  rm -r "${pkgdir}"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
+  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
 
-  #workaround for now
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf /usr/lib/icecat-${pkgver}/icecat-bin "${pkgdir}/usr/lib/icecat-${pkgver}/icecat"
+  # Fix a bug with https-everywhere (duplicate rules)
+  rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD"
 
-  msg2 "Removing proprietary and anti-privacy search engines"
-  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/
+  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
 }
+
+md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7'
+         '6f3a8fd65c416216a1b56b0c2d2d81aa'
+         'ac29b01c189f20abae2f3eef1618ffc0'
+         'e81ad01dbc16ba28bf92ba4b7c309ca7'
+         'd93fe402b87cd000a869e1fd6badc6c9'
+         '145f453ef82f643711c10d97ec57a805'
+         '1e4bcac59e93d21fffa6a1d1ad235247'
+         'c382e35315047e4ca368d09383b39b8d'
+         '5d418ecdbdb9f40597df6b978b0b5ee5')