From a5885883426b91698e3ba22dd39ed40ae751e87c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 26 Aug 2015 01:37:51 -0300
Subject: icecat-38.2.0_gnu1-1: move package to [libre]

---
 libre/icecat/PKGBUILD | 60 +++++++++++----------------------------------------
 1 file changed, 12 insertions(+), 48 deletions(-)

(limited to 'libre/icecat/PKGBUILD')

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index db70b8c2c..462ccb6b7 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -13,9 +13,9 @@
 _pgo=true
 
 pkgname=icecat
-_pkgver=31.8.0-gnu1
+_pkgver=38.2.0-gnu1
 pkgver=${_pkgver//-/_}
-pkgrel=5
+pkgrel=1
 
 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64)
@@ -32,32 +32,28 @@ 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://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig}
+source=(http://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2
         mozconfig
-        mozconfig.pgo
         libre.patch
         gnu_headshadow.png
         $pkgname.desktop
         $pkgname-install-dir.patch
         freetype26.patch
         vendor.js
-        rhbz-966424.patch
         $pkgname-fixed-loading-icon.png
-        fixing_nullptr_31.7.0.patch)
-sha256sums=('370087d0adadf8b1c1e6a9920e26488a8902b9dc461d305f258fddb26a129d87'
-            'SKIP'
-            '541532698e04563ac60cb4d6c75891a8eec828df8dc19e2c20c6f84e560efb56'
-            '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4'
-            'df92188c828c104bd52e4eb090fbf3ffd745d890f9252edbf6be6edc6d5ba790'
+        remove-google-play-services-support.patch)
+sha256sums=('eef4addf37f6fc885f28eea936cee7258d42f0cb11d79703ec7ec1fe2b80ef8d'
+            '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f'
+            'e333901df4fc8a881d08c9434e3c302885ed4a989316114e13af828417510410'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745'
             '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
             'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85'
             '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33'
-            'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
-            'd57d0e4d5bc66323388e8f3c9999ed443abfd304a28a1696cc6f4518ed0d0f2a')
-validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
+            '9e651b0f7e7d9d663e8b24077d52bad15f011871747743aff60d6e2d7a45ae5b')
+#validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
 
 prepare() {
   export GNU_BUILD="gnuzilla-release"
@@ -75,22 +71,9 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
   patch -Np1 -i "$srcdir/freetype26.patch"
 
-  # https://bugs.archlinux.org/task/41689
-  patch -Np1 -i "$srcdir/rhbz-966424.patch"
-
-  # Patch for GCC 5.1
-  patch -Np1 -i "$srcdir/fixing_nullptr_31.7.0.patch"
-
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
-  sed -i '\|return| s|Flash|SWF Player|g;
-         ' browser/base/content/pageinfo/permissions.js \
-           browser/base/content/browser-plugins.js
-  sed -i '\|["]displayName["][:] ["]Flash["]| s|Flash|SWF Player|
-          \|["]displayName["][:] ["]Shockwave["]| s|Shockwave|DCR Player|
-          \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player|
-          \|installLinux| s|true|false|
-         ' browser/base/content/browser-plugins.js
+  patch -Np1 -i "$srcdir/remove-google-play-services-support.patch"
   rm -v browser/base/content/abouthome/snippet*.png || true
   sed -i '\|abouthome/snippet|d
          ' browser/base/jar.mn
@@ -111,19 +94,6 @@ prepare() {
   # Load our build config, disable SafeSearch
   cp "$srcdir/mozconfig" .mozconfig
 
-  if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
-  fi
-
-  # Fixing for libvpx >= 1.4.0
-  sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|;
-          s|PLANE_U|VPX_PLANE_U|;
-          s|PLANE_V|VPX_PLANE_V|;
-          s|PLANE_Y|VPX_PLANE_Y|;
-          s|VPX_VPX_PLANE_|VPX_PLANE_|;
-         ' content/media/encoder/VP8TrackEncoder.cpp \
-           media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
-
   mkdir "$srcdir/path"
 
   # WebRTC build tries to execute "python" and expects Python 2
@@ -133,15 +103,10 @@ prepare() {
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 
-  # Fix tab loading icon (flickers with libpng 1.6)
+  # Fix tab loading icon (doesn't work with libpng 1.6)
   # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
-  # TODO: Remove this; IceCat 36 might use CSS animations for the loading icon
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=759252
   cp "$srcdir/$pkgname-fixed-loading-icon.png" \
     browser/themes/linux/tabbrowser/loading.png
-
-  # Remove non-existent file on Makefile.in
-  sed -i '\|build/pgo/blueprint/valid.png|d' build/Makefile.in
 }
 
 build() {
@@ -150,7 +115,6 @@ build() {
   cd "$srcdir/$GNU_BUILD"
 
   export PATH="$srcdir/path:$PATH"
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
   export PYTHON="/usr/bin/python2"
 
   if $_pgo; then
-- 
cgit v1.2.3-54-g00ecf