diff --git a/community/seamonkey/PKGBUILD b/community/seamonkey/PKGBUILD index fd23783f1..424814058 100644 --- a/community/seamonkey/PKGBUILD +++ b/community/seamonkey/PKGBUILD @@ -3,7 +3,6 @@ # ALARM: Kevin Mihelich # - mozconfig changes # - patch to fix neon usage -# - patch to fix v7 FTBFS in js highmem=1 @@ -24,12 +23,10 @@ optdepends=('networkmanager: Location detection via available WiFi networks' url="https://www.seamonkey-project.org/" source=("https://archive.mozilla.org/pub/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz" "mozconfig" - "xulrunner-27.0-build-arm.patch" - "bug-1163171.patch") + "xulrunner-27.0-build-arm.patch") sha256sums=('a1a694219d01db24b5241d1afa785599fe6998a58b03d1b51c4b51995058098e' '2b1404af0c6db2602bdf6449a936d04fbb6e97299addd5e21c55b0ceff43d891' - 'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e' - '6917d93f905af5a068e2daa598d8f64aacb47c69fc4a9e5263a583857abb7e29') + 'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e') install="$pkgname.install" options=(!lto) @@ -64,7 +61,6 @@ EOF echo "ac_add_options --disable-elf-hack" >> .mozconfig LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" patch -p2 -i "${srcdir}"/xulrunner-27.0-build-arm.patch - patch -p1 -i "${srcdir}"/bug-1163171.patch } build() { diff --git a/community/seamonkey/bug-1163171.patch b/community/seamonkey/bug-1163171.patch deleted file mode 100644 index b44953e06..000000000 --- a/community/seamonkey/bug-1163171.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# User Nathan Froyd - -Bug 1163171 - part 5 - remove arm-specific hacks in typed array implementation; r=lth - -clang does not have the specific problem that led to this hack in the -first place, so we can remove the hack. (The hack also causes issues -with clang; it complains that you can't pass `volatile T*` into the -intrinsics that we're using for atomic operations.) - -diff --git a/js/src/vm/TypedArrayObject-inl.h b/js/src/vm/TypedArrayObject-inl.h -index e5b0253..9d9c0d5 100644 ---- a/js/src/vm/TypedArrayObject-inl.h -+++ b/js/src/vm/TypedArrayObject-inl.h -@@ -258,17 +258,17 @@ class ElementSpecific - uint32_t count = source->length(); - - if (source->type() == target->type()) { - Ops::podCopy(dest, source->viewDataEither().template cast(), count); - return true; - } - - // Inhibit unaligned accesses on ARM (bug 1097253, a compiler bug). --#ifdef __arm__ -+#if defined(__arm__) && defined(__GNUC__) && !defined(__clang__) - # define JS_VOLATILE_ARM volatile - #else - # define JS_VOLATILE_ARM - #endif - - SharedMem data = Ops::extract(source); - switch (source->type()) { - case Scalar::Int8: { -