From df3c80e0145d622889ebf8774837c9220e3250a5 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 16 Oct 2015 03:16:41 -0300
Subject: 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
---
 libre/icecat/PKGBUILD | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'libre/icecat/PKGBUILD')

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"
-- 
cgit v1.2.3-54-g00ecf