Updated to 28.5.2

Added patch for compiling on gcc 9

2 files changed, 25 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0d65b86..90430ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # AUR version does not use system libs
 
 pkgname=palemoon
-pkgver=28.5.1
+pkgver=28.5.2
 pkgrel=1
 pkgdesc="Open source web browser based on Firefox focusing on efficiency."
 arch=(x86_64 i686)
@@ -27,10 +27,12 @@ optdepends=('ffmpeg: various video and audio support'
             'pulseaudio: PulseAudio support')
 source=(palemoon-$pkgver.tar.gz::https://github.com/MoonchildProductions/UXP/archive/PM${pkgver}_Release.tar.gz
         mozconfig.in
-        system-libs.patch)
-sha256sums=('06fc470fcf6efc8a558bbbf23c1be2eb7f6ac3f4acf3bf016e4103c67f03dfb6'
+        system-libs.patch
+        gcc9-fix.patch)
+sha256sums=('2858f86fbd6512e4b1862e3364701b445eaf60f46d05d775610ee2c6fecbdfd8'
             '8f9e65d75852c2ded9efd64c3fa0d7ae49b2091ab10b35e1b330931a49348ae4'
-            'ddd6e39161b789c3dab7e963d5f837b5a72155c59f88abc66dce5fe9d5d0a2e9')
+            'ddd6e39161b789c3dab7e963d5f837b5a72155c59f88abc66dce5fe9d5d0a2e9'
+            '93415726a738fadc2c45c2579b0286085e5c532239130331ee164bc69ef79304')
 
 prepare() {
   sed 's#%SRCDIR%#'"$srcdir"'#g' mozconfig.in > mozconfig
@@ -44,6 +46,9 @@ build() {
   patch -Np1 -i ../system-libs.patch
   rm build/directive4.py
 
+  # patch to allow compilation on gcc9
+  patch -Np1 -i ../gcc9-fix.patch
+
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
   export MOZCONFIG="$srcdir/mozconfig"
   export CPPFLAGS="$CPPFLAGS -O2"
diff --git a/gcc9-fix.patch b/gcc9-fix.patch
new file mode 100644
index 0000000..f45c1c8
--- /dev/null
+++ b/gcc9-fix.patch
@@ -0,0 +1,16 @@
+--- a/js/xpconnect/src/XPCWrappedNative.cpp
++++ b/js/xpconnect/src/XPCWrappedNative.cpp
+@@ -2215,10 +2215,9 @@         else if (count == 2 && array[0] == isupp) {
+             name = JS_sprintf_append(name, "%s", array[1]->GetNameString());
+         } else {
+             for (uint16_t i = 0; i < count; i++) {
+-                const char* fmt = (i == 0) ?
+-                                    "(%s" : (i == count-1) ?
+-                                        ", %s)" : ", %s";
+-                name = JS_sprintf_append(name, fmt,
++                name = JS_sprintf_append(name, (i == 0) ?
++                                         "(%s" : (i == count-1) ?
++                                         ", %s)" : ", %s",
+                                          array[i]->GetNameString());
+             }
+         }