From 2baae6871de68a78a74b01c3e89ed1ef9046dc1d Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Tue, 6 Feb 2018 19:33:18 +0100
Subject: libre/icedtea-web: cleanup and rebuild

---
 libre/icedtea-web/PKGBUILD | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'libre/icedtea-web/PKGBUILD')

diff --git a/libre/icedtea-web/PKGBUILD b/libre/icedtea-web/PKGBUILD
index 300780bad..ce4699f82 100644
--- a/libre/icedtea-web/PKGBUILD
+++ b/libre/icedtea-web/PKGBUILD
@@ -3,19 +3,18 @@
 # Maintainer: Isaac David <isacdaavid () isacdaavid!info>
 # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
+# parabola changes and rationale:
+#  - depending on iceweasel for building instead of firefox
+
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
 pkgver=1.7
-pkgrel=1.parabola1
-arch=('i686' 'x86_64' 'armv7h')
+pkgrel=1.parabola2
+arch=('x86_64' 'i686' 'armv7h')
 url='http://icedtea.classpath.org/wiki/IcedTea-Web'
 license=('GPL2')
 makedepends=('java-environment-openjdk=8' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit'
-             'epiphany')
-case "$CARCH" in
-  i686|x86_64) makedepends+=('iceweasel') ;;
-  armv7h)      makedepends+=('iceape')    ;;
-esac
+             'iceweasel' 'epiphany')
 optdepends=('rhino: for using proxy auto config files')
 # Due to broken path names in the tarball that fails with LANG=C in our chroot
 noextract=("${pkgbase}-${pkgver}.tar.gz")
@@ -30,10 +29,6 @@ prepare() {
 }
 
 build() {
-  case "$CARCH" in
-    i686|x86_64) firefox_replacement="iceweasel" ;;
-    armv7h)      firefox_replacement="iceape" ;;
-  esac
   cd "${srcdir}"/${pkgbase}-${pkgver}
   ./configure \
       --prefix=/usr/share/${pkgbase} \
@@ -42,7 +37,7 @@ build() {
       --with-jre-home=/usr/lib/jvm/default-runtime \
       --with-java=/usr/bin/java \
       --with-browser-tests \
-      --with-firefox=/usr/bin/"${firefox_replacement}" \
+      --with-firefox=/usr/bin/iceweasel \
       --with-epiphany=/usr/bin/epiphany
    make
 }
-- 
cgit v1.2.3