diff options
Diffstat (limited to 'libre/icedove/PKGBUILD')
| -rw-r--r-- | libre/icedove/PKGBUILD | 83 |
1 files changed, 33 insertions, 50 deletions
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index 3621e8f61..431045b25 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org> -# Contributor (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor (Arch): Ionut Biru <ibiru@archlinux.org> -# Contributor (Arch): Alexander Baldeck <alexander@archlinux.org> -# Contributor (Arch): Dale Blount <dale@archlinux.org> -# Contributor (Arch): Anders Bostrom <anders.bostrom@home.se> +# Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Dale Blount <dale@archlinux.org> +# Contributor: Anders Bostrom <anders.bostrom@home.se> # Maintainer: Andreas Grapentin <andreas@grapentin.org> # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Márcio Silva <coadde@hyperbola.info> @@ -22,10 +22,10 @@ _pkgname=thunderbird pkgname=icedove epoch=1 -pkgver=78.5.0 +pkgver=78.8.1 pkgrel=1 pkgrel+=.parabola1 -_brandingver=78.5 +_brandingver=78.8 _brandingrel=1 pkgdesc='Standalone mail and news reader based on Mozilla Thunderbird' url=https://wiki.parabola.nu/${pkgname} @@ -43,11 +43,11 @@ depends=( makedepends=( unzip zip diffutils python python-setuptools yasm nasm mesa imake libpulse inetutils xorg-server-xvfb autoconf2.13 rust clang llvm gtk2 cbindgen nodejs - gawk perl findutils + gawk perl findutils libotr ) -makedepends[15]='llvm10' # FIXME: DEBUG: | rustup: error while loading shared libraries: libLLVM-10.so: cannot open shared object file: No such file or directory - # ERROR: Command `rustup which rustc` failed with exit status 127. -makedepends+=(quilt mozilla-searchplugins imagemagick) +#makedepends[15]='llvm10' # FIXME: DEBUG: | rustup: error while loading shared libraries: libLLVM-10.so: cannot open shared object file: No such file or directory +# # ERROR: Command `rustup which rustc` failed with exit status 127. +makedepends+=(quilt imagemagick) replaces=(${_pkgname}) options=(!emptydirs !makeflags) source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc} @@ -56,21 +56,19 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sou distribution.ini mozconfig.cfg configure-fix-passing-system-bzip2-ldflags.patch - thunderbird-78.4.3-gpgme-double-armored-fix.patch) -source+=(https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig} - libre-searchengines.patch) + thunderbird-78.5-rust-1.48.patch) +source+=(https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig}) source_armv7h=(arm-wasm-vfp.patch) -sha512sums=('dae49dc0910dd017250643c920c79f03d3ef14bcbafde7fcdb3aaeba2b27a42ef6f88c8de8b961f8bb1c3d1a153bc8988ab43a39eb051d81839cf3b9e8373118' +sha512sums=('5158f7663acf3d00f45b457d1c172dcc95978d6782775faa4ec3995d3a799dfce668302e2c4b963a5607add831314fac76d516e45863a1971fbd4a6b0c4bdb10' 'SKIP' 'a3c9815491d9bed0440c60f35867a5b8a2a1343521f288035fcc46e651a11b926c75a9eca2d262b43d510a7a7119709b53637f1b00ddbbee8e5b0a4b33d7b8fd' 'e21d30a8b79724eda3488ac2bf9dfeb0c7f6bf39e59c37f17574b529d33043765eb54408a55fcbf6f3afa7a58ca99124992d443cdff23ac5c9bdbff33c75f60f' '31d46f91d9612d30d8553a19d0d309d743467e58b568a4aeea3caf6bd805ba00656561c84a1511c59bce1cf24ba323bfad2cd26a19985f1bf7dfb6d282642972' - '636aad861322df5cc3cb9e7b0142a56981b9eeb010bacaa10148d3f74f43bc3c26580475ee5646556acb9980028cb3ffcc1a15788f8039ca0fe57e261457c113' + '1eba1593ff0a9642d89e6d3e03388b1aef00437b2f6c1f0d81d250d9845b80e057c246eaeb31d8d22001abd65556a9603d1db597baf864481a5bfb7000886b29' 'e3ed2708b8354015cb3d2c81048d1ce4932d1effbe2b40efa7cf9b45c1b923b9fd708645e2f8aa0136a485a3f7ce6b396b85721aaf535a4a764fd5005fb7e222' - '92f4c5946f288b30728382830b99b91980ecd845d1606ab251bbdde5cf53387e966727a23f35a3bf7756ee77e72e478f3fb468668e8c412f552547eeb3408299') -sha512sums+=('3b757a7c5f1f4aa83405d0dc7bb69b72230e0e2c944f9b5aeff8e22cc8e6a053aeb16e3ca6f450bf5de763a1aba8028bf4f299bdfb6f203239605ea16c40b4ed' - 'SKIP' - 'be1bf98b65471aa36d1e4a55a24907ac99ddd401daee180dfe26302bad6928f6b4fe5dc6bbc7a96d884237bbd1f6205a4788a82b13fd7e929edbaf64200e0f52') + 'bbb8b0e7b9c67372eb22e1d6b6b5758fe504ded84c40a076d4a064374a1bf34ac12d5b514b328ac9ca984d976b9e0fbde81e68a66bec915c997d6be0c0917584') +sha512sums+=('4fa203586c5ba376e66b79fe73e3f7f729458ea9c8a1dd6151de4c6cddbaea41732fbc91717e19a1e113a5298c7650530a41098bba1fc2cd32f0f4613284caf2' + 'SKIP') sha512sums_armv7h=('c25883c4860e511a99d9fbfba5b824145c0862729101721605725f609ca2a41848b741dd100eff390f57031dc5f14af3ea30133de30f75cb20197c420ae20972') validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases <release@mozilla.com> validpgpkeys+=(BFA8008A8265677063B11BF47171986E4B745536 # Andreas Grapentin @@ -87,8 +85,7 @@ prepare() { src="${src%%::*}" src="${src##*/}" [[ $src = *.patch ]] || continue - [[ $src = libre-searchengines.patch ]] && continue # defer parabola patches - [[ $src = arm-wasm-vfp.patch ]] && continue # defer parabola patches + [[ $src = arm-wasm-vfp.patch ]] && continue # defer parabola patches echo "Applying patch $src..." patch -Np1 < "../$src" @@ -97,8 +94,8 @@ prepare() { cp ../mozconfig.cfg .mozconfig sed "s|@PWD@|${PWD@Q}|g" -i .mozconfig - if [[ ${CARCH} = arm* ]] - then + case "${CARCH}" in + armv*) patch -Np1 -i "${srcdir}"/arm-wasm-vfp.patch sed -i '/--enable-linker=gold/d' .mozconfig @@ -116,15 +113,15 @@ ac_add_options --disable-webrtc ac_add_options --disable-elf-hack ac_add_options --enable-optimize="-g0 -O2" END - fi - - if [[ ${CARCH} = i686 ]]; then + ;; + i686) sed -i 's/--enable-linker=gold/--enable-linker=bfd/' .mozconfig LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" export LDFLAGS - fi + ;; + esac - # perform rebranding + # perform re-branding local branding_indir="${srcdir}"/${pkgname}-${_brandingver} local branding_outdir=comm/mail/branding/${pkgname} rm -rf -- ${branding_outdir} @@ -148,26 +145,14 @@ END cp -av "${branding_indir}"/preview.png comm/mail/themes/linux/mail/preview.png # Patch search-engines config - echo "applying libre-searchengines.patch" - patch -Np1 -i "${srcdir}"/libre-searchengines.patch - # TODO: custom searchplugins ID per new format ("ddg" is standard) - # where: ID is comm/mail/components/search/extensions/<ID>/ - # eg: "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-en", "searx", "wikipedia", "yacy"|g' - local remove_engines_sed_cmd='s|.*"google".*"wikipedia".*| "ddg", "wikipedia"| ; s|.*"google".*"wikipedia\(-[^"]*\)".*| "ddg", "wikipedia\1"|' + local search_engines_sed_cmd='s|https://duckduckgo.com/|https://html.duckduckgo.com/html/|' local engines_cfg_dir=comm/mail/components/search/extensions - local engines_cfg_file=${engines_cfg_dir}/list.json - sed -i "${remove_engines_sed_cmd}" ${engines_cfg_file} - - # Sanity-check search-engines patching - local removed_engines_regex='Bing|Google|Seznam|Twitter|Yahoo|Yandex|Яндекс|amazon|bing|google|ebay|twitter' - local engines_err_msg="search-engines patch and/or sed command needs re-working" - ! grep -E ${removed_engines_regex} ${engines_cfg_file} > /dev/null || ! echo "${engines_err_msg}" + sed -i "${search_engines_sed_cmd}" ${engines_cfg_dir}/ddg/manifest.json # Delete unused search engine configs find ${engines_cfg_dir} -mindepth 1 -maxdepth 1 \ -not -name ddg \ -not -name wikipedia \ - -not -name list.json \ -exec rm -rf {} \; # Patch and remove anything that's left @@ -176,21 +161,19 @@ END \|URLClassifier|d \|url-classifier|d ' comm/mail/installer/package-manifest.in + # TODO: this could be moved into the branding package - it already processes all-thunderbird.js sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g; \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g; \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g; \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g; ' comm/mail/app/profile/all-thunderbird.js - - # Load our searchplugins - # TODO: this 'searchplugins' directory no longer exists, as of v78 - # so perhaps the replacement will not be used - rm -rv comm/suite/locales/en-US/searchplugins || : - cp -av /usr/lib/mozilla/searchplugins comm/suite/locales/en-US/ } build() { cd $_pkgname-$pkgver + if [[ -n "${SOURCE_DATE_EPOCH}" ]]; then + export MOZ_BUILD_DATE=$(date --date "@${SOURCE_DATE_EPOCH}" "+%Y%m%d%H%M%S") + fi # clang-{9,10,11} -> error: unknown argument: '-fvar-tracking-assignments' CFLAGS="${CFLAGS/-fvar-tracking-assignments/}" |