[icecat]: revert mksource wip

1 files changed, 17 insertions, 51 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index a5543442f..bf8c8dfce 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -39,16 +39,17 @@ pkgname=icecat
 _upstream_ver=78.9.0-pre # -gnu
 _mozilla_ver=${_upstream_ver%-*}
 pkgver=${_upstream_ver//-/_}
-pkgrel=2
+pkgrel=1
 _commit=8b54aee6bd0c39f043bbba7a654870e032a910bc
 pkgdesc="The GNU web browser, based on Mozilla Firefox ESR"
 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 mercurial lld perl-file-rename)
+             python nodejs python2-psutil cbindgen nasm lld perl-file-rename)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -56,56 +57,21 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'hunspell-en_US: Spell checking, American English')
 options=(!emptydirs !makeflags !strip)
 
-mksource=(https://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-${_commit}.tar.gz
-          https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${_mozilla_ver}esr/source/firefox-${_mozilla_ver}esr.source.tar.xz{,.asc}
-          hg+https://hg.mozilla.org/l10n/compare-locales
-          icecat.desktop icecat-safe.desktop
-          0001-Use-remoting-name-for-GDK-application-names.patch
-          rust_1.48.patch.gz)
-mksha256sums=('5b248baaa61ece3f5b8077751638a42445c196df4e7d09e6d9b28e127b482e86'
-              '8e03ac1dfc5ac804c8b13a529414a9387e0425e545bb2f4462d74c3175e64864' 'SKIP'
-              'SKIP'
-              'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d'
-              '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208'
-              'e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442'
-              'c7f867ccee684939c9f0a9c30ea69127077bbe43af545a03f09dfbbdc02545a9')
-source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.tar.bz2{,.sig})
+source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.tar.bz2{,.sig}
+        icecat.desktop icecat-safe.desktop
+        0001-Use-remoting-name-for-GDK-application-names.patch
+        rust_1.48.patch.gz)
 sha256sums=('6f777cbea1066ba10db64967d55b9204e14bbea9a7836c4bf7e7a1e642f97716'
-            'SKIP')
-validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases
-              '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
-
-
-mksource() {
-  cd "${srcdir}"/gnuzilla-${_commit}
-
-  # Copy sources into output dir
-  rm -rf "${srcdir}"/firefox-${pkgver}esr.source/
-  mv "${srcdir}"/firefox-${pkgver}esr.source.tar.xz{,.asc} output/
-  # TODO: copy lang-packs into output/l10n/
-  mv "${srcdir}"/compare-locales output/l10n/
-
-  # Disable un-needed makeicecat functions
-  sed '/^validate_env$/d' -i makeicecat
-  sed '/^verify_sources$/d' -i makeicecat
-  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 [[ $_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
-
+            'SKIP'
+            'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d'
+            '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208'
+            'e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442'
+            'c7f867ccee684939c9f0a9c30ea69127077bbe43af545a03f09dfbbdc02545a9')
+validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 
-  ## Parabola patching ##
 
-  cd gnuzilla-${_commit}/output/icecat-${pkgver}
+prepare() {
+  cd "${srcdir}"/$pkgname-${_mozilla_ver}/
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i "${srcdir}"/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -158,7 +124,7 @@ END
 }
 
 build() {
-  cd gnuzilla-${_commit}/output/icecat-${pkgver}
+  cd "${srcdir}"/$pkgname-${_mozilla_ver}/
 
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
@@ -181,7 +147,7 @@ build() {
 }
 
 package () {
-  cd gnuzilla-${_commit}/output/icecat-${pkgver}
+  cd "${srcdir}"/$pkgname-${_mozilla_ver}/
 
   # Remove cose.manifest and cose.sig cause march install fails
   find obj-x86_64-pc-linux-gnu/dist/bin/browser/extensions -name cose.manifest -delete