From 552c4e6156755b82cd048a9b97e6f16a6ec570be Mon Sep 17 00:00:00 2001 From: bill-auger Date: Wed, 28 Apr 2021 01:12:42 -0400 Subject: wip-icecat reverted to aur recipe --- libre/icecat/PKGBUILD | 101 +++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 55 deletions(-) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 6f31db463..12f64ecd8 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,54 +1,21 @@ -# Maintainer (arch): Jan Alexander Steffens (heftig) -# Contributor: Ionut Biru -# Contributor: Jakub Schmidtke -# Maintainer (aur): Figue -# Contributor: fauno +# Maintainer: Figue +# Contributor (Parabola): fauno +# Thank you very much to the older contributors: # Contributor: evr -# Contributor: Muhammad 'MJ' Jassim -# Contributor: vando -# Contributor: André Silva -# Contributor: Henry Jensen -# Contributor: Luke Shumaker -# Contributor: Márcio Silva -# Maintainer: Andreas Grapentin -# Contributor: bill-auger -# Contributor: grizzlyuser - - -# NOTE: icecat (60.7 < V <= 78.10) are not upstream releases -# $_upstream_ver of upstream releases (per makeicecat) normally ends with '-gnuN' -# the parabola source-ball replaces '-gnuN' with '-preN' to make that distinction -# this build is based on gnuzilla VCS developement sources -# rev: b72c22186cf381d7b1f93be550c9da30865d03b4 - -# NOTE: this PKGBUILD is a temporary WIP -# it is based on the AUR PKGBUILD, which also runs makeicecat at build-time -# makeicecat requires an active internet connection though, so that code was removed -# this was introduced hastily, because 'icu' had changed, -# and the 78.9.0 parabola PKGBUILD had "sandbox violation" problems at the time -# eventually, the original parabola PKGBUILD should be restored/merged with this recipe -# per rev: 04c332d29f362070a883baa3eab40df4a6f701d3 -# TODO: this PKGBUILD has several issues: -# - it is adapted only for x86_64 -# - it has branding issues eg: missing "topsites", serach-engines, -# previous parabola patching, and patching/branding sanity checks - +# Contributor: Muhammad 'MJ' Jassim pkgname=icecat -_upstream_ver=78.10.0-pre1 # -gnu1 -_mozilla_ver=${_upstream_ver%-*} -pkgver=${_upstream_ver//-/_} -pkgrel=1 +pkgver=78.10.0 +pkgrel=2 _commit=b72c22186cf381d7b1f93be550c9da30865d03b4 -pkgdesc="The GNU web browser, based on Mozilla Firefox ESR" +pkgdesc="GNU version of the Firefox browser." arch=(x86_64) url="http://www.gnu.org/software/gnuzilla/" license=('GPL' 'MPL' 'LGPL') - depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) makedepends=(m4 unzip zip diffutils python2-setuptools yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 - python nodejs python2-psutil cbindgen nasm lld) + python nodejs python2-psutil cbindgen nasm wget mercurial git lld perl-file-rename) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -56,34 +23,58 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'hunspell-en_US: Spell checking, American English') options=(!emptydirs !makeflags !strip) -source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.tar.bz2{,.sig} +source=(https://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-${_commit}.tar.gz icecat.desktop icecat-safe.desktop - 0001-Use-remoting-name-for-GDK-application-names.patch + "0001-Use-remoting-name-for-GDK-application-names.patch::https://raw.githubusercontent.com/archlinux/svntogit-packages/0adcedc05ce67d53268575f8801c8de872206901/firefox/trunk/0001-Use-remoting-name-for-GDK-application-names.patch" rust_1.48.patch.gz) -sha256sums=('4916a224a44fc1d6d5b9f9ba813429fd1bf4007b7d85fe9ae0d2a60ccf603186' - 'SKIP' + +sha256sums=('a92affc4da1831db842f4090590e26c4b211975d79894578c6da10430b64c9ce' 'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d' '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208' 'e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442' 'c7f867ccee684939c9f0a9c30ea69127077bbe43af545a03f09dfbbdc02545a9') -validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger - prepare() { - cd "${srcdir}"/$pkgname-${_mozilla_ver}/ + cd gnuzilla-${_commit} + + # Uncomment if you have issues with gpg download... WITH PROXY gpg doesn't work!!!!!! + #sed -e 's/^verify_sources$//g' -i makeicecat + + mkdir output || rm -rf output/* # Clean output just in case is already an old build there + if [ -f "${SRCDEST}/firefox-${pkgver}esr.source.tar.xz" ] && [ -f "${SRCDEST}/firefox-${pkgver}esr.source.tar.xz.asc" ]; then cp -f "${SRCDEST}"/firefox-${pkgver}esr.source.tar.xz{,.asc} output/ ; fi + + # Patches to avoid download sources if you have in your $startdir + sed -e '/rm -rf output/d' -i makeicecat + sed -e 's/wget -N/wget -nv -Nc/g' -i makeicecat + + # Other patches + sed '/^finalize_sourceball$/d' -i makeicecat + + # If we want to avoid all locales, we can use variable _SPEED=y to build it with only 1 locale. Use variable _LOCALE to define it +if true; then # if [[ $_SPEED =~ [y|Y] ]]; then + msg2 "Building without all locales..." + sed -e 's/DEVEL=0/DEVEL=1/g' -i makeicecat + # Also you can choose your locale using external variable _LOCALE. By default in upstream script this locale is es-ES + [ -z "$_LOCALE" ] || sed -e "s/es-ES/$_LOCALE/g" -i makeicecat && echo "$_LOCALE" > custom-shipped-locales + rm -rf data/files-to-append/l10n/* + fi + + # Produce IceCat sources + bash makeicecat + cd output/icecat-${pkgver} # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 - patch -Np1 -i "${srcdir}"/0001-Use-remoting-name-for-GDK-application-names.patch + patch -Np1 -i ../../../0001-Use-remoting-name-for-GDK-application-names.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1667736 - patch -Np1 -i "${srcdir}"/rust_1.48.patch + patch -Np1 -i ../../../rust_1.48.patch # Patch to move files directly to /usr/lib/icecat. No more symlinks. sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk printf '%b' " \e[1;36m->\e[0m\033[1m Starting build...\n" - + cat >./mozconfig <\e[0m\033[1m Finishing...\n" -- cgit v1.2.2