icecat-38.3.0_gnu1-2: switch to using the official tarball

* depend on ttf-font (FS#46675 -> https://bugs.archlinux.org/task/46675)
* update libre.patch

3 files changed, 49 insertions, 13 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 18f0b2efb..9e3cc91bb 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -15,12 +15,12 @@ _pgo=true
 pkgname=icecat
 _pkgver=38.3.0-gnu1
 pkgver=${_pkgver//-/_}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
+depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification ttf-font)
 makedepends=(diffutils gst-plugins-base-libs imake inetutils libpulse mesa python2 unzip yasm zip)
 options=(!emptydirs !makeflags debug)
 if $_pgo; then
@@ -32,28 +32,31 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'gst-libav: h.264 video')
 url="http://www.gnu.org/software/gnuzilla/"
 install=$pkgname.install
-#source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig}
-source=(http://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2
+source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig}
+#source=(http://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2
         mozconfig
         libre.patch
         gnu_headshadow.png
         $pkgname.desktop
         $pkgname-install-dir.patch
         freetype26.patch
+        freetype261.patch
         vendor.js
         $pkgname-fixed-loading-icon.png
         remove-google-play-services-support.patch)
-sha256sums=('9866b4d419a261be46f4363acfaf0fb6e4dcf86f7d9137c8711bf1ba19ac8f9f'
+sha256sums=('08fe9724a84aef2182265b230c68fa37a36a5d93ffd5118ec0739718dc71a66e'
+            'SKIP'
             '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f'
-            'e333901df4fc8a881d08c9434e3c302885ed4a989316114e13af828417510410'
+            'dd173c9283babb8a04bf55274de05e823161f7d13adb8c5e21dd5a9c0dc549a2'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745'
             '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
             'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85'
+            'd3796311f93328fc8494d75a2123d29e51d52c3f01ffea0977efbfbe12171809'
             '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
             '9e651b0f7e7d9d663e8b24077d52bad15f011871747743aff60d6e2d7a45ae5b')
-#validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
+validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
 
 prepare() {
   export GNU_BUILD="gnuzilla-release"
@@ -71,6 +74,9 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
   patch -Np1 -i "$srcdir/freetype26.patch"
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1194520
+  patch -Np1 -i "$srcdir/freetype261.patch"
+
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
   patch -Np1 -i "$srcdir/remove-google-play-services-support.patch"
diff --git a/libre/icecat/freetype261.patch b/libre/icecat/freetype261.patch
new file mode 100644
index 000000000..0d5bbb1d2
--- /dev/null
+++ b/libre/icecat/freetype261.patch
@@ -0,0 +1,30 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1439509838 -32400
+# Node ID ffb931f910498504782f4df88206b9cb911b33a4
+# Parent  467ce7a8340d008a5999e57198035d492b7bc79f
+Bug 1194520 - Add a system header wrapper for <freetype/ftfntfmt.h>. r=mshal a=ritu
+
+diff --git a/config/system-headers b/config/system-headers
+--- a/config/system-headers
++++ b/config/system-headers
+@@ -453,16 +453,17 @@ foundation/base64.h
+ foundation/hexdump.h
+ #endif
+ fp.h
+ fpieee.h
+ frame/log.h
+ frame/req.h
+ freetype/freetype.h
+ freetype/ftcache.h
++freetype/ftfntfmt.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
+ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index ee88c6d56..4a4407e4f 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,6 +1,6 @@
 diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js
---- a/browser/app/profile/icecat.js	2015-08-23 17:05:03.000000000 -0300
-+++ b/browser/app/profile/icecat.js	2015-08-25 04:49:18.450526750 -0300
+--- a/browser/app/profile/icecat.js	2015-10-12 20:42:13.000000000 -0300
++++ b/browser/app/profile/icecat.js	2015-10-16 03:07:38.541169352 -0300
 @@ -279,11 +279,6 @@
  pref("browser.slowStartup.timeThreshold", 40000);
  pref("browser.slowStartup.maxSamples", 5);
@@ -13,7 +13,7 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js
  pref("browser.enable_automatic_image_resizing", true);
  pref("browser.casting.enabled", false);
  pref("browser.chrome.site_icons", true);
-@@ -2080,12 +2075,6 @@
+@@ -2114,12 +2109,6 @@
  pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%");
  pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%");
  
@@ -23,9 +23,9 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js
 -pref("browser.search.order.extra.duckduckgo", "DuckDuckGo");
 -pref("browser.search.showOneOffButtons", false);
 -
- // https://directory.fsf.org/wiki/Disable_DHE
- pref("security.ssl3.dhe_rsa_aes_128_sha", false);
- pref("security.ssl3.dhe_rsa_aes_256_sha", false);
+ // Disable Gecko media plugins: https://wiki.mozilla.org/GeckoMediaPlugins
+ pref("media.gmp-manager.url", "http://127.0.0.1/");
+ pref("media.gmp-manager.url.override", "data:text/plain,");
 diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
 --- a/browser/base/content/abouthome/aboutHome.css	2015-07-13 19:10:24.000000000 -0300
 +++ b/browser/base/content/abouthome/aboutHome.css	2015-08-18 02:37:30.095295232 -0300