Update to 38.3.0

This commit is contained in:
Figue 2015-10-14 01:59:38 +02:00
parent 6df6a415c1
commit 263967d84f
4 changed files with 57 additions and 59 deletions

View file

@ -1,7 +1,7 @@
pkgbase = icecat
pkgdesc = GNU version of the Firefox browser.
pkgver = 31.8.0
pkgrel = 2
pkgver = 38.3.0
pkgrel = 1
url = http://www.gnu.org/software/gnuzilla/
install = icecat.install
arch = i686
@ -42,36 +42,22 @@ pkgbase = icecat
optdepends = gst-plugins-good: h.264 video
optdepends = gst-libav: h.264 video
optdepends = upower: Battery API
source = https://ftp.gnu.org/gnu/gnuzilla/31.8.0/icecat-31.8.0-gnu1.tar.bz2
source = https://ftp.gnu.org/gnu/gnuzilla/31.8.0/icecat-31.8.0-gnu1.tar.bz2.sig
source = icecat-CVE-2015-4473-partial.patch
source = icecat-CVE-2015-4482.patch
source = icecat-CVE-2015-4488.patch
source = icecat-CVE-2015-4489.patch
source = icecat-CVE-2015-4491.patch
source = icecat-CVE-2015-4492.patch
source = icecat-CVE-2015-4495.patch
source = https://ftp.gnu.org/gnu/gnuzilla/38.3.0/icecat-38.3.0-gnu1.tar.bz2
source = https://ftp.gnu.org/gnu/gnuzilla/38.3.0/icecat-38.3.0-gnu1.tar.bz2.sig
source = mozconfig
source = icecat.desktop
source = icecat-safe.desktop
source = vendor.js
source = fixing_nullptr_31.7.0.patch
source = freetype26.patch
sha256sums = 370087d0adadf8b1c1e6a9920e26488a8902b9dc461d305f258fddb26a129d87
source = 0001-Bug-1194520-Add-a-system-header-wrapper-for-freetype.patch
sha256sums = 08fe9724a84aef2182265b230c68fa37a36a5d93ffd5118ec0739718dc71a66e
sha256sums = SKIP
sha256sums = 2c569b073f03450fec0d2c9ea0a735ffb91df5bf7fa0595a3ea55e41935bae5a
sha256sums = d05621004ec24f72cb14696977e0f75e091bb44203139f089643e055401fa9b4
sha256sums = f963b4dd4582e0a79aed41cf7c148ccc2dbf65e6e518ba6736e12ba746ff62c5
sha256sums = eedb11bacc946d0e449883de269b8c19e7fc754037e18ddc72f7c65219f88482
sha256sums = 05be2eb909ea21df6d4be2aec1ac910604953522c00447a78e056f46300c57c6
sha256sums = c83d604ddedf6ba5da41bd4a2581413df0c5a4ef285b5dbef37a2a1d17e7356b
sha256sums = 28ad5a04c6e0f12ef7b43e6e12c7a1f82f2583282c62128d135b24305626f387
sha256sums = 91a675ffde751aac15c83401dc8842a055df0fe3949b6a0b304882608e6a4de2
sha256sums = 4602066304f0bb10bdaea75405570d500dae3199b77b04a45167d423fdf9bf6f
sha256sums = c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3
sha256sums = 190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303
sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
sha256sums = d57d0e4d5bc66323388e8f3c9999ed443abfd304a28a1696cc6f4518ed0d0f2a
sha256sums = b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85
sha256sums = 5371c4e73ef9620c2cf3e922cbf7e6ebecfe5b0d80df03ba0744ad61de7c1a25
pkgname = icecat

View file

@ -0,0 +1,35 @@
From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 14 Aug 2015 08:50:38 +0900
Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
<freetype/ftfntfmt.h>
---
config/system-headers | 1 +
1 file changed, 1 insertion(+)
diff --git a/config/system-headers b/config/system-headers
index bee35da..ad1f88d 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -450,16 +450,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
--
2.5.0.3.ge81d485

View file

