mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
community/seamonkey to 2.53.9.1-3
This commit is contained in:
Kevin Mihelich
parent
380485358d
commit
0be23f1ce2
|
|
@ -10,7 +10,7 @@ buildarch=12
|
|||
|
||||
pkgname=seamonkey
|
||||
pkgver=2.53.9.1
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="SeaMonkey internet suite"
|
||||
arch=('x86_64')
|
||||
license=('MPL')
|
||||
|
|
@ -24,10 +24,14 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
|
|||
'pulseaudio: Audio support')
|
||||
url="https://www.seamonkey-project.org/"
|
||||
source=("https://archive.mozilla.org/pub/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz"
|
||||
"clang-13.patch"
|
||||
"rust-1.56.patch"
|
||||
"mozconfig"
|
||||
"xulrunner-27.0-build-arm.patch"
|
||||
"bug-1163171.patch")
|
||||
sha256sums=('756fc69478b9913c1f3c91090b78d880da8f593238754b8416c87184e4d6e597'
|
||||
'431601328f59578194ad57fccd70f4c9277605cda1ec77a7a2c68502a4cd6fa0'
|
||||
'a125460818373bc5b4f7eda7598dee71fd3aef3f175e761ec60c356532f9fd45'
|
||||
'2b1404af0c6db2602bdf6449a936d04fbb6e97299addd5e21c55b0ceff43d891'
|
||||
'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e'
|
||||
'6917d93f905af5a068e2daa598d8f64aacb47c69fc4a9e5263a583857abb7e29')
|
||||
|
|
@ -49,6 +53,9 @@ prepare() {
|
|||
cd "$pkgname-$pkgver"
|
||||
cp ../mozconfig .mozconfig
|
||||
|
||||
patch -Np1 -i ../clang-13.patch
|
||||
patch -Np1 -i ../rust-1.56.patch
|
||||
|
||||
echo -n "$_google_api_key" > google-api-key
|
||||
echo -n "$_mozilla_api_key" > mozilla-api-key
|
||||
|
||||
|
|
|
|||
112
community/seamonkey/clang-13.patch
Normal file
112
community/seamonkey/clang-13.patch
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
From 3dc54332dbaf1db6cf58d9c605f405f22d2e0d11 Mon Sep 17 00:00:00 2001
|
||||
From: Andi-Bogdan Postelnicu <andi@mozilla.com>
|
||||
Date: Wed, 2 Jun 2021 14:38:01 +0000
|
||||
Subject: [PATCH] Bug 1707096 - fix the build for `clang-trunk`. r=jfkthame
|
||||
|
||||
With D100581 LLVM added support for -Wunused-but-set-parameter and -Wunused-but-set-variable.
|
||||
1. we shouldn't treat these warning as errors
|
||||
2. for harfbuzz we apply a patch that has also been upstreamed, #2995, since pragma directives are somehow borken in clang vs gcc.
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D116604
|
||||
---
|
||||
build/moz.configure/warnings.configure | 3 +++
|
||||
gfx/harfbuzz/README-mozilla | 6 ++++++
|
||||
gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.hh | 3 +--
|
||||
gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.rl | 2 +-
|
||||
gfx/harfbuzz/src/hb-subset-cff1.cc | 4 +---
|
||||
5 files changed, 12 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/build/moz.configure/warnings.configure b/build/moz.configure/warnings.configure
|
||||
index f15ed78b154..a79cc9b2493 100644
|
||||
--- a/build/moz.configure/warnings.configure
|
||||
+++ b/build/moz.configure/warnings.configure
|
||||
@@ -102,6 +102,9 @@ check_and_add_gcc_warning('-Wno-error=free-nonheap-object')
|
||||
# Would be a pain to fix all occurrences, for very little gain
|
||||
check_and_add_gcc_warning('-Wno-error=multistatement-macros')
|
||||
|
||||
+# new in clang-trunk/13, turned on by -Wall, but we have many occurances of this in our code.
|
||||
+check_and_add_gcc_warning("-Wno-error=unused-but-set-variable")
|
||||
+
|
||||
# catches format/argument mismatches with printf
|
||||
c_format_warning, cxx_format_warning = check_and_add_gcc_warning(
|
||||
'-Wformat', when=depends(target)(lambda t: t.kernel != 'WINNT'))
|
||||
diff --git a/gfx/harfbuzz/README-mozilla b/gfx/harfbuzz/README-mozilla
|
||||
index 0f271a834ae..c668c9877fd 100644
|
||||
--- a/gfx/harfbuzz/README-mozilla
|
||||
+++ b/gfx/harfbuzz/README-mozilla
|
||||
@@ -3,6 +3,12 @@ https://github.com/harfbuzz/harfbuzz
|
||||
|
||||
Current version: 2.4.0 [commit d6fc1d49aa099104a889c96bc9087c21d8fc0960]
|
||||
|
||||
+!!!Please Note!!!
|
||||
+Because LLVM added in D100581 support for -Wunused-but-set-parameter and -Wunused-but-set-variable
|
||||
+and clang doesn't cope well with `#pragma GCC diagnostic warning` vs gcc we had to patch this version up.
|
||||
+The same patch was upstream in #2995 so, starting with the next version, the current patch will no longer
|
||||
+be needed.
|
||||
+
|
||||
UPDATING:
|
||||
|
||||
Our in-tree copy of HarfBuzz does not depend on any generated files from the
|
||||
diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.hh b/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.hh
|
||||
index 0c19e4f687f..f9696c52259 100644
|
||||
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.hh
|
||||
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.hh
|
||||
@@ -293,7 +293,7 @@ static const int myanmar_syllable_machine_en_main = 0;
|
||||
static void
|
||||
find_syllables (hb_buffer_t *buffer)
|
||||
{
|
||||
- unsigned int p, pe, eof, ts, te, act HB_UNUSED;
|
||||
+ unsigned int p, pe, eof, ts, te HB_UNUSED;
|
||||
int cs;
|
||||
hb_glyph_info_t *info = buffer->info;
|
||||
|
||||
@@ -302,7 +302,6 @@ find_syllables (hb_buffer_t *buffer)
|
||||
cs = myanmar_syllable_machine_start;
|
||||
ts = 0;
|
||||
te = 0;
|
||||
- act = 0;
|
||||
}
|
||||
|
||||
#line 114 "hb-ot-shape-complex-myanmar-machine.rl"
|
||||
diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.rl b/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.rl
|
||||
index 7845a86d41f..bc2607ba527 100644
|
||||
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.rl
|
||||
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.rl
|
||||
@@ -105,7 +105,7 @@ main := |*
|
||||
static void
|
||||
find_syllables (hb_buffer_t *buffer)
|
||||
{
|
||||
- unsigned int p, pe, eof, ts, te, act HB_UNUSED;
|
||||
+ unsigned int p, pe, eof, ts, te HB_UNUSED;
|
||||
int cs;
|
||||
hb_glyph_info_t *info = buffer->info;
|
||||
%%{
|
||||
diff --git a/gfx/harfbuzz/src/hb-subset-cff1.cc b/gfx/harfbuzz/src/hb-subset-cff1.cc
|
||||
index 49ac0bf4299..d51842e2971 100644
|
||||
--- a/gfx/harfbuzz/src/hb-subset-cff1.cc
|
||||
+++ b/gfx/harfbuzz/src/hb-subset-cff1.cc
|
||||
@@ -464,12 +464,11 @@ struct cff_subset_plan {
|
||||
unsigned int plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan)
|
||||
{
|
||||
const Encoding *encoding = acc.encoding;
|
||||
- unsigned int size0, size1, supp_size;
|
||||
+ unsigned int size0, size1;
|
||||
hb_codepoint_t code, last_code = CFF_UNDEF_CODE;
|
||||
hb_vector_t<hb_codepoint_t> supp_codes;
|
||||
|
||||
subset_enc_code_ranges.resize (0);
|
||||
- supp_size = 0;
|
||||
supp_codes.init ();
|
||||
|
||||
subset_enc_num_codes = plan->num_output_glyphs () - 1;
|
||||
@@ -505,7 +504,6 @@ struct cff_subset_plan {
|
||||
code_pair_t pair = { supp_codes[i], sid };
|
||||
subset_enc_supp_codes.push (pair);
|
||||
}
|
||||
- supp_size += SuppEncoding::static_size * supp_codes.length;
|
||||
}
|
||||
}
|
||||
supp_codes.fini ();
|
||||
--
|
||||
GitLab
|
||||
|
||||
73
community/seamonkey/rust-1.56.patch
Normal file
73
community/seamonkey/rust-1.56.patch
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue