summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2021-04-09 03:59:02 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2021-04-25 13:25:39 -0400
commit04c332d29f362070a883baa3eab40df4a6f701d3 (patch)
treea7e36ecf877e5461da038d71118c248cf3c646c0
parent1a9f69ae0ef5803df9c6c3b84ae878c3af1840ae (diff)
[icecat]: upgrade to v78.9.0 (FTBS)
-rw-r--r--libre/icecat/PKGBUILD59
1 files changed, 30 insertions, 29 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 87a28e744..d88a8f20f 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -15,14 +15,14 @@
# Contributor: grizzlyuser <grizzlyuser@protonmail.com>
-# NOTE: icecat (60.7 < V <= 78.7) are not upstream releases
+# NOTE: icecat (60.7 < V <= 78.9) are not upstream releases
# upstream releases would normally have '-gnu' appended to $_upstream_ver
# this build is based on gnuzilla VCS developement sources
-# rev: abfe5eebaca3c2787f1a9505669393674493c177
+# rev: 8b54aee6bd0c39f043bbba7a654870e032a910bc
pkgname=icecat
-_upstream_ver=78.7.0-pre # -gnu
+_upstream_ver=78.9.0-pre # -gnu
pkgver=${_upstream_ver//-/_}
pkgrel=1
pkgdesc="GNU IceCat - a libre standalone web browser based on Mozilla Firefox ESR"
@@ -34,8 +34,9 @@ makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
autoconf2.13 rust clang llvm jack gtk2 nodejs cbindgen nasm
python-setuptools python-psutil)
makedepends+=(mozilla-searchplugins jq)
-[[ "${CARCH}" == 'i686' ]] && makedepends=(${makedepends[*]/llvm/llvm10}) # FIXME: i686 configure fails with LLVM11
- # rustup: error while loading shared libraries: libLLVM-10.so
+makedepends=(${makedepends[*]/rust/rust=1:1.49.0}) # FIXME:
+# [[ "${CARCH}" == 'i686' ]] && makedepends=(${makedepends[*]/llvm/llvm10}) # FIXME: i686 configure fails with LLVM11
+ # rustup: error while loading shared libraries: libLLVM-10.so
optdepends=('networkmanager: Location detection via available WiFi networks'
'libnotify: Notification integration'
'pulseaudio: Audio support'
@@ -49,7 +50,7 @@ source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.ta
source+=(searchplugins_list.json
libre.patch)
source_i686=('rust-static-disable-network-test-on-static-libraries.patch')
-sha256sums=('e62ed45c31c62a67609313cb3eb03f809130a691f884962b010cce164782b129'
+sha256sums=('6f777cbea1066ba10db64967d55b9204e14bbea9a7836c4bf7e7a1e642f97716'
'SKIP'
'3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'
'd90faa59dc59f457c5770b3cc1ee4caa5b255e754ab9ab3993af894992c007e4'
@@ -57,8 +58,8 @@ sha256sums=('e62ed45c31c62a67609313cb3eb03f809130a691f884962b010cce164782b129'
'3edb4add450f94c579f2df7c16ac4d9bd9f5c6acf3fbd8a05ce24c21c317257d'
'28029afa3201e1be8138be06f741c59d64869edf0c9e90dbb05cfa6b5fff4ecd')
sha256sums_i686=('068efe37a99561490e6ec7b70a3cd4dd84e89e6bdf19f04a475d06c78fd28920')
-validpgpkeys=('318C679D94F17700CC847DE646A70073E4E50D4E' # Ruben Rodriguez
- '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
+# validpgpkeys=('318C679D94F17700CC847DE646A70073E4E50D4E') # Ruben Rodriguez
+validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger (VCS builds)
# PGO requires networking
@@ -92,7 +93,7 @@ _check_build_config() {
then echo "Some anti-features are not disabled in build configuration files, aborting:"
for key in ${antifeatures[@]} ; do echo " - ${key} is enabled" ; done ;
# FIXME: - .datareporting is enabled
-# return 1
+ return 1
fi
popd > /dev/null
@@ -106,7 +107,7 @@ prepare() {
patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=1667736
- patch -Np1 -i ../rust-1.48_icecat-78.6.0.patch
+# patch -Np1 -i ../rust-1.48_icecat-78.6.0.patch
cat >../mozconfig <<END
ac_add_options --enable-application=browser
@@ -151,7 +152,7 @@ END
## [ARCH-SPECIFIC CONFIG] ##
case "${CARCH}" in
- armv*)
+ armv7h)
# TODO: re-work for armv7h
# sed -i '/--enable-linker=gold/d' ../mozconfig
# sed -i '/--enable-rust-simd/d' ../mozconfig
@@ -187,6 +188,17 @@ END
pushd browser/components/search/extensions > /dev/null
+ # Patch search-engines configs
+ cp "${srcdir}"/searchplugins_list.json list.json
+ sed -i 's|https://duckduckgo.com/|https://html.duckduckgo.com/html/|' ddg/manifest.json
+
+ # Removing URL parameters that let DuckDuckGo know the place in UI
+ # the search was ran from (like address bar, context menu, etc.)
+ local jq_cmd='del(.chrome_settings_overrides.search_provider.params)'
+ jq "${jq_cmd}" ddg/manifest.json > manifest.json.tmp
+ ! diff manifest.json.tmp ddg/manifest.json > /dev/null
+ mv manifest.json.tmp ddg/manifest.json
+
# replace default searchplugins
cp -rv /usr/share/mozilla/searchplugins/* .
find -mindepth 1 -maxdepth 1 \
@@ -203,17 +215,6 @@ END
-not -name list.json \
-exec rm -rf {} \;
- # Patch search-engines config
- cp "${srcdir}"/searchplugins_list.json list.json
- sed -i 's|https://duckduckgo.com/|https://html.duckduckgo.com/html/|' ddg/manifest.json
-
- # Removing URL parameters that let DuckDuckGo know the place in UI
- # the search was ran from (like address bar, context menu, etc.)
- local jq_cmd='del(.chrome_settings_overrides.search_provider.params)'
- jq "${jq_cmd}" ddg/manifest.json > manifest.json.tmp
- ! diff manifest.json.tmp ddg/manifest.json > /dev/null
- mv manifest.json.tmp ddg/manifest.json
-
# Sanity-check search-engines patching
local engines_err_msg="search-engines patching needs re-working"
jq < list.json || ! echo "${engines_err_msg}"
@@ -223,7 +224,7 @@ END
## libre patching ##
- # Patch and remove anything that's left
+ # Remove remaining non-free bits
echo "applying libre.patch"
patch -Np1 -i "${srcdir}"/libre.patch
}
@@ -248,7 +249,7 @@ build() {
## [ARCH-SPECIFIC BUILD ENV] ##
case "${CARCH}" in
- armv*)
+ armv7h)
# TODO: re-work for armv7h
# export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
# export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
@@ -258,6 +259,7 @@ build() {
CFLAGS="${CFLAGS/-fno-plt/}"
CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+ # disable LTO (clang has issues on IA32)
export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
;;
@@ -265,9 +267,8 @@ build() {
# TODO: this may only be needed for v78
# -fno-plt with cross-LTO causes obscure LLVM errors
# LLVM ERROR: Function Import: link error
- CFLAGS="${CFLAGS/-fno-plt/}"
- CXXFLAGS="${CXXFLAGS/-fno-plt/}"
-
+# CFLAGS="${CFLAGS/-fno-plt/}"
+# CXXFLAGS="${CXXFLAGS/-fno-plt/}"
;;
*) echo "no [ARCH-SPECIFIC BUILD ENV] for arch: ${CARCH}" ; return 1 ;
;;
@@ -278,9 +279,9 @@ build() {
## [ARCH-SPECIFIC BUILD CONFIG] ##
- # TODO: this per-arch handling is yet to be re-worked for armv7h and i686
case ${CARCH} in
armv7h)
+# TODO: re-work for armv7h
;;
i686)
# avoid excessive debug symbols in rust leading to out-of-memory situations
@@ -411,9 +412,9 @@ END
## [ARCH-SPECIFIC INSTALL] ##
- # TODO: this per-arch handling is yet to be re-worked for armv7h and i686
case ${CARCH} in
armv7h)
+# TODO: re-work for armv7h
;;
i686)
# libxul.so cannot find it's libraries