@ -6,10 +6,10 @@
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
pkgname=icecat
pkgver=31.8.0
_pkgver=31.8.0-gnu1
pkgver=38.3.0
_pkgver=38.3.0-gnu1
_pkgverbase=${pkgver%%.*}
pkgrel=2
pkgrel=1
pkgdesc="GNU version of the Firefox browser."
arch=(i686 x86_64)
url="http://www.gnu.org/software/gnuzilla/"
@ -28,35 +28,22 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
install=icecat.install
source=(https://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
#source=(https://mirrors.kernel.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2 ## Good mirror
icecat-CVE-2015-4473-partial.patch
icecat-CVE-2015-4482.patch
icecat-CVE-2015-4488.patch
icecat-CVE-2015-4489.patch
icecat-CVE-2015-4491.patch
icecat-CVE-2015-4492.patch
icecat-CVE-2015-4495.patch
mozconfig
#source=(http://jenkins.trisquel.info/icecat/${pkgname}-${_pkgver}.tar.bz2 ## Official developer (Ruben Rodriguez) site
mozconfig
icecat.desktop
icecat-safe.desktop
vendor.js
fixing_nullptr_31.7.0.patch
freetype26.patch)
freetype26.patch
0001-Bug-1194520-Add-a-system-header-wrapper-for-freetype.patch)
sha256sums=('370087d0adadf8b1c1e6a9920e26488a8902b9dc461d305f258fddb26a129d87'
sha256sums=('08fe9724a84aef2182265b230c68fa37a36a5d93ffd5118ec0739718dc71a66e'
'SKIP'
'2c569b073f03450fec0d2c9ea0a735ffb91df5bf7fa0595a3ea55e41935bae5a'
'd05621004ec24f72cb14696977e0f75e091bb44203139f089643e055401fa9b4'
'f963b4dd4582e0a79aed41cf7c148ccc2dbf65e6e518ba6736e12ba746ff62c5'
'eedb11bacc946d0e449883de269b8c19e7fc754037e18ddc72f7c65219f88482'
'05be2eb909ea21df6d4be2aec1ac910604953522c00447a78e056f46300c57c6'
'c83d604ddedf6ba5da41bd4a2581413df0c5a4ef285b5dbef37a2a1d17e7356b'
'28ad5a04c6e0f12ef7b43e6e12c7a1f82f2583282c62128d135b24305626f387'
'91a675ffde751aac15c83401dc8842a055df0fe3949b6a0b304882608e6a4de2'
'4602066304f0bb10bdaea75405570d500dae3199b77b04a45167d423fdf9bf6f'
'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
'190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
'4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
'd57d0e4d5bc66323388e8f3c9999ed443abfd304a28a1696cc6f4518ed0d0f2a'
'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85')
'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85'
'5371c4e73ef9620c2cf3e922cbf7e6ebecfe5b0d80df03ba0744ad61de7c1a25')
validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
@ -64,24 +51,14 @@ prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
# Patches for version 31.8.0-gnu2
patch -Np1 -i ${srcdir}/icecat-CVE-2015-4473-partial.patch
patch -Np1 -i ${srcdir}/icecat-CVE-2015-4482.patch
patch -Np1 -i ${srcdir}/icecat-CVE-2015-4488.patch
patch -Np1 -i ${srcdir}/icecat-CVE-2015-4489.patch
patch -Np1 -i ${srcdir}/icecat-CVE-2015-4491.patch
patch -Np1 -i ${srcdir}/icecat-CVE-2015-4492.patch
patch -Np1 -i ${srcdir}/icecat-CVE-2015-4495.patch
# Patch to move files directly to /usr/lib/icecat. No more symlinks.
sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
# Patch for GCC 5.1
patch -Np1 -i ../fixing_nullptr_31.7.0.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
# https://bugzilla.mozilla.org/show_bug.cgi?id=1194520
patch -Np1 -i ../freetype26.patch
patch -Np1 -i ../0001-Bug-1194520-Add-a-system-header-wrapper-for-freetype.patch
msg2 "Starting build..."

View file

@ -13,7 +13,7 @@ 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 --with-system-libvpx
ac_add_options --with-system-icu
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite