diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 65 |
1 files changed, 34 insertions, 31 deletions
@@ -6,8 +6,8 @@ # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> pkgname=icecat -pkgver=38.7.1 -_pkgver=38.7.1-gnu1 +pkgver=38.8.0 +_pkgver=38.8.0-gnu1 _pkgverbase=${pkgver%%.*} pkgrel=1 pkgdesc="GNU version of the Firefox browser." @@ -15,16 +15,13 @@ arch=(i686 x86_64) url="http://www.gnu.org/software/gnuzilla/" license=('GPL' 'MPL' 'LGPL') depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' - 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' - 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'pango' 'freetype2' 'libxft' 'libx11') - -makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' + 'dbus-glib' 'alsa-lib' 'ffmpeg' 'desktop-file-utils' + 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font') +makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf' 'libpulse' 'gst-plugins-base-libs' 'inetutils') optdepends=('networkmanager: Location detection via available WiFi networks' - 'gst-plugins-good: h.264 video' - 'gst-libav: h.264 video' 'upower: Battery API') - +options=('!emptydirs' '!makeflags') install=icecat.install source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig} #source=(https://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig} ## Main upstream download site @@ -33,14 +30,22 @@ source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz mozconfig icecat.desktop icecat-safe.desktop - vendor.js) + vendor.js + gcc6-fix-compilation-for-IceCat.patch + firefox-gcc-6.0.patch + harfbuzz-1.1.3.patch.gz + mozilla-1228540-1.patch) -sha256sums=('0f65fc8a4fc2a4e73fe97249c24edeb5a84335e22d2868d0334365ada069b5f1' +sha256sums=('97f76e85cc6f98463f0e0b0e845826816032770f9b589db69ece6b1cff21936c' 'SKIP' - '4602066304f0bb10bdaea75405570d500dae3199b77b04a45167d423fdf9bf6f' + '0cb85fed7abe38c5b667d009b73029168f8ffed7c895c06b51d61f01fc7aebaf' 'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3' '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303' - '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4') + '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4' + '329cf6753d29ae64a4336a8a76ee71f0d331a39132159401e4d11de65b708a07' + '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf' + '5524bc65045d5f0794936f87730b122e8e6fb6260a0e41094586eb311bcdbbc9' + 'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19') validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org> @@ -52,6 +57,14 @@ prepare() { 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 + # Compilation fix (FS#49243 and FS#49363), internet and Thunderbird package + patch -Np1 -i $srcdir/gcc6-fix-compilation-for-IceCat.patch + patch -Np1 -i $srcdir/firefox-gcc-6.0.patch + + # Update to harfbuzz 1.1.3 (following Thunderbird in [extra]) + patch -Np0 -i $srcdir/harfbuzz-1.1.3.patch + patch -Np1 -i $srcdir/mozilla-1228540-1.patch + msg2 "Starting build..." cp -v ${srcdir}/mozconfig .mozconfig @@ -59,7 +72,6 @@ prepare() { # WebRTC build tries to execute "python" and expects Python 2 mkdir "$srcdir/path" ln -s /usr/bin/python2 "$srcdir/path/python" - } build() { @@ -67,27 +79,19 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ICECATDIR="/usr/lib/${pkgname}" && export ICECATDIR - # Workaround to build 31.0. Fails otherwise. - unset CPPFLAGS + # _FORTIFY_SOURCE causes configure failures + CPPFLAGS+=" -O2" + + # Hardening + LDFLAGS+=" -Wl,-z,now" - # Default Arch flags - if [ "${CARCH}" = 'x86_64' ]; then - export CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong" - export CXXFLAGS="$CFLAGS" - elif [ "${CARCH}" = 'i686' ]; then - export CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong" - export CXXFLAGS="$CFLAGS" - fi + # GCC 6 + CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" + CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" export PATH="$srcdir/path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,$ICECATDIR" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - export PYTHON=python2 make -f client.mk build -# ./configure --with-l10n-base="${srcdir}/${pkgname}-${pkgver}"/l10n -std=gnu89 -# make - } package () { @@ -95,7 +99,6 @@ package () { cd "${srcdir}/${pkgname}-${pkgver}" make -f client.mk DESTDIR="${pkgdir}" install -# make DESTDIR="${pkgdir}" install msg2 "Finishing..." install -m755 -d ${pkgdir}/usr/share/applications |