From e92c466e619e17bc52dc20845f4176b23064a544 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Fri, 29 Oct 2021 13:13:41 -0700
Subject: Updated to 29.4.1

---
 PKGBUILD | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 5507d8f..54c4299 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,9 +10,7 @@
 
 pkgname=palemoon
 _pmaltname=pale-moon
-_uxpaltname=uxp
-pkgver=29.3.0
-_uxpver=20210719
+pkgver=29.4.1
 pkgrel=1
 pkgdesc="Open source web browser based on Firefox focusing on efficiency."
 arch=(x86_64 i686)
@@ -30,30 +28,23 @@ optdepends=('ffmpeg: various video and audio support'
             'pulseaudio: PulseAudio support'
             'palemoon-preferences: Custom vendor.js with security by default'
             'palemoon-preferences-basic: Custom vendor.js with less breaking changes')
-source=($pkgname-$pkgver.tar.gz::https://repo.palemoon.org/MoonchildProductions/Pale-Moon/archive/${pkgver}_Release.tar.gz
-        $_uxpaltname-$_uxpver.tar.gz::https://repo.palemoon.org/MoonchildProductions/UXP/archive/RELBASE_${_uxpver}.tar.gz
+source=($pkgname-$pkgver.tar.xz::http://archive.palemoon.org/source/${pkgname}-${pkgver}-source.tar.xz
         mozconfig.in
         system-libs.patch)
-b2sums=('1535d0f2230f00e4a945666b7ac3f2ccbc64058dadd0f8254afce9d6a64198687d26936a53c42fea331d2f84c0d0009fd9f9c5417f2413265688ad9d123cc177'
-        'ca802059e330453750faa8dc256db2f7ca14df3f21ec3842b4fb5dbdf0da6686969eceea7fd867bbb02f6011fc3264f4c8a5072a4a108d88cd9ba4de643a4b4a'
+b2sums=('ec6983e127f56626dc3b61e7dde0cbc8cb62bc2ee96fb39fdd5a2cbaf56e487e1339ff9306bc83f876f31b43f6ad831b9a107eef8c6768fd988a0af660e86846'
         '1f00d86b6c1cfad0636213e5a5b67f6749a46a8885f61ecd30c9f9b63397ee8fb36f27e9199623466fcae7e0a4112438862796f27cde07a06e3403f2f1bb474f'
         '47cc9da19cb7003ea896e8d1f3f77197548cf917c943ec1bd8526daaf6212d2c2c90bc417df156ee571c9ca052749a6a3a13f8acc150f1983a8bf0f8f1ebe2de')
 validpgpkeys=('3059E09144F56804F0FBF4E126B40624BDBFD9F3')
 
 prepare() {
   sed 's#%SRCDIR%#'"${srcdir}"'#g' mozconfig.in > mozconfig
-  cd ${_pmaltname}
-  rm -rf platform
-  mv ../${_uxpaltname} platform
 
   # I'll use system libs if I darn well choose, thank you very much.
-  patch -Np1 -i ../system-libs.patch
+  patch -Np1 -i ${srcdir}/system-libs.patch
   rm platform/build/directive4.py
-
 }
 
 build() {
-  cd ${_pmaltname}
 
   # palemoon is prone to OOM, use 1 thread per 2GB ram
   #export MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -75,16 +66,16 @@ package() {
   ln -s "/usr/lib/${pkgname}/palemoon" "${pkgdir}/usr/bin/palemoon"
 
   # icons
-  install -Dm644 ${srcdir}/${_pmaltname}/palemoon/branding/official/default16.png \
+  install -Dm644 ${srcdir}/${pkgname}/branding/official/default16.png \
     "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${pkgname}.png"
-  install -Dm644 ${srcdir}/${_pmaltname}/palemoon/branding/official/default32.png \
+  install -Dm644 ${srcdir}/${pkgname}/branding/official/default32.png \
     "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${pkgname}.png"
-  install -Dm644 ${srcdir}/${_pmaltname}/palemoon/branding/official/default48.png \
+  install -Dm644 ${srcdir}/${pkgname}/branding/official/default48.png \
     "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
-  install -Dm644 ${srcdir}/${_pmaltname}/palemoon/branding/official/mozicon128.png \
+  install -Dm644 ${srcdir}/${pkgname}/branding/official/mozicon128.png \
     "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png"
 
   # install desktop file
-  install -Dm644 "${srcdir}/${_pmaltname}/palemoon/branding/official/palemoon.desktop" \
+  install -Dm644 "${srcdir}/${pkgname}/branding/official/palemoon.desktop" \
     "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }
-- 
cgit v1.2.1