diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-07-06 16:48:08 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-07-06 16:54:39 -0300 |
| commit | 7069768d3a844582c5df59c80f7a6f75a28a14a0 (patch) | |
| tree | a6e8cf0e8cead2cf21d0475df2d025e9b05513a9 | |
| parent | 5f2039dcef6833f3b98337afe3b911ad9e63cdb4 (diff) | |
| download | abslibre-7069768d3a844582c5df59c80f7a6f75a28a14a0.tar.gz abslibre-7069768d3a844582c5df59c80f7a6f75a28a14a0.tar.bz2 abslibre-7069768d3a844582c5df59c80f7a6f75a28a14a0.zip | |
icecat-31.7.0_gnu1-3: updating version
* build with --enable-pie (FS#45460 -> https://bugs.archlinux.org/task/45460)
* fix build with freetype2 2.6
| -rw-r--r-- | libre/icecat/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/icecat/freetype26.patch | 30 | ||||
| -rw-r--r-- | libre/icecat/mozconfig | 1 |
3 files changed, 38 insertions, 2 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 79313612b..cced41637 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -15,7 +15,7 @@ _pgo=true pkgname=icecat _pkgver=31.7.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=2 +pkgrel=3 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -39,18 +39,20 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{ 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=('57ddd9a3b2875dc3f1bfbb0f6d8fd5551775f1f68cc4237f6f4251a7ca954528' 'SKIP' - 'e0779596c2aafa0f77f09094a218940b1dc5120cd6425d4ea1e8c96be44711ff' + 'cedd1c8dcb8fe9b0082afb5a3ba5865e4a0561c74d22078080a627e962090d8d' '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4' '8082a8a5adf21c50fa77650c74adcd6fedbf7bedcdb6b8ae29529ca96adeb05d' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745' '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' + 'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85' 'de9474f400657082c9ff7c4c3c228cb7d4a818fa358e748286f1bbdec9798488' 'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' @@ -70,6 +72,9 @@ prepare() { # Install to /usr/lib/$pkgname patch -Np1 -i "$srcdir/$pkgname-install-dir.patch" + # 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" diff --git a/libre/icecat/freetype26.patch b/libre/icecat/freetype26.patch new file mode 100644 index 000000000..c1eb49497 --- /dev/null +++ b/libre/icecat/freetype26.patch @@ -0,0 +1,30 @@ + +# HG changeset patch +# User NiLuJe <ninuje@gmail.com> +# Date 1426721573 14400 +# Node ID afd840d66e6a775dc2ed35dd3add01ff07f950fe +# Parent 35515400af363bfc141353acd474814567c43c54 +Bug 1143411 - Fix build against latest freetype code. r=glandium + +diff --git a/config/system-headers b/config/system-headers +--- a/config/system-headers ++++ b/config/system-headers +@@ -465,16 +465,17 @@ freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h + freetype.h + ftcache.h ++ftfntfmt.h + ftglyph.h + ftsynth.h + ftoutln.h + ttnameid.h + tttables.h + t1tables.h + ftlcdfil.h + ftsizes.h + diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 2bddbc603..c7ff55fc3 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -2,6 +2,7 @@ ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib +ac_add_options --enable-pie ac_add_options --enable-official-branding |