Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

4 files changed, 29 insertions, 10 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 70559b509..2f7936603 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -13,10 +13,11 @@
 
 _pgo=false
 
+_pkgname=firefox
 pkgname=icecat
 _pkgver=52.3.0-gnu1
 pkgver=${_pkgver//-/_}
-pkgrel=6
+pkgrel=7
 
 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 armv7h)
@@ -27,6 +28,9 @@ depends_i686=("icu>=60" "icu<61")
 depends_armv7h=("icu>=60" "icu<61")
 makedepends=(autoconf2.13 diffutils gconf imake inetutils libpulse mesa mozilla-searchplugins python2 unzip yasm zip)
 options=(!emptydirs !makeflags debug)
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
+provides=("$_pkgname")
 if $_pgo; then
   makedepends+=(xorg-server-xvfb)
   options+=(!ccache)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 2248eb22d..cea3611ae 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -20,20 +20,20 @@
 
 # parabola changes and rationale:
 #  - rebranded to iceweasel
-#  - added to makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick
-#  - removed from makedepends: mercurial
-#  - using tarball instead of repository
-#  - added replaces and conflicts for firefox
 #  - removed google api keys and usage
+#  - using tarball instead of repository
+#  - added makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick
+#  - removed makedepends: mercurial
+#  - added replaces, conflicts and provides: firefox
 
 _pkgname=firefox
 pkgname=iceweasel
 epoch=1
 pkgver=58.0
-pkgrel=2
+pkgrel=4
 _bver=58.0
 _brel=1
-pkgdesc="Libre standalon web browser based on Mozilla Firefox"
+pkgdesc="Libre standalone web browser based on Mozilla Firefox"
 arch=(x86_64 i686 armv7h)
 license=(MPL GPL LGPL)
 url="https://wiki.parabola.nu/$pkgname"
@@ -51,7 +51,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags !strip)
 replaces=("$_pkgname")
 conflicts=("$_pkgname")
-_parabolarepo=https://repo.parabola.nu/other/iceweasel
+provides=("$_pkgname")
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
         $pkgname.desktop
         $pkgname-install-dir.patch no-crmf.diff
@@ -114,6 +114,21 @@ ac_add_options --disable-stylo
 ac_add_options --disable-eme
 END
 
+  if [[ "$CARCH" == arm* ]]; then
+    sed -i \
+        -e '/enable-gold/s/^/#/' \
+        -e '/enable-pie/s/^/#/' \
+        -e '/enable-optimize/d' \
+      .mozconfig
+
+    cat >> .mozconfig << END
+ac_add_options --disable-webrtc
+ac_add_options --disable-elf-hack
+ac_add_options --disable-stylo
+ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
+END
+  fi
+
   # perform rebranding
   local brandingdir="$srcdir/$pkgname-$_bver"
   mkdir -v browser/branding/$pkgname
diff --git a/pcr/wikipediafs/PKGBUILD b/pcr/wikipediafs/PKGBUILD
index aed27dc6c..5ec1a629d 100644
--- a/pcr/wikipediafs/PKGBUILD
+++ b/pcr/wikipediafs/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=wikipediafs
 pkgver=0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Mount Wikipedia/Mediawiki sites locally via FUSE"
 arch=('any')
 url="http://wikipediafs.sourceforge.net/"
diff --git a/pcr/xml2rfc-python/PKGBUILD b/pcr/xml2rfc-python/PKGBUILD
index 84f5f5229..4d993b81f 100644
--- a/pcr/xml2rfc-python/PKGBUILD
+++ b/pcr/xml2rfc-python/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xml2rfc-python
 pkgver=2.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to convert an RFC from XML to text, HTML and other formats."
 arch=('any')
 url="http://xml2rfc.tools.ietf.org/"