diff options
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 112 | ||||
| -rw-r--r-- | libre/iceweasel/iceweasel-install-dir.patch | 18 | ||||
| -rw-r--r-- | libre/iceweasel/mozconfig | 5 |
3 files changed, 64 insertions, 71 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 2581dcc82..adb1aa3a1 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -15,43 +15,35 @@ # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> -_pgo=false - -# We're getting this from Debian Sid -_debname=firefox -_brandingver=53.0 -_brandingrel=1 -_debver=53.0 -_debrel=deb1 -_debrepo=http://ftp.debian.org/debian/pool/main/ -_parabolarepo=https://repo.parabola.nu/other/iceweasel -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } - -_pkgname=firefox +_oldname=firefox pkgname=iceweasel + epoch=1 -pkgver=$_debver.$_debrel -pkgrel=2 -pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox (Parabola rebranded)." +pkgver=53.0.2 +pkgrel=1 +_brandingver=53.0 +_brandingrel=2 + arch=(i686 x86_64 armv7h) + +pkgdesc="Iceweasel, the standalone web browser based on Mozilla Firefox." +url="https://wiki.parabola.nu/$pkgname" license=(MPL GPL LGPL) + depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell 'icu=59.1' libevent libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font) -makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg-stable libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) +makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) makedepends_i686=(cargo) makedepends_x86_64=("${makedepends_i686[@]}") -options=(!emptydirs !makeflags !strip debug) -if $_pgo; then - makedepends+=(xorg-server-xvfb) - options+=(!ccache) -fi optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'speech-dispatcher: Text-to-Speech') -url="https://wiki.parabola.nu/$pkgname" -replaces=("$pkgname-libre" "$_pkgname") -conflicts=("$pkgname-libre") -source=("$_debrepo/`debfile $_debname`_$_debver.is.$_debver.orig.tar.xz" - "$_debrepo/`debfile $_debname`_$_debver.is.$_debver-${_debrel#deb}.debian.tar.xz" + +replaces=("$pkgname-libre" "$_oldname") +conflicts=("$pkgname-libre" "$_oldname") + +options=(!emptydirs !makeflags !strip debug) + +source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname-$pkgver.source.tar.xz" "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz" "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig" mozconfig @@ -68,17 +60,16 @@ source=("$_debrepo/`debfile $_debname`_$_debver.is.$_debver.orig.tar.xz" mozilla-1253216.patch mozilla-build-arm.patch rusty-cheddar.patch) -sha256sums=('e77dbd8a4681481a5c9ab8ed3a5ac6c19caec8e25dc80f8b56461cfdf52d047a' - 'bc8ef2662c571ee90b6b196372146a63c1895c56967dac2a4f7ec0b45802426b' - 'cd99556650055283d3cf0eefe5a60fee9944e8b9c365a2ac983a77635ce6125e' +sha256sums=('c536df9794fafe61e4e74562e2a37cd4a6fb1c13d99d5330d61be03b2d57ae54' + '8a276bc0e99760752a78ffe7eb019a30486d73ed4940ea0860e5459f2143087f' 'SKIP' - 'a0d75304583fab8d5ae830745d32ad9d04ca7098fd7202975f89df813f38479d' + '3f7a7ae586c8eefcdb143bbe6e6394c9ea3e143b9557b18d5e77d04a6d0eaeb0' '3a4181d6ea8043a9fcf892ce6b68e9e707338f05a909176ab577c1c8a6b93506' '32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' '250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a' - '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' + '46e588300797bda599c8f5157437fd79f88b6e1179f2fde49e0405e435e03efa' '90bdede15c2e85e5d081e2b822884a6354a116868ba7d9e19a2484a4e2528aaf' 'd28b14a870aa100273243039d08ab9e64d325c28b6291413441146ebdf5d38ee' '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8' @@ -91,13 +82,18 @@ validpgpkeys=( ) prepare() { - cd "$srcdir/$_pkgname-$_debver" - mv "$srcdir/debian" . - mv "$srcdir/$pkgname-$_brandingver/branding" debian - mv "$srcdir/$pkgname-$_brandingver/patches/iceweasel-branding" debian/patches - cat "$srcdir/$pkgname-$_brandingver/patches/series" >> debian/patches/series + cd "$srcdir/$_oldname-$pkgver" + + local brandingdir="$srcdir/$pkgname-$_brandingver" - export QUILT_PATCHES=debian/patches + # Prepare branding for the Iceweasel packages + mkdir -v browser/branding/$pkgname + + # copy the branding files + cp -va $brandingdir/branding/* browser/branding/$pkgname + + # patch + export QUILT_PATCHES=$brandingdir/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' @@ -134,7 +130,7 @@ prepare() { cp "$srcdir/mozconfig" .mozconfig # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968 - patch -Np1 -i ../fix-wifi-scanner.diff + patch -Np1 -i "$srcdir/fix-wifi-scanner.diff" mkdir "$srcdir/path" ln -s /usr/bin/python2 "$srcdir/path/python" @@ -167,7 +163,7 @@ prepare() { } build() { - cd "$srcdir/$_pkgname-$_debver" + cd "$srcdir/$_oldname-$pkgver" # _FORTIFY_SOURCE causes configure failures CPPFLAGS+=" -O2" @@ -175,44 +171,46 @@ build() { # Hardening LDFLAGS+=" -Wl,-z,now" + # 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 PYTHON="/usr/bin/python2" - if $_pgo; then - # Do PGO - xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \ - make -f client.mk build MOZ_PGO=1 - else - make -f client.mk build - fi + make -f client.mk build } package() { - cd "$srcdir/$_pkgname-$_debver" + cd "$srcdir/$_oldname-$pkgver" + make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" - _brandingdir=debian/branding - brandingdir=moz-objdir/$_brandingdir - icondir="$pkgdir/usr/share/icons/hicolor" + local brandingdir="$srcdir/$pkgname-$_brandingver" + + # install iceweasel icons + local icondir="$pkgdir/usr/share/icons/hicolor" for i in 16 22 24 32 48 64 128 192 256 384; do - rsvg-convert -w $i -h $i "$_brandingdir/${pkgname}_icon.svg" \ + rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \ -o "$brandingdir/default$i.png" install -Dm644 "$brandingdir/default$i.png" \ "$icondir/${i}x${i}/apps/$pkgname.png" done - install -Dm644 "$_brandingdir/${pkgname}_icon.svg" \ + install -Dm644 "$brandingdir/branding/${pkgname}_icon.svg" \ "$icondir/scalable/apps/$pkgname.svg" - install -d "$pkgdir/usr/share/applications" - install -m644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications" - # Parabola rebranding install -m644 "$srcdir/distribution.ini" \ "$pkgdir/usr/lib/$pkgname/distribution" + # Install Iceweasel desktop + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications" + # Use system-provided dictionaries rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation} ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" diff --git a/libre/iceweasel/iceweasel-install-dir.patch b/libre/iceweasel/iceweasel-install-dir.patch index af113fa85..d4fb24e06 100644 --- a/libre/iceweasel/iceweasel-install-dir.patch +++ b/libre/iceweasel/iceweasel-install-dir.patch @@ -1,13 +1,11 @@ -diff --git a/config/baseconfig.mk b/config/baseconfig.mk -index 7ca8e35..6e92846 100644 --- a/config/baseconfig.mk +++ b/config/baseconfig.mk -@@ -5,7 +5,7 @@ - MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION))) - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) +@@ -4,7 +4,7 @@ + # whether a normal build is happening or whether the check is running. + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION) - ifndef TOP_DIST - TOP_DIST = dist + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + ifeq (.,$(DEPTH)) + DIST = dist diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig index 5c556437e..3c77096b4 100644 --- a/libre/iceweasel/mozconfig +++ b/libre/iceweasel/mozconfig @@ -8,7 +8,7 @@ ac_add_options --enable-rust # Iceweasel ac_add_options --disable-official-branding -ac_add_options --with-branding=debian/branding +ac_add_options --with-branding=browser/branding/iceweasel # System libraries ac_add_options --with-system-nspr @@ -38,7 +38,4 @@ ac_add_options --disable-safe-browsing ac_add_options --disable-url-classifier ac_add_options --disable-eme -# Other -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir - # vim:set ft=sh: |