[icecat]: wip - mksource recipe

1 files changed, 32 insertions, 55 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index ff5b58ff9..a5543442f 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -37,6 +37,7 @@
 
 pkgname=icecat
 _upstream_ver=78.9.0-pre # -gnu
+_mozilla_ver=${_upstream_ver%-*}
 pkgver=${_upstream_ver//-/_}
 pkgrel=2
 _commit=8b54aee6bd0c39f043bbba7a654870e032a910bc
@@ -47,7 +48,7 @@ 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 wget mercurial git lld perl-file-rename)
+             python nodejs python2-psutil cbindgen nasm mercurial lld perl-file-rename)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -55,47 +56,38 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'hunspell-en_US: Spell checking, American English')
 options=(!emptydirs !makeflags !strip)
 
-_make_srcball=0
-if (( _make_srcball ))
-then
-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
-        rust_1.48.patch.gz)
-sha256sums=('5b248baaa61ece3f5b8077751638a42445c196df4e7d09e6d9b28e127b482e86'
-            'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d'
-            '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208'
-            'e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442'
-            'c7f867ccee684939c9f0a9c30ea69127077bbe43af545a03f09dfbbdc02545a9')
-else
-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)
+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})
 sha256sums=('6f777cbea1066ba10db64967d55b9204e14bbea9a7836c4bf7e7a1e642f97716'
-            'SKIP'
-            'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d'
-            '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208'
-            'e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442'
-            'c7f867ccee684939c9f0a9c30ea69127077bbe43af545a03f09dfbbdc02545a9')
-validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
-fi
+            'SKIP')
+validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases
+              '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 
 
-_make_icecat() {
+mksource() {
   cd "${srcdir}"/gnuzilla-${_commit}
 
-  # Uncomment if you have issues with gpg download... WITH PROXY gpg doesn't work!!!!!!
-  #sed -e 's/^verify_sources$//g' -i makeicecat
+  # 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/
 
-  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
+  # 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
@@ -109,16 +101,11 @@ _make_icecat() {
 
   # Produce IceCat sources
   bash makeicecat
-}
 
-prepare() {
-if (( _make_srcball ))
-then
-  make_icecat
+
+  ## Parabola patching ##
+
   cd gnuzilla-${_commit}/output/icecat-${pkgver}
-else
-  cd "${srcdir}"/$pkgname-${pkgver%_*}/
-fi
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i "${srcdir}"/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -131,7 +118,7 @@ fi
   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 <<END
 ac_add_options --enable-application=browser
 
@@ -171,12 +158,7 @@ END
 }
 
 build() {
-if (( _make_srcball ))
-then
   cd gnuzilla-${_commit}/output/icecat-${pkgver}
-else
-  cd "${srcdir}"/$pkgname-${pkgver%_*}/
-fi
 
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
@@ -199,12 +181,7 @@ fi
 }
 
 package () {
-if (( _make_srcball ))
-then
   cd gnuzilla-${_commit}/output/icecat-${pkgver}
-else
-  cd "${srcdir}"/$pkgname-${pkgver%_*}/
-fi
 
   # 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