Accepting request 1132252 from mozilla
Update to SeaMonkey 2.53.18 OBS-URL: https://build.opensuse.org/request/show/1132252 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/seamonkey?expand=0&rev=49
This commit is contained in:
parent
9873083219
commit
a0e0e80503
File diff suppressed because one or more lines are too long
2603
1849874-11503.patch
2603
1849874-11503.patch
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f3639aa4609608e01e6660e590f0c43b663caca20433238fb4c4e57f6e23822b
|
||||
size 13662504
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df89e53df981d79e70ea8dd33774aa2cd6de2bdc7979b1edc63fb08f0aa3b996
|
||||
size 266075292
|
3
seamonkey-2.53.18.source-l10n.tar.xz
Normal file
3
seamonkey-2.53.18.source-l10n.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3d029110e7eddb895a70e0ee146e160ea2952005e18be71f49cdd7f3c04bbb79
|
||||
size 13419252
|
3
seamonkey-2.53.18.source.tar.xz
Normal file
3
seamonkey-2.53.18.source.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cef8349e2c9343871f46e08be75dbc8b02206d40df1e332c82f592b600911911
|
||||
size 252379244
|
@ -1,166 +0,0 @@
|
||||
diff --git a/media/ffvpx/1846703.patch b/media/ffvpx/1846703.patch
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/media/ffvpx/1846703.patch
|
||||
@@ -0,0 +1,76 @@
|
||||
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
|
||||
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
+Date: Sun, 16 Jul 2023 18:18:02 +0300
|
||||
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
|
||||
+ instructions within inline assembly
|
||||
+
|
||||
+Fixes assembling with binutil as >= 2.41
|
||||
+
|
||||
+Signed-off-by: James Almer <jamrial@gmail.com>
|
||||
+---
|
||||
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
|
||||
+ 1 file changed, 23 insertions(+), 3 deletions(-)
|
||||
+
|
||||
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
|
||||
+index 6298f5ed19..ca7e2dffc1 100644
|
||||
+--- a/libavcodec/x86/mathops.h
|
||||
++++ b/libavcodec/x86/mathops.h
|
||||
+@@ -35,12 +35,20 @@
|
||||
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
|
||||
+ {
|
||||
+ int rt, dummy;
|
||||
++ if (__builtin_constant_p(shift))
|
||||
+ __asm__ (
|
||||
+ "imull %3 \n\t"
|
||||
+ "shrdl %4, %%edx, %%eax \n\t"
|
||||
+ :"=a"(rt), "=d"(dummy)
|
||||
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
|
||||
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
|
||||
+ );
|
||||
++ else
|
||||
++ __asm__ (
|
||||
++ "imull %3 \n\t"
|
||||
++ "shrdl %4, %%edx, %%eax \n\t"
|
||||
++ :"=a"(rt), "=d"(dummy)
|
||||
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
|
||||
++ );
|
||||
+ return rt;
|
||||
+ }
|
||||
+
|
||||
+@@ -113,19 +121,31 @@ __asm__ volatile(\
|
||||
+ // avoid +32 for shift optimization (gcc should do that ...)
|
||||
+ #define NEG_SSR32 NEG_SSR32
|
||||
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
|
||||
++ if (__builtin_constant_p(s))
|
||||
+ __asm__ ("sarl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+- : "ic" ((uint8_t)(-s))
|
||||
++ : "i" (-s & 0x1F)
|
||||
+ );
|
||||
++ else
|
||||
++ __asm__ ("sarl %1, %0\n\t"
|
||||
++ : "+r" (a)
|
||||
++ : "c" ((uint8_t)(-s))
|
||||
++ );
|
||||
+ return a;
|
||||
+ }
|
||||
+
|
||||
+ #define NEG_USR32 NEG_USR32
|
||||
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
|
||||
++ if (__builtin_constant_p(s))
|
||||
+ __asm__ ("shrl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+- : "ic" ((uint8_t)(-s))
|
||||
++ : "i" (-s & 0x1F)
|
||||
+ );
|
||||
++ else
|
||||
++ __asm__ ("shrl %1, %0\n\t"
|
||||
++ : "+r" (a)
|
||||
++ : "c" ((uint8_t)(-s))
|
||||
++ );
|
||||
+ return a;
|
||||
+ }
|
||||
+
|
||||
+--
|
||||
+2.30.2
|
||||
+
|
||||
diff -ruN seamonkey-2.53.17.1.orig/media/ffvpx/README_MOZILLA seamonkey-2.53.17.1/media/ffvpx/README_MOZILLA
|
||||
--- seamonkey-2.53.17.1.orig/media/ffvpx/README_MOZILLA 2021-05-25 20:33:38.000000000 +0200
|
||||
+++ seamonkey-2.53.17.1/media/ffvpx/README_MOZILLA 2023-10-04 10:18:51.211608861 +0200
|
||||
@@ -1,6 +1,13 @@
|
||||
This directory contains files used in gecko builds from FFmpeg
|
||||
(http://ffmpeg.org). The current files are from FFmpeg as of
|
||||
revision n4.0.2-6-g2be51cbeea
|
||||
+
|
||||
+This copy has a single patch backported from a later revision to fix the build with recent binutils:
|
||||
+
|
||||
+http://git.videolan.org/?p=ffmpeg.git;a=patch;h=effadce6c756247ea8bae32dc13bb3e6f464f0eb
|
||||
+that is available as `1846703.patch` in this directory. As usual this has other
|
||||
+changes that don't come from upstream, in `changes.patch`
|
||||
+
|
||||
All source files match their path from the library's source archive.
|
||||
|
||||
Currently, we only use the vp8 and vp9 portion of the library, and only on x86
|
||||
diff --git a/media/ffvpx/libavcodec/x86/mathops.h b/media/ffvpx/libavcodec/x86/mathops.h
|
||||
--- a/media/ffvpx/libavcodec/x86/mathops.h
|
||||
+++ b/media/ffvpx/libavcodec/x86/mathops.h
|
||||
@@ -33,16 +33,24 @@
|
||||
|
||||
#define MULL MULL
|
||||
static av_always_inline av_const int MULL(int a, int b, unsigned shift)
|
||||
{
|
||||
int rt, dummy;
|
||||
+ if (__builtin_constant_p(shift))
|
||||
__asm__ (
|
||||
"imull %3 \n\t"
|
||||
"shrdl %4, %%edx, %%eax \n\t"
|
||||
:"=a"(rt), "=d"(dummy)
|
||||
- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
|
||||
+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ (
|
||||
+ "imull %3 \n\t"
|
||||
+ "shrdl %4, %%edx, %%eax \n\t"
|
||||
+ :"=a"(rt), "=d"(dummy)
|
||||
+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
|
||||
+ );
|
||||
return rt;
|
||||
}
|
||||
|
||||
#define MULH MULH
|
||||
static av_always_inline av_const int MULH(int a, int b)
|
||||
@@ -111,23 +119,35 @@
|
||||
: "+a"(level), "=&d"(mask))
|
||||
|
||||
// avoid +32 for shift optimization (gcc should do that ...)
|
||||
#define NEG_SSR32 NEG_SSR32
|
||||
static inline int32_t NEG_SSR32( int32_t a, int8_t s){
|
||||
+ if (__builtin_constant_p(s))
|
||||
__asm__ ("sarl %1, %0\n\t"
|
||||
: "+r" (a)
|
||||
- : "ic" ((uint8_t)(-s))
|
||||
+ : "i" (-s & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ ("sarl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+ : "c" ((uint8_t)(-s))
|
||||
+ );
|
||||
return a;
|
||||
}
|
||||
|
||||
#define NEG_USR32 NEG_USR32
|
||||
static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
|
||||
+ if (__builtin_constant_p(s))
|
||||
__asm__ ("shrl %1, %0\n\t"
|
||||
: "+r" (a)
|
||||
- : "ic" ((uint8_t)(-s))
|
||||
+ : "i" (-s & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ ("shrl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+ : "c" ((uint8_t)(-s))
|
||||
+ );
|
||||
return a;
|
||||
}
|
||||
|
||||
#endif /* HAVE_INLINE_ASM */
|
||||
#endif /* AVCODEC_X86_MATHOPS_H */
|
||||
|
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 09 14:26:01 UTC 2023 - Tristan Miller <psychonaut@nothingisreal.com>
|
||||
|
||||
- update to SeaMonkey 2.53.18
|
||||
* Update Branding info bug 1841167.
|
||||
* Use BugSplat for SeaMonkey crash reporting bug 1835524.
|
||||
* Unify notifications and permissions in SeaMonkey bug 1849526.
|
||||
* SeaMonkey 2.53.18 uses the same backend as Firefox and contains
|
||||
the relevant Firefox 60.8 security fixes.
|
||||
* SeaMonkey 2.53.18 shares most parts of the mail and news code with
|
||||
Thunderbird. Please read the Thunderbird 60.8.0 release notes for
|
||||
specific security fixes in this release.
|
||||
* Additional important security fixes up to Current Firefox 115.5
|
||||
and Thunderbird 115.5 ESR plus many enhancements have been
|
||||
backported. We will continue to enhance SeaMonkey security in
|
||||
subsequent 2.53.x beta and release versions as fast as we are able
|
||||
to.
|
||||
- remove obsolete patch seamonkey-binutils.patch
|
||||
- remove obsolete patches 1817900-13-112a1.patch, 1849874-11503.patch,
|
||||
and TOP-NOBUG-revendor-253172.patch
|
||||
- request inclusion in Leap 15.4, 15.5, and 15.6:
|
||||
https://bugzilla.opensuse.org/show_bug.cgi?id=1217916
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 01 17:37:55 UTC 2023 - Tristan Miller <psychonaut@nothingisreal.com>
|
||||
|
||||
|
@ -37,7 +37,7 @@ BuildRequires: libproxy-devel
|
||||
#BuildRequires: libvpx-devel # Compile errors with 1.10.0
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 && 0%{?is_opensuse}
|
||||
BuildRequires: libwebp-devel >= 1.0.0
|
||||
BuildRequires: libicu-devel >= 63.1
|
||||
#BuildRequires: libicu-devel >= 63.1
|
||||
%endif
|
||||
BuildRequires: makeinfo
|
||||
BuildRequires: memory-constraints
|
||||
@ -72,9 +72,9 @@ BuildRequires: clang-devel >= 5
|
||||
%endif
|
||||
Provides: web_browser
|
||||
Provides: browser(npapi)
|
||||
Version: 2.53.17.1
|
||||
Version: 2.53.18
|
||||
Release: 0
|
||||
%define releasedate 20230921000000
|
||||
%define releasedate 20231209000000
|
||||
Summary: An integrated web browser, composer, mail/news client, and IRC client
|
||||
License: MPL-2.0
|
||||
Group: Productivity/Networking/Web/Browsers
|
||||
@ -89,15 +89,11 @@ Source7: seamonkey-rpmlintrc
|
||||
Source11: seamonkey-appdata.tar.bz2
|
||||
Source12: seamonkey-GNUmakefile
|
||||
Patch1: mozilla-nongnome-proxies.patch
|
||||
Patch2: seamonkey-binutils.patch
|
||||
Patch3: mozilla-ntlm-full-path.patch
|
||||
Patch4: seamonkey-lto.patch
|
||||
Patch5: seamonkey-man-page.patch
|
||||
Patch6: reproducible.patch
|
||||
Patch7: mozilla-bmo531915.patch
|
||||
Patch8: 1817900-13-112a1.patch
|
||||
Patch9: 1849874-11503.patch
|
||||
Patch10: TOP-NOBUG-revendor-253172.patch
|
||||
Patch2: mozilla-ntlm-full-path.patch
|
||||
Patch3: seamonkey-lto.patch
|
||||
Patch4: seamonkey-man-page.patch
|
||||
Patch5: reproducible.patch
|
||||
Patch6: mozilla-bmo531915.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: /bin/sh coreutils
|
||||
Provides: seamonkey-mail = %{version}
|
||||
@ -226,15 +222,11 @@ cd mozilla
|
||||
cp %{SOURCE12} GNUmakefile
|
||||
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p2
|
||||
%patch4 -p1
|
||||
%patch5 -p0
|
||||
%patch2 -p2
|
||||
%patch3 -p1
|
||||
%patch4 -p0
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
|
||||
cat << EOF > .mozconfig
|
||||
mk_add_options MOZILLA_OFFICIAL=1
|
||||
|
Loading…
x
Reference in New Issue
Block a user