From db8785011bf802a2c229d68a84a0ba6f9b9a24f4 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 3 Sep 2022 21:44:49 -0700
Subject: Updated to 31.2.0.1
---
PKGBUILD | 23 +++++++++++++++--------
glibc2.36-fix.patch | 20 ++++++++++++++++++++
2 files changed, 35 insertions(+), 8 deletions(-)
create mode 100644 glibc2.36-fix.patch
diff --git a/PKGBUILD b/PKGBUILD
index 756144c..3935002 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,11 +14,12 @@ pkgname=palemoon
_pmaltname=pale-moon
_pmotheraltname=Pale-Moon
_uxpaltname=uxp
-pkgver=31.1.1
+pkgver=31.2.0.1
pkgrel=1
-# Commit ID can be found at https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases
-_commit=ffd78091d8f4f5245eb34e63dcc1db18f741191e
-_UXPcommit=dd4d9eb032bd16eb66182d68dac8719eedf3cfaf
+# palemoon commit ID can be found at https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases
+_commit=e842b85fb35a4f556202343e1d52b2b5a7d0d16f
+# UXP commit ID can be found at https://repo.palemoon.org/MoonchildProductions/UXP/releases
+_UXPcommit=b110549cbd2a6f9efd11b33180b4a410f271923a
pkgdesc="Open source web browser based on Firefox focusing on efficiency."
arch=(x86_64 i686)
license=(MPL GPL LGPL)
@@ -42,19 +43,23 @@ optdepends=('ffmpeg: various video and audio support'
source=(git+"https://repo.palemoon.org/MoonchildProductions/${_pmotheraltname}?signed#commit=${_commit}"
git+"https://repo.palemoon.org/MoonchildProductions/UXP?signed#commit=${_UXPcommit}"
mozconfig.in
- system-libs.patch)
+ system-libs.patch
+ glibc2.36-fix.patch)
sha1sums=('SKIP'
'SKIP'
'032d348b68d272c59018d9fa29062b02f82fac20'
- '056a719186a2600b6c088c8f372423e9ea3c79da')
+ '056a719186a2600b6c088c8f372423e9ea3c79da'
+ '21f9ef1825cd26928e23bd95ceac2b23ce9bfa2b')
sha256sums=('SKIP'
'SKIP'
'e1df3a02470986a1e4ca12da475badc0a26aced7aa2828a5c58bc062fdefc79f'
- 'fbb64b9bf939ac37f7927c6f299faaff06e5b3310ee394948e5b2c38afa09e25')
+ 'fbb64b9bf939ac37f7927c6f299faaff06e5b3310ee394948e5b2c38afa09e25'
+ 'e938be99b0f08ca4778ad032c40baa73077ba2cb47f1dc95200fce7946fe04e7')
b2sums=('SKIP'
'SKIP'
'9ad8bfacee08780cf6d45a1aea5068674748427beb3fd53f230fa5f8d43739ce17045cbcd815ff07f2ffc1ce31d235fc8eb8a61c753fb67fb529707dbb84b18f'
- '47cc9da19cb7003ea896e8d1f3f77197548cf917c943ec1bd8526daaf6212d2c2c90bc417df156ee571c9ca052749a6a3a13f8acc150f1983a8bf0f8f1ebe2de')
+ '47cc9da19cb7003ea896e8d1f3f77197548cf917c943ec1bd8526daaf6212d2c2c90bc417df156ee571c9ca052749a6a3a13f8acc150f1983a8bf0f8f1ebe2de'
+ '9cb6b82e4894558695460cc5b6b32ad62df66c6a14f4c38047e87758facdd9a42e2f1027b5e5edf4b7b7174f5446c8b0175ba792ae03030e8659f9dfd3e79c37')
#https://www.palemoon.org/0x8FCF9CEC.asc
validpgpkeys=('3DAD8CD107197488D2A2A0BD40481E7B8FCF9CEC'
'3059E09144F56804F0FBF4E126B40624BDBFD9F3')
@@ -68,6 +73,8 @@ prepare() {
git config submodule.platform.url "${srcdir}/UXP"
git submodule update
+ patch -Np1 -i "${srcdir}/glibc2.36-fix.patch"
+
# I'll use system libs if I darn well choose, thank you very much.
patch -Np1 -i ../system-libs.patch
rm platform/build/directive4.py
diff --git a/glibc2.36-fix.patch b/glibc2.36-fix.patch
new file mode 100644
index 0000000..5cb17d1
--- /dev/null
+++ b/glibc2.36-fix.patch
@@ -0,0 +1,20 @@
+https://forum.palemoon.org/viewtopic.php?f=62&t=28676
+diff -aur a/platform/ipc/chromium/src/third_party/libevent/arc4random.c b/platform/ipc/chromium/src/third_party/libevent/arc4random.c
+--- a/platform/ipc/chromium/src/third_party/libevent/arc4random.c 2022-08-03 10:28:29.353126800 +0100
++++ b/platform/ipc/chromium/src/third_party/libevent/arc4random.c 2022-08-03 21:16:14.795881259 +0100
+@@ -482,6 +482,7 @@
+ #endif
+
+ #if defined(_we_have_arc4random_buf) || !defined(XP_SOLARIS)
++#if (__GLIBC__ <= 2 && __GLIBC_MINOR__ < 36) || !defined(XP_LINUX)
+ ARC4RANDOM_EXPORT void
+ arc4random_buf(void *_buf, size_t n)
+ {
+@@ -496,6 +497,7 @@
+ _ARC4_UNLOCK();
+ }
+ #endif
++#endif
+
+ #ifndef ARC4RANDOM_NOUNIFORM
+ /*
--
cgit v1.2.1