From 49bf31c35cb3d594036be49b713c1f16a483f1b4 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 13 Nov 2021 23:45:19 -0800
Subject: Updated to 29.4.2.1

---
 PKGBUILD | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index c5872ae..6e8b65c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=palemoon
 _pmaltname=pale-moon
-pkgver=29.4.2
+pkgver=29.4.2.1
 pkgrel=1
 pkgdesc="Open source web browser based on Firefox focusing on efficiency."
 arch=(x86_64 i686)
@@ -28,10 +28,10 @@ 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.xz::http://archive.palemoon.org/source/${pkgname}-${pkgver}-source.tar.xz
+source=($pkgname-$pkgver.tar.xz::http://archive.palemoon.org/source/${pkgname}-${pkgver}.source.tar.xz
         mozconfig.in
         system-libs.patch)
-b2sums=('aae6bbeb445e119a18a24d46d928bc7735fa785a836c001805fa65a16ee40d32a02bf5106c30169266e16cf179e67030ccc26401681d55061c4522ead9c60d8b'
+b2sums=('96ae7b7d84e7a128330ee4e486ee0b8dbfb5d9518b6de6a3b470cb93bd2c39a70b97ba6dc7e2ae9517979735bfba5bd9c89af4d22af4d1e8aabc7a1560c9594b'
         'e8b63df4274a8063ae3c9e81d23a43e8e8a91515213243909ad79f250f7fd376db4444269d7a5a42242a77f2dd17f386679163f955c2fed9898d77a94f18a13c'
         '47cc9da19cb7003ea896e8d1f3f77197548cf917c943ec1bd8526daaf6212d2c2c90bc417df156ee571c9ca052749a6a3a13f8acc150f1983a8bf0f8f1ebe2de')
 validpgpkeys=('3059E09144F56804F0FBF4E126B40624BDBFD9F3')
@@ -39,12 +39,15 @@ validpgpkeys=('3059E09144F56804F0FBF4E126B40624BDBFD9F3')
 prepare() {
   sed 's#%SRCDIR%#'"${srcdir}"'#g' mozconfig.in > mozconfig
 
+  cd ${pkgname}-source
+
   # I'll use system libs if I darn well choose, thank you very much.
-  patch -Np1 -i ${srcdir}/system-libs.patch
+  patch -Np1 -i ../system-libs.patch
   rm platform/build/directive4.py
 }
 
 build() {
+  cd ${pkgname}-source
 
   # palemoon is prone to OOM, use 1 thread per 2GB ram
   #export MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -66,16 +69,16 @@ package() {
   ln -s "/usr/lib/${pkgname}/palemoon" "${pkgdir}/usr/bin/palemoon"
 
   # icons
-  install -Dm644 ${srcdir}/${pkgname}/branding/official/default16.png \
+  install -Dm644 ${srcdir}/${pkgname}-source/${pkgname}/branding/official/default16.png \
     "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${pkgname}.png"
-  install -Dm644 ${srcdir}/${pkgname}/branding/official/default32.png \
+  install -Dm644 ${srcdir}/${pkgname}-source/${pkgname}/branding/official/default32.png \
     "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${pkgname}.png"
-  install -Dm644 ${srcdir}/${pkgname}/branding/official/default48.png \
+  install -Dm644 ${srcdir}/${pkgname}-source/${pkgname}/branding/official/default48.png \
     "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
-  install -Dm644 ${srcdir}/${pkgname}/branding/official/mozicon128.png \
+  install -Dm644 ${srcdir}/${pkgname}-source/${pkgname}/branding/official/mozicon128.png \
     "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png"
 
   # install desktop file
-  install -Dm644 "${srcdir}/${pkgname}/branding/official/palemoon.desktop" \
+  install -Dm644 "${srcdir}/${pkgname}-source/${pkgname}/branding/official/palemoon.desktop" \
     "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }
-- 
cgit v1.2.1