summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2019-07-25 15:03:46 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2019-07-25 15:03:46 -0700
commitdb7baf5e5597321171dac6a186a8d42baa450bd1 (patch)
tree9977724b8a1b93c5735f0d60eded3a12de03dadb
parentUpdated to 28.6.0 (diff)
downloadpalemoon-db7baf5e5597321171dac6a186a8d42baa450bd1.tar.xz
Updated to 28.6.1
-rw-r--r--PKGBUILD17
-rw-r--r--gcc9-fix.patch16
-rw-r--r--mozconfig.in2
3 files changed, 7 insertions, 28 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 178fff0..9928802 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
# AUR version does not use system libs
pkgname=palemoon
-pkgver=28.6.0
+pkgver=28.6.1
pkgrel=1
pkgdesc="Open source web browser based on Firefox focusing on efficiency."
arch=(x86_64 i686)
@@ -27,12 +27,10 @@ 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
- gcc9-fix.patch)
-sha256sums=('6a6e96c81d4688c07d78b6f3d3644a92bff28c325e7265cef225a452ba8ea86c'
- '8f9e65d75852c2ded9efd64c3fa0d7ae49b2091ab10b35e1b330931a49348ae4'
- '20a037116f85737849b663c61b55fdc7120f83e960ba5b416d70a910de0e9443'
- '93415726a738fadc2c45c2579b0286085e5c532239130331ee164bc69ef79304')
+ system-libs.patch)
+sha256sums=('184481968cbe759596e04afbe486976a4c299f6e2d10156a6977ad2042fa5b0f'
+ '54e0f2b3e87785d03b782b597bfaceb7607828e4fc44caf82e72bd98241274c6'
+ '20a037116f85737849b663c61b55fdc7120f83e960ba5b416d70a910de0e9443')
prepare() {
sed 's#%SRCDIR%#'"$srcdir"'#g' mozconfig.in > mozconfig
@@ -46,12 +44,9 @@ build() {
patch -Np1 -i ../system-libs.patch
rm build/directive4.py
- # patch to allow compilation on gcc9
- # https://forum.palemoon.org/viewtopic.php?f=37&t=21745#p166549
- patch -Np1 -i ../gcc9-fix.patch
-
export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
export MOZCONFIG="$srcdir/mozconfig"
+ export LDFLAGS="$LDFLAGS,-fuse-ld=gold"
python2 mach build
}
diff --git a/gcc9-fix.patch b/gcc9-fix.patch
deleted file mode 100644
index f45c1c8..0000000
--- a/gcc9-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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());
- }
- }
diff --git a/mozconfig.in b/mozconfig.in
index 1cac08e..480a0a7 100644
--- a/mozconfig.in
+++ b/mozconfig.in
@@ -2,7 +2,7 @@ mk_add_options AUTOCLOBBER=1
mk_add_options MOZ_OBJDIR=%SRCDIR%/pmbuild
ac_add_options --enable-application=palemoon
-ac_add_options --enable-optimize="-O2"
+ac_add_options --enable-optimize="-O2 -Wno-format-overflow"
ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1