[packages/seamonkey/DEVEL-2.53] - started update to 2.53.4 - updated pld-branging,enable-addons,system-virtualenv patches - removed
qboosh
qboosh at pld-linux.org
Sat Oct 10 07:27:16 CEST 2020
commit 4cad6efe9c0f0ea1746d35a23692c571fe6ebb9d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Oct 10 07:26:50 2020 +0200
- started update to 2.53.4
- updated pld-branging,enable-addons,system-virtualenv patches
- removed agent patch (no longer applicable, there is no vendor part of UA now)
- removed obsolete glibc2.30,crmf,mozilla-1389436 patches
- added sysctl,mozilla-revert-1332139 patches from Fedora
mozilla-1389436.patch | 31 ----
seamonkey-agent.patch | 13 --
seamonkey-crmf.patch | 13 --
seamonkey-enable-addons.patch | 23 +--
seamonkey-glibc2.30.patch | 17 --
seamonkey-mozilla-revert-1332139.patch | 307 +++++++++++++++++++++++++++++++++
seamonkey-pld-branding.patch | 8 +-
seamonkey-sysctl.patch | 12 ++
seamonkey-system-virtualenv.patch | 12 +-
seamonkey.spec | 254 ++++++++++++++++-----------
10 files changed, 484 insertions(+), 206 deletions(-)
---
diff --git a/seamonkey.spec b/seamonkey.spec
index d3893f3..3c2858a 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -3,12 +3,16 @@
# - do something with *.rdf file, there if file conflict with other lang packages
#
# Conditional build:
-%bcond_without gtk3 # GTK+ 3.x instead of 2.x
%bcond_without ldap # disable e-mail address lookups in LDAP directories
%bcond_without kerberos # disable krb5 support
%bcond_without lightning # disable Lightning calendar
%bcond_with crashreporter # report crashes to crash-stats.mozilla.com
%bcond_with tests # enable tests (whatever they check)
+%bcond_with lowmem # lower memory requirements
+
+%ifarch %{ix86} %{arm} aarch64
+%define with_lowmem 1
+%endif
%define nspr_ver 4.13.1
%define nss_ver 3.28.6
@@ -30,65 +34,67 @@ Summary(es.UTF-8): Navegador de Internet SeaMonkey Community Edition
Summary(pl.UTF-8): SeaMonkey Community Edition - przeglądarka WWW
Summary(pt_BR.UTF-8): Navegador SeaMonkey Community Edition
Name: seamonkey
-Version: 2.49.5
-Release: 5
+Version: 2.53.4
+Release: 1
License: MPL v2.0
Group: X11/Applications/Networking
-Source0: http://ftp.mozilla.org/pub/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.xz
-# Source0-md5: 91f60a7aca6f8bc053ffddc7259ae4ec
+Source0: http://releases.mozilla.org/pub/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.xz
+# Source0-md5: bbf02af3586f1d488e77517f8cd9f439
Source4: %{name}.desktop
Source5: %{name}-composer.desktop
Source7: %{name}-mail.desktop
Source9: %{name}.sh
-Source100: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.cs.langpack.xpi
-# Source100-md5: 1e0b73887e5d80589c5b2fd5d8538d7f
-Source101: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.de.langpack.xpi
-# Source101-md5: eb4bf2ab50756280d1a39c1547129ced
-Source102: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.en-GB.langpack.xpi
-# Source102-md5: c9bea7471fabf225009a5340733e4ce2
-Source103: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.en-US.langpack.xpi
-# Source103-md5: 42f234f11bcb6a127462caaf664dc21b
-Source104: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.es-AR.langpack.xpi
-# Source104-md5: 5fdf01f31dd24c06bc0c51a74d9673a6
-Source105: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.es-ES.langpack.xpi
-# Source105-md5: 948d3dbf4452e7e46f1a0d5026d2200c
-Source106: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.fr.langpack.xpi
-# Source106-md5: 5dbd832a5d4d81aa52f7435123ade06e
-Source107: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.hu.langpack.xpi
-# Source107-md5: b002ed727428960d34ded53ec290667b
-Source108: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.it.langpack.xpi
-# Source108-md5: 12d37399fda4202144a82b458f75d27c
-Source109: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.ja.langpack.xpi
-# Source109-md5: f5e304d3ba8d526b28e92693f23154c9
-Source110: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.lt.langpack.xpi
-# Source110-md5: 40db7b6ee7b1ddd5723e51c335f73eec
-Source111: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.nb-NO.langpack.xpi
-# Source111-md5: cfde049afaaba0afe9f8b85ac704ba85
-Source112: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.nl.langpack.xpi
-# Source112-md5: 21a733c0b344840a2d81958a0fe72bc1
-Source113: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.pl.langpack.xpi
-# Source113-md5: 1a2646b993dc540f09c8b04fc4107c45
-Source114: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.pt-PT.langpack.xpi
-# Source114-md5: 0e54c214e673c474400c36a934f946a8
-Source115: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.ru.langpack.xpi
-# Source115-md5: c24ff5c5bafbfce18b0333ef31735f54
-Source116: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.sk.langpack.xpi
-# Source116-md5: 5ab1d6ebf6cee6dc822fc91e1ced4443
-Source117: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.sv-SE.langpack.xpi
-# Source117-md5: e471259f0afcdb159ce5f0a8f24cfd5b
-Source118: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.zh-CN.langpack.xpi
-# Source118-md5: 7160e0ea724c68c6457bb5a76b996255
-Source119: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpacks/linux-i686/seamonkey-%{version}.zh-TW.langpack.xpi
-# Source119-md5: 5370bfa849ea4af22e6ef8d1500279c8
-Patch1: %{name}-pld-branding.patch
-Patch2: %{name}-agent.patch
+Source100: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.cs.langpack.xpi
+# Source100-md5: fbd24a894e5f38c856c96e56ffcc385d
+Source101: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.de.langpack.xpi
+# Source101-md5: f6b49b75f5243e36c4a98bf7146d6b1a
+Source102: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.en-GB.langpack.xpi
+# Source102-md5: 4dcbd1cd568e299f18fa2bc95cf6152c
+Source103: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.en-US.langpack.xpi
+# Source103-md5: f2a4f7ac0fbf7a06c9021c357c5af503
+Source104: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.es-AR.langpack.xpi
+# Source104-md5: 28f2ab4ba66a0020e24d6e411c1d3b3b
+Source105: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.es-ES.langpack.xpi
+# Source105-md5: 83511c772e41de9c3d906bc92f47f072
+Source106: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.fi.langpack.xpi
+# Source106-md5: 1767f0472e71c00e6e4c8e160dc4fbcc
+Source107: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.fr.langpack.xpi
+# Source107-md5: b6e096d2149393a4d293ddeca6a25bee
+Source108: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.hu.langpack.xpi
+# Source108-md5: e5aecc27125a241eae56daf130e6faf3
+Source109: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.it.langpack.xpi
+# Source109-md5: 2619029fe3b09dff08a91da686607bd5
+Source110: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.ja.langpack.xpi
+# Source110-md5: 2f7dc3fb8c36f27530f852cd2af1debe
+Source111: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.ka.langpack.xpi
+# Source111-md5: d6217e7033b8706a1d264d8afed2f191
+Source112: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.nb-NO.langpack.xpi
+# Source112-md5: e1e358c42db67f02e789f5e147a6ea9c
+Source113: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.nl.langpack.xpi
+# Source113-md5: abaa8c33c5051a8e3fe3826e1076c161
+Source114: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.pl.langpack.xpi
+# Source114-md5: 8b0803dce15fcb73f4f196800df8af7b
+Source115: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.pt-BR.langpack.xpi
+# Source115-md5: fbe78878c25d68204b17e46ac865ebca
+Source116: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.pt-PT.langpack.xpi
+# Source116-md5: 70e3c8c4b232b51ee8e290aa914f7fc6
+Source117: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.ru.langpack.xpi
+# Source117-md5: 88b0109f28bd7b46d6dbd8687d1a855e
+Source118: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.sk.langpack.xpi
+# Source118-md5: 5ecc927c3bb08686ad268bab206e9d4f
+Source119: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.sv-SE.langpack.xpi
+# Source119-md5: 59f51d736df33d9d729d7b5ba961b911
+Source120: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.zh-CN.langpack.xpi
+# Source120-md5: c12a3ec7a48811f81fbbc02ab6a00ce0
+Source121: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.zh-TW.langpack.xpi
+# Source121-md5: 36642e52ba7bd0562b5498d4760bfbec
+Patch0: %{name}-sysctl.patch
+Patch1: %{name}-mozilla-revert-1332139.patch
+Patch2: %{name}-pld-branding.patch
Patch3: %{name}-enable-addons.patch
# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
Patch4: %{name}-system-virtualenv.patch
Patch5: %{name}-icu-detect.patch
-Patch6: %{name}-glibc2.30.patch
-Patch7: %{name}-crmf.patch
-Patch8: mozilla-1389436.patch
URL: https://www.seamonkey-project.org/
BuildRequires: GConf2-devel >= 1.2.1
BuildRequires: OpenGL-devel
@@ -100,8 +106,8 @@ BuildRequires: dbus-glib-devel >= 0.60
BuildRequires: fontconfig-devel >= 1:2.7.0
BuildRequires: freetype-devel >= 1:2.1.8
BuildRequires: glib2-devel >= 1:2.22
-%{!?with_gtk3:BuildRequires: gtk+2-devel >= 2:2.18}
-%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.4.0}
+BuildRequires: gtk+2-devel >= 2:2.18
+BuildRequires: gtk+3-devel >= 3.4.0
%{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1}
BuildRequires: hunspell-devel
# DECnet (dnprogs.spec), not dummy net (libdnet.spec)
@@ -155,8 +161,8 @@ Requires: browser-plugins >= 2.0
Requires: cairo >= 1.10.2-5
Requires: dbus-glib >= 0.60
Requires: glib2 >= 1:2.22
-%{!?with_gtk3:Requires: gtk+2 >= 2:2.18}
-%{?with_gtk3:Requires: gtk+3 >= 3.4.0}
+Requires: gtk+2 >= 2:2.18
+Requires: gtk+3 >= 3.4.0
Requires: libjpeg-turbo
Requires: libpng >= 2:1.6.21
Requires: libpng(APNG) >= 0.10
@@ -182,6 +188,7 @@ Obsoletes: seamonkey-chat < 2.46
Obsoletes: seamonkey-calendar
Obsoletes: seamonkey-dom-inspector < 2.46
Obsoletes: seamonkey-js-debugger
+Obsoletes: seamonkey-lang-lt < 2.53
Obsoletes: seamonkey-libs
Obsoletes: seamonkey-mailnews
Obsoletes: seamonkey-gnomevfs
@@ -371,6 +378,20 @@ Recursos españoles (España) para SeaMonkey.
%description lang-es -l pl.UTF-8
Hiszpańskie pliki językowe dla SeaMonkeya (wersja dla Hiszpanii).
+%package lang-fi
+Summary: Finnish resources for SeaMonkey
+Summary(pl.UTF-8): Fińskie pliki językowe dla SeaMonkeya
+Group: I18n
+Requires: seamonkey >= %{version}
+Provides: seamonkey-lang-resources = %{version}
+BuildArch: noarch
+
+%description lang-fi
+Finnish resources for SeaMonkey.
+
+%description lang-fi -l pl.UTF-8
+Fińskie pliki językowe dla SeaMonkeya.
+
%package lang-fr
Summary: French resources for SeaMonkey
Summary(pl.UTF-8): Francuskie pliki językowe dla SeaMonkeya
@@ -431,6 +452,20 @@ Japanese resources for SeaMonkey.
%description lang-ja -l pl.UTF-8
Japońskie pliki językowe dla SeaMonkeya.
+%package lang-ka
+Summary: Georgian resources for SeaMonkey
+Summary(pl.UTF-8): Gruzińskie pliki językowe dla SeaMonkeya
+Group: I18n
+Requires: seamonkey >= %{version}
+Provides: seamonkey-lang-resources = %{version}
+BuildArch: noarch
+
+%description lang-ka
+Georgian resources for SeaMonkey.
+
+%description lang-ka -l pl.UTF-8
+Gruzińskie pliki językowe dla SeaMonkeya.
+
%package lang-lt
Summary: Lithuanian resources for SeaMonkey
Summary(pl.UTF-8): Litewskie pliki językowe dla SeaMonkeya
@@ -487,6 +522,20 @@ Polish resources for SeaMonkey.
%description lang-pl -l pl.UTF-8
Polskie pliki językowe dla SeaMonkeya.
+%package lang-pt_BR
+Summary: Portuguese (Brazilian) resources for SeaMonkey
+Summary(pl.UTF-8): Portugalskie pliki językowe dla SeaMonkeya (wersja dla Brazylii)
+Group: I18n
+Requires: seamonkey >= %{version}
+Provides: seamonkey-lang-resources = %{version}
+BuildArch: noarch
+
+%description lang-pt_BR
+Portuguese (Brazilian) resources for SeaMonkey.
+
+%description lang-pt_BR -l pl.UTF-8
+Portugalskie pliki językowe dla SeaMonkeya (wersja dla Brazylii).
+
%package lang-pt
Summary: Portuguese (Portugal) resources for SeaMonkey
Summary(pl.UTF-8): Portugalskie pliki językowe dla SeaMonkeya (wersja dla Portugalii)
@@ -577,26 +626,40 @@ unpack() {
cp -p $file .
}
%define __unzip unpack
-%setup -q %(seq -f '-a %g' 100 119 | xargs)
+%setup -q %(seq -f '-a %g' 100 121 | xargs)
+cd mozilla
+%patch0 -p1
%patch1 -p1
+cd ..
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%build
cat << EOF > .mozconfig
mk_add_options MOZ_OBJDIR=%{objdir}
+export CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64"
+export CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64"
+
+%if %{with lowmem}
+export CFLAGS="$CFLAGS -g0"
+export CXXFLAGS="$CXXFLAGS -g0"
+export MOZ_DEBUG_FLAGS=" "
+export LLVM_USE_SPLIT_DWARF=1
+export LLVM_PARALLEL_LINK_JOBS=1
+export MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+export RUSTFLAGS="-Cdebuginfo=0"
+%endif
+
%if %{with crashreporter}
export MOZ_DEBUG_SYMBOLS=1
%endif
# Options for 'configure' (same as command-line options).
ac_add_options --prefix=%{_prefix}
+ac_add_options --libdir=%{_libdir}
%if %{?debug:1}0
ac_add_options --disable-optimize
ac_add_options --enable-crash-on-assert
@@ -605,9 +668,9 @@ ac_add_options --enable-debug-modules
ac_add_options --enable-debugger-info-modules
%else
ac_add_options --disable-debug
-ac_add_options --enable-optimize="%{rpmcflags} -Os"
%endif
ac_add_options --disable-strip
+ac_add_options --disable-install-strip
%if %{with tests}
ac_add_options --enable-tests
%else
@@ -619,7 +682,6 @@ ac_add_options --enable-crashreporter
ac_add_options --disable-crashreporter
%endif
ac_add_options --disable-elf-hack
-ac_add_options --disable-gnomeui
ac_add_options --disable-necko-wifi
ac_add_options --disable-updater
ac_add_options --enable-application=suite
@@ -627,22 +689,21 @@ ac_add_options --enable-application=suite
ac_add_options --enable-calendar
%endif
ac_add_options --enable-chrome-format=omni
-ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2}
+ac_add_options --enable-default-toolkit=cairo-gtk3
+ac_add_options --enable-dominspector
ac_add_options --enable-extensions=default
-ac_add_options --enable-gio
+ac_add_options --enable-irc
%if %{with ldap}
ac_add_options --enable-ldap
%else
ac_add_options --disable-ldap
%endif
-ac_add_options --enable-safe-browsing
# breaks build
#ac_add_options --enable-shared-js
ac_add_options --enable-startup-notification
ac_add_options --enable-system-cairo
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
-ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
ac_add_options --with-distribution-id=org.pld-linux
ac_add_options --with-pthreads
ac_add_options --with-system-bz2
@@ -653,7 +714,9 @@ ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
+ac_add_options --with-system-pixman
ac_add_options --with-system-png
+ac_add_options --with-system-sqlite
ac_add_options --with-system-zlib
EOF
@@ -664,7 +727,7 @@ EOF
installdir=%{_libdir}/%{name} \
XLIBS="-lX11 -lXt" \
CC="%{__cc}" \
- CXX="%{__cxx} -std=gnu++11"
+ CXX="%{__cxx}"
%if %{with crashreporter}
# create debuginfo for crash-stats.mozilla.com
@@ -705,12 +768,10 @@ cp -a dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD
%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/fonts $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
ln -s ../../share/%{name}/fonts $RPM_BUILD_ROOT%{_libdir}/%{name}/fonts
-ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
@@ -729,32 +790,15 @@ chmod a+rx $RPM_BUILD_ROOT%{_bindir}/seamonkey
install %{SOURCE4} %{SOURCE5} %{SOURCE7} \
$RPM_BUILD_ROOT%{_desktopdir}
-for d in 32 48 64 ; do
+for d in 16 32 48 64 128 ; do
install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${d}x${d}/apps
-cp -p %{topdir}/suite/branding/nightly/content/icon${d}.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${d}x${d}/apps/%{name}.png
+if [ $d -eq 32 ]; then
+cp -p %{topdir}/suite/branding/seamonkey/default.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${d}x${d}/apps/%{name}.png
+else
+cp -p %{topdir}/suite/branding/seamonkey/default${d}.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${d}x${d}/apps/%{name}.png
+fi
done
-# files created by seamonkey -register
-touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
-touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
-
-cat << 'EOF' > $RPM_BUILD_ROOT%{_libdir}/%{name}/register
-#!/bin/sh
-umask 022
-rm -f %{_libdir}/%{name}/components/{compreg,xpti}.dat
-
-# it attempts to touch files in $HOME/.mozilla
-# beware if you run this with sudo!!!
-export HOME=$(mktemp -d)
-# also TMPDIR could be pointing to sudo user's homedir
-unset TMPDIR TMP || :
-
-%{_libdir}/%{name}/seamonkey -register
-
-rm -rf $HOME
-EOF
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/register
-
# don't package, rely on system mozldap libraries
%{__sed} -i '/lib\(ldap\|ldif\|prldap\)60.so/d' $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap}60.so
@@ -770,7 +814,6 @@ done
rm -rf $RPM_BUILD_ROOT
%post
-%{_libdir}/%{name}/register || :
%update_browser_plugins
%update_icon_cache hicolor
%update_desktop_database
@@ -803,7 +846,6 @@ fi
%{_libdir}/%{name}/blocklist.xml
%{_libdir}/%{name}/omni.ja
-%attr(755,root,root) %{_libdir}/%{name}/register
%if %{with crashreporter}
%{_libdir}/%{name}/crashreporter
@@ -816,10 +858,6 @@ fi
%{_libdir}/%{name}/application.ini
%{_libdir}/%{name}/chrome.manifest
-%dir %{_libdir}/%{name}/components
-%{_libdir}/%{name}/components/components.manifest
-%attr(755,root,root) %{_libdir}/%{name}/components/libsuite.so
-
%{_libdir}/%{name}/dependentlibs.list
%{_libdir}/%{name}/platform.ini
%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
@@ -834,13 +872,11 @@ fi
%{_libdir}/%{name}/defaults
%{_libdir}/%{name}/fonts
%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/searchplugins
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/chrome
%{_datadir}/%{name}/defaults
%{_datadir}/%{name}/fonts
-%{_datadir}/%{name}/searchplugins
%dir %{_libdir}/%{name}/distribution
%dir %{_libdir}/%{name}/distribution/extensions
@@ -851,10 +887,6 @@ fi
%{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
%{_libdir}/%{name}/extensions/modern at themes.mozilla.org.xpi
-# files created by seamonkey -register
-%ghost %{_libdir}/%{name}/components/compreg.dat
-%ghost %{_libdir}/%{name}/components/xpti.dat
-
%{_libdir}/%{name}/isp
%dir %{_datadir}/%{name}/isp
%{_datadir}/%{name}/isp/Bogofilter.sfd
@@ -873,7 +905,7 @@ fi
%if %{with lightning}
%files addon-lightning
%defattr(644,root,root,755)
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
+%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
%endif
%files chat
@@ -908,6 +940,10 @@ fi
%defattr(644,root,root,755)
%{_datadir}/%{name}/extensions/langpack-es-ES at seamonkey.mozilla.org.xpi
+%files lang-fi
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-fi at seamonkey.mozilla.org.xpi
+
%files lang-fr
%defattr(644,root,root,755)
%{_datadir}/%{name}/extensions/langpack-fr at seamonkey.mozilla.org.xpi
@@ -924,9 +960,13 @@ fi
%defattr(644,root,root,755)
%{_datadir}/%{name}/extensions/langpack-ja at seamonkey.mozilla.org.xpi
-%files lang-lt
+%files lang-ka
%defattr(644,root,root,755)
-%{_datadir}/%{name}/extensions/langpack-lt at seamonkey.mozilla.org.xpi
+%{_datadir}/%{name}/extensions/langpack-ka at seamonkey.mozilla.org.xpi
+
+#%files lang-lt
+#%defattr(644,root,root,755)
+#%{_datadir}/%{name}/extensions/langpack-lt at seamonkey.mozilla.org.xpi
%files lang-nb
%defattr(644,root,root,755)
@@ -940,6 +980,10 @@ fi
%defattr(644,root,root,755)
%{_datadir}/%{name}/extensions/langpack-pl at seamonkey.mozilla.org.xpi
+%files lang-pt_BR
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-pt-BR at seamonkey.mozilla.org.xpi
+
%files lang-pt
%defattr(644,root,root,755)
%{_datadir}/%{name}/extensions/langpack-pt-PT at seamonkey.mozilla.org.xpi
diff --git a/mozilla-1389436.patch b/mozilla-1389436.patch
deleted file mode 100644
index af4f7cf..0000000
--- a/mozilla-1389436.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla at glandium.org>
-# Date 1502455819 -32400
-# Node ID 97dae871389b7f22a7096a020781b07a5a61de58
-# Parent c73f64ef71d2d87f36008f5ff661f4050692bd06
-Bug 1389436 - Explicitly instantiate gfxFont::GetShapedWord<uint8_t> for its use in gfxTextRun.cpp. r=jfkthame
-
-diff --git a/mozilla/gfx/thebes/gfxFont.cpp b/mozilla/gfx/thebes/gfxFont.cpp
-index d0b747f..8d3dd8b 100644
---- a/mozilla/gfx/thebes/gfxFont.cpp
-+++ b/mozilla/gfx/thebes/gfxFont.cpp
-@@ -2614,6 +2614,18 @@ gfxFont::GetShapedWord(DrawTarget *aDrawTarget,
- return sw;
- }
-
-+template gfxShapedWord*
-+gfxFont::GetShapedWord(DrawTarget *aDrawTarget,
-+ const uint8_t *aText,
-+ uint32_t aLength,
-+ uint32_t aHash,
-+ Script aRunScript,
-+ bool aVertical,
-+ int32_t aAppUnitsPerDevUnit,
-+ uint32_t aFlags,
-+ gfxTextPerfMetrics *aTextPerf);
-+
-+
- bool
- gfxFont::CacheHashEntry::KeyEquals(const KeyTypePointer aKey) const
- {
diff --git a/seamonkey-agent.patch b/seamonkey-agent.patch
deleted file mode 100644
index 9b510f7..0000000
--- a/seamonkey-agent.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mozilla/suite/browser/browser-prefs.js.orig 2007-03-21 23:39:25.000000000 +0100
-+++ mozilla/suite/browser/browser-prefs.js 2007-03-21 23:39:10.000000000 +0100
-@@ -61,6 +61,10 @@
- pref("general.useragent.override.natweststockbrokers.com", "Gecko/[^ ]*#Gecko/20100101"); // bug 804179
- pref("general.useragent.override.raiffeisen.hu", "Gecko/[^ ]*#Gecko/20100101"); // bug 795348
-
-+pref("general.useragent.vendor", "PLD");
-+pref("general.useragent.vendorSub", "3.0");
-+pref("general.useragent.vendorComment", "Th");
-+
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- pref("browser.startup.page", 1);
- pref("browser.startup.homepage", "chrome://navigator-region/locale/region.properties");
diff --git a/seamonkey-crmf.patch b/seamonkey-crmf.patch
deleted file mode 100644
index d147309..0000000
--- a/seamonkey-crmf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- seamonkey-2.49.5/mozilla/security/manager/ssl/moz.build.orig 2019-05-06 19:30:52.000000000 +0200
-+++ seamonkey-2.49.5/mozilla/security/manager/ssl/moz.build 2019-11-18 20:33:18.008087191 +0100
-@@ -184,10 +184,6 @@
-
- DEFINES['CERT_AddTempCertToPerm'] = '__CERT_AddTempCertToPerm'
-
--USE_LIBS += [
-- 'crmf',
--]
--
- include('/ipc/chromium/chromium-config.mozbuild')
-
- if CONFIG['GNU_CXX']:
diff --git a/seamonkey-enable-addons.patch b/seamonkey-enable-addons.patch
index 58db926..315b86e 100644
--- a/seamonkey-enable-addons.patch
+++ b/seamonkey-enable-addons.patch
@@ -9,25 +9,14 @@
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
---- seamonkey-2.26/suite/browser/browser-prefs.js~ 2013-11-06 19:54:38.789734061 +0100
-+++ seamonkey-2.26/suite/browser/browser-prefs.js 2013-11-06 20:55:33.765611935 +0100
-@@ -616,7 +616,7 @@
+--- seamonkey-2.53.4/suite/app/profile/suite-prefs.js.orig 2020-08-10 13:28:35.000000000 +0200
++++ seamonkey-2.53.4/suite/app/profile/suite-prefs.js 2020-10-09 07:09:53.453582063 +0200
+@@ -581,7 +581,7 @@
// Disable add-ons installed into the shared user and shared system areas by
// default. This does not include the application directory. See the SCOPE
- // constants in AddonManager.jsm for values to use here.
--pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 3);
-
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations
---- seamonkey-2.26/mozilla/browser/app/profile/firefox.js~ 2013-10-29 02:20:40.000000000 +0100
-+++ seamonkey-2.26/mozilla/browser/app/profile/firefox.js 2013-11-06 20:56:58.633092070 +0100
-@@ -62,7 +62,7 @@
-
- // Disable add-ons that are not installed by the user in all scopes by default.
- // See the SCOPE constants in AddonManager.jsm for values to use here.
+ // constants in AddonManager.jsm for values to use here
-pref("extensions.autoDisableScopes", 15);
+pref("extensions.autoDisableScopes", 3);
- // Dictionary download preference
- pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
+ // Enable add-ons installed and owned by the application, like the default theme.
+ pref("extensions.startupScanScopes", 4);
diff --git a/seamonkey-glibc2.30.patch b/seamonkey-glibc2.30.patch
deleted file mode 100644
index 205cb34..0000000
--- a/seamonkey-glibc2.30.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- seamonkey-2.49.4/mozilla/tools/profiler/core/platform.h~ 2018-07-12 04:19:15.000000000 +0200
-+++ seamonkey-2.49.4/mozilla/tools/profiler/core/platform.h 2019-10-10 14:38:34.367540687 +0200
-@@ -65,12 +65,14 @@
- #include <unistd.h>
- #if !defined(__BIONIC__)
- #include <sys/syscall.h>
-+#if defined(__GLIBC__) && ! __GLIBC_PREREQ(2, 30)
- static inline pid_t gettid()
- {
- return (pid_t) syscall(SYS_gettid);
- }
- #endif
- #endif
-+#endif
-
- #ifdef XP_WIN
- #include <windows.h>
diff --git a/seamonkey-mozilla-revert-1332139.patch b/seamonkey-mozilla-revert-1332139.patch
new file mode 100644
index 0000000..f4ec86b
--- /dev/null
+++ b/seamonkey-mozilla-revert-1332139.patch
@@ -0,0 +1,307 @@
+diff -Nrup -U 8 a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
+--- a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc 2020-02-18 02:37:58.000000000 +0300
++++ b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc 2020-03-02 00:34:19.000000000 +0300
+@@ -79,17 +79,19 @@ VP9EncoderImpl::VP9EncoderImpl()
+ num_temporal_layers_(0),
+ num_spatial_layers_(0),
+ num_cores_(0),
+ is_flexible_mode_(false),
+ frames_encoded_(0),
+ // Use two spatial when screensharing with flexible mode.
+ spatial_layer_(new ScreenshareLayersVP9(2)) {
+ memset(&codec_, 0, sizeof(codec_));
++#ifdef LIBVPX_SVC
+ memset(&svc_params_, 0, sizeof(vpx_svc_extra_cfg_t));
++#endif
+ uint32_t seed = rtc::Time32();
+ srand(seed);
+ }
+
+ VP9EncoderImpl::~VP9EncoderImpl() {
+ Release();
+ }
+
+@@ -115,55 +117,66 @@ int VP9EncoderImpl::Release() {
+ }
+ inited_ = false;
+ return WEBRTC_VIDEO_CODEC_OK;
+ }
+
+ bool VP9EncoderImpl::ExplicitlyConfiguredSpatialLayers() const {
+ // We check target_bitrate_bps of the 0th layer to see if the spatial layers
+ // (i.e. bitrates) were explicitly configured.
++#ifdef LIBVPX_SVC
+ return num_spatial_layers_ > 1 &&
+ codec_.spatialLayers[0].target_bitrate_bps > 0;
++#else
++ return false;
++#endif
+ }
+
+ bool VP9EncoderImpl::SetSvcRates() {
+ uint8_t i = 0;
+
+ if (ExplicitlyConfiguredSpatialLayers()) {
++#ifdef LIBVPX_SVC
+ if (num_temporal_layers_ > 1) {
+ LOG(LS_ERROR) << "Multiple temporal layers when manually specifying "
+ "spatial layers not implemented yet!";
+ return false;
+ }
+ int total_bitrate_bps = 0;
+ for (i = 0; i < num_spatial_layers_; ++i)
+ total_bitrate_bps += codec_.spatialLayers[i].target_bitrate_bps;
+ // If total bitrate differs now from what has been specified at the
+ // beginning, update the bitrates in the same ratio as before.
+ for (i = 0; i < num_spatial_layers_; ++i) {
+ config_->ss_target_bitrate[i] = config_->layer_target_bitrate[i] =
+ static_cast<int>(static_cast<int64_t>(config_->rc_target_bitrate) *
+ codec_.spatialLayers[i].target_bitrate_bps /
+ total_bitrate_bps);
+ }
++#endif
+ } else {
+ float rate_ratio[VPX_MAX_LAYERS] = {0};
+ float total = 0;
+
++#ifdef LIBVPX_SVC
+ for (i = 0; i < num_spatial_layers_; ++i) {
+ if (svc_params_.scaling_factor_num[i] <= 0 ||
+ svc_params_.scaling_factor_den[i] <= 0) {
+ LOG(LS_ERROR) << "Scaling factors not specified!";
+ return false;
+ }
+ rate_ratio[i] =
+ static_cast<float>(svc_params_.scaling_factor_num[i]) /
+ svc_params_.scaling_factor_den[i];
+ total += rate_ratio[i];
+ }
++#else
++ rate_ratio[0] = 1;
++ total = 1;
++#endif
+
+ for (i = 0; i < num_spatial_layers_; ++i) {
+ config_->ss_target_bitrate[i] = static_cast<unsigned int>(
+ config_->rc_target_bitrate * rate_ratio[i] / total);
+ if (num_temporal_layers_ == 1) {
+ config_->layer_target_bitrate[i] = config_->ss_target_bitrate[i];
+ } else if (num_temporal_layers_ == 2) {
+ config_->layer_target_bitrate[i * num_temporal_layers_] =
+@@ -390,16 +403,17 @@ int VP9EncoderImpl::NumberOfThreads(int
+ return 2;
+ } else {
+ // 1 thread less than VGA.
+ return 1;
+ }
+ }
+
+ int VP9EncoderImpl::InitAndSetControlSettings(const VideoCodec* inst) {
++#ifdef LIBVPX_SVC
+ // Set QP-min/max per spatial and temporal layer.
+ int tot_num_layers = num_spatial_layers_ * num_temporal_layers_;
+ for (int i = 0; i < tot_num_layers; ++i) {
+ svc_params_.max_quantizers[i] = config_->rc_max_quantizer;
+ svc_params_.min_quantizers[i] = config_->rc_min_quantizer;
+ }
+ config_->ss_number_layers = num_spatial_layers_;
+ if (ExplicitlyConfiguredSpatialLayers()) {
+@@ -413,37 +427,41 @@ int VP9EncoderImpl::InitAndSetControlSet
+ for (int i = num_spatial_layers_ - 1; i >= 0; --i) {
+ // 1:2 scaling in each dimension.
+ svc_params_.scaling_factor_num[i] = scaling_factor_num;
+ svc_params_.scaling_factor_den[i] = 256;
+ if (codec_.mode != kScreensharing)
+ scaling_factor_num /= 2;
+ }
+ }
++#endif
+
+ if (!SetSvcRates()) {
+ return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
+ }
+
+ if (vpx_codec_enc_init(encoder_, vpx_codec_vp9_cx(), config_, 0)) {
+ return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
+ }
+ vpx_codec_control(encoder_, VP8E_SET_CPUUSED, cpu_speed_);
+ vpx_codec_control(encoder_, VP8E_SET_MAX_INTRA_BITRATE_PCT,
+ rc_max_intra_target_);
+ vpx_codec_control(encoder_, VP9E_SET_AQ_MODE,
+ inst->VP9().adaptiveQpMode ? 3 : 0);
+
++#ifdef LIBVPX_SVC
+ vpx_codec_control(
+ encoder_, VP9E_SET_SVC,
+ (num_temporal_layers_ > 1 || num_spatial_layers_ > 1) ? 1 : 0);
+ if (num_temporal_layers_ > 1 || num_spatial_layers_ > 1) {
+ vpx_codec_control(encoder_, VP9E_SET_SVC_PARAMETERS,
+ &svc_params_);
+ }
++#endif
++
+ // Register callback for getting each spatial layer.
+ vpx_codec_priv_output_cx_pkt_cb_pair_t cbp = {
+ VP9EncoderImpl::EncoderOutputCodedPacketCallback,
+ reinterpret_cast<void*>(this)};
+ vpx_codec_control(encoder_, VP9E_REGISTER_CX_CALLBACK,
+ reinterpret_cast<void*>(&cbp));
+
+ // Control function to set the number of column tiles in encoding a frame, in
+@@ -527,16 +545,17 @@ int VP9EncoderImpl::Encode(const VideoFr
+
+ vpx_enc_frame_flags_t flags = 0;
+ bool send_keyframe = (frame_type == kVideoFrameKey);
+ if (send_keyframe) {
+ // Key frame request from caller.
+ flags = VPX_EFLAG_FORCE_KF;
+ }
+
++#ifdef LIBVPX_SVC
+ if (is_flexible_mode_) {
+ SuperFrameRefSettings settings;
+
+ // These structs are copied when calling vpx_codec_control,
+ // therefore it is ok for them to go out of scope.
+ vpx_svc_ref_frame_config enc_layer_conf;
+ vpx_svc_layer_id layer_id;
+
+@@ -548,16 +567,17 @@ int VP9EncoderImpl::Encode(const VideoFr
+ send_keyframe);
+ }
+ enc_layer_conf = GenerateRefsAndFlags(settings);
+ layer_id.temporal_layer_id = 0;
+ layer_id.spatial_layer_id = settings.start_layer;
+ vpx_codec_control(encoder_, VP9E_SET_SVC_LAYER_ID, &layer_id);
+ vpx_codec_control(encoder_, VP9E_SET_SVC_REF_FRAME_CONFIG, &enc_layer_conf);
+ }
++#endif
+
+ assert(codec_.maxFramerate > 0);
+ uint32_t duration = 90000 / codec_.maxFramerate;
+ if (vpx_codec_encode(encoder_, raw_, timestamp_, duration, flags,
+ VPX_DL_REALTIME)) {
+ return WEBRTC_VIDEO_CODEC_ERROR;
+ }
+ timestamp_ += duration;
+@@ -686,29 +706,31 @@ void VP9EncoderImpl::PopulateCodecSpecif
+ vp9_info->p_diff[i] = p_diff_[layer_id.spatial_layer_id][i];
+ }
+ } else {
+ vp9_info->gof_idx =
+ static_cast<uint8_t>(frames_since_kf_ % gof_.num_frames_in_gof);
+ vp9_info->temporal_up_switch = gof_.temporal_up_switch[vp9_info->gof_idx];
+ }
+
++#ifdef LIBVPX_SVC
+ if (vp9_info->ss_data_available) {
+ vp9_info->spatial_layer_resolution_present = true;
+ for (size_t i = 0; i < vp9_info->num_spatial_layers; ++i) {
+ vp9_info->width[i] = codec_.width *
+ svc_params_.scaling_factor_num[i] /
+ svc_params_.scaling_factor_den[i];
+ vp9_info->height[i] = codec_.height *
+ svc_params_.scaling_factor_num[i] /
+ svc_params_.scaling_factor_den[i];
+ }
+- if (!vp9_info->flexible_mode) {
+- vp9_info->gof.CopyGofInfoVP9(gof_);
+- }
++ }
++#endif
++ if (!vp9_info->flexible_mode) {
++ vp9_info->gof.CopyGofInfoVP9(gof_);
+ }
+ }
+
+ int VP9EncoderImpl::GetEncodedLayerFrame(const vpx_codec_cx_pkt* pkt) {
+ RTC_DCHECK_EQ(pkt->kind, VPX_CODEC_CX_FRAME_PKT);
+
+ if (pkt->data.frame.sz > encoded_image_._size) {
+ delete[] encoded_image_._buffer;
+@@ -756,16 +778,17 @@ int VP9EncoderImpl::GetEncodedLayerFrame
+ vpx_codec_control(encoder_, VP8E_GET_LAST_QUANTIZER, &qp);
+ encoded_image_.qp_ = qp;
+ encoded_complete_callback_->OnEncodedImage(encoded_image_, &codec_specific,
+ &frag_info);
+ }
+ return WEBRTC_VIDEO_CODEC_OK;
+ }
+
++#ifdef LIBVPX_SVC
+ vpx_svc_ref_frame_config VP9EncoderImpl::GenerateRefsAndFlags(
+ const SuperFrameRefSettings& settings) {
+ static const vpx_enc_frame_flags_t kAllFlags =
+ VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_LAST |
+ VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_GF;
+ vpx_svc_ref_frame_config sf_conf = {};
+ if (settings.is_keyframe) {
+ // Used later on to make sure we don't make any invalid references.
+@@ -857,16 +880,17 @@ vpx_svc_ref_frame_config VP9EncoderImpl:
+ buffer_updated_at_frame_[updated_buffer] = frames_encoded_;
+ sf_conf.frame_flags[layer_idx] = layer_flags;
+ }
+ }
+ }
+ ++frames_encoded_;
+ return sf_conf;
+ }
++#endif
+
+ int VP9EncoderImpl::SetChannelParameters(uint32_t packet_loss, int64_t rtt) {
+ return WEBRTC_VIDEO_CODEC_OK;
+ }
+
+ int VP9EncoderImpl::RegisterEncodeCompleteCallback(
+ EncodedImageCallback* callback) {
+ encoded_complete_callback_ = callback;
+diff -Nrup -U 8 a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h
+--- a/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h 2020-02-18 02:37:58.000000000 +0300
++++ b/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h 2020-03-02 00:32:05.000000000 +0300
+@@ -77,24 +77,26 @@ class VP9EncoderImpl : public VP9Encoder
+
+ void PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
+ const vpx_codec_cx_pkt& pkt,
+ uint32_t timestamp);
+
+ bool ExplicitlyConfiguredSpatialLayers() const;
+ bool SetSvcRates();
+
++#ifdef LIBVPX_SVC
+ // Used for flexible mode to set the flags and buffer references used
+ // by the encoder. Also calculates the references used by the RTP
+ // packetizer.
+ //
+ // Has to be called for every frame (keyframes included) to update the
+ // state used to calculate references.
+ vpx_svc_ref_frame_config GenerateRefsAndFlags(
+ const SuperFrameRefSettings& settings);
++#endif
+
+ virtual int GetEncodedLayerFrame(const vpx_codec_cx_pkt* pkt);
+
+ // Callback function for outputting packets per spatial layer.
+ static void EncoderOutputCodedPacketCallback(vpx_codec_cx_pkt* pkt,
+ void* user_data);
+
+ // Determine maximum target for Intra frames
+@@ -111,17 +113,19 @@ class VP9EncoderImpl : public VP9Encoder
+ bool inited_;
+ int64_t timestamp_;
+ uint16_t picture_id_;
+ int cpu_speed_;
+ uint32_t rc_max_intra_target_;
+ vpx_codec_ctx_t* encoder_;
+ vpx_codec_enc_cfg_t* config_;
+ vpx_image_t* raw_;
++#ifdef LIBVPX_SVC
+ vpx_svc_extra_cfg_t svc_params_;
++#endif
+ const VideoFrame* input_image_;
+ GofInfoVP9 gof_; // Contains each frame's temporal information for
+ // non-flexible mode.
+ uint8_t tl0_pic_idx_; // Only used in non-flexible mode.
+ size_t frames_since_kf_;
+ uint8_t num_temporal_layers_;
+ uint8_t num_spatial_layers_;
+ uint8_t num_cores_;
diff --git a/seamonkey-pld-branding.patch b/seamonkey-pld-branding.patch
index 923cf6c..c93dffe 100644
--- a/seamonkey-pld-branding.patch
+++ b/seamonkey-pld-branding.patch
@@ -1,9 +1,9 @@
---- seamonkey-2.49.4/mozilla/browser/locales/generic/profile/bookmarks.html.in.orig 2019-04-21 08:06:13.737919258 +0200
-+++ seamonkey-2.49.4/mozilla/browser/locales/generic/profile/bookmarks.html.in 2019-04-21 08:11:52.179419096 +0200
+--- seamonkey-2.53.4/mozilla/browser/locales/generic/profile/bookmarks.html.in.orig 2020-02-18 00:37:47.000000000 +0100
++++ seamonkey-2.53.4/mozilla/browser/locales/generic/profile/bookmarks.html.in 2020-10-08 21:07:26.482740347 +0200
@@ -16,6 +16,8 @@
#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAACYklEQVQ4y3WSTYjNYRTGf+f9/+/NuDN3GKMxt1mYpKR8RT6zEk1iyUo2IysSNspCxEIZRSN07YiUJSWkaUIZizELMzIZlO9h3MzXvf/341jcmTGa69RZvKfnPOc5z3mhQlRd651Ry17tqQQl5uR9ONHC3EtdiPPxWKZ24bhJvQV0OlBHhiV7pTs3WpUdEmeLrnWJAhhOtJA5/3RjqZg8Lrnwy4bQT/DvTb73Qt3N9ymATNvTU15Mvx8vfvTWDrmgT0y+dzuAZM527lM0Xx6jFKvnEKIYvIIqVeMFRCfEiDBWMw9UQUBUT8fBWvmrU9HEUpUWDq2cT23a0P6kQEqEwTFLQCBJpm9mYrV+6lW0ngNr62jb0kw6KvMeXJohZYSLzz9xvOMDJG6aPUKMtZPDObq+iXPbmoG/ooJC0QVaVy2g5AI3Bkq8/jYCkQEBo9ah1hESS1N1Gu9DxXNFRji0oYm+/Stoaa4tK0kcRq1HE4fxHqOKEf4bk16ubphd9iKxGKxFrcOWLB1vvuOCzmg0Irig1MxKMfBznPbOd2DLCmJNHKgSIdzr/kjXhwKbFtVPNQ+NJiw7+YDh0YTFuVr6CwLpaNJDjCYOtR61DldyHL7975c9dqeH4ZESscC7r79BFBI7kY5YrZsCC8qL/kFyR+6yY0UjS3M1PHz5ich71IOIQGSn0cskwdTeryTyfV9+jGzOP3rTQAiIHUNQEBkCeUbkcqguB2JEMGqt4sJlg8lGIsv0+p5dON8YaVgn3veJ85/F61YNtn5uXf3OCF0TQVacP0PiXMVzpfbemlnbna+I/QPSFTsRLd+hHAAAAABJRU5ErkJggg==
- #define addon_icon data:image/vndmicrosofticon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKoSURBVDiNjZNLaJRnFIaf75vvy2UGTWr8NYkxl0IFUYkNXSSZQNWFWlxIEVy1FLLo0i4adddVXRnS4kJwYxci2GaRTWlSFGKFGRXNmFBF62VMO4TENBdjMv9k5p//Oy4SLzgqHs7yPc95eTlHiQjvqniPbVYRzuBoR+FQDEvId4neIPNCY945DayNVff/8NUvn9XXNJMv5hhKnTvYP3ymHmj/IMBSbmHjjP8fycxv+MEzGqtatUI1vK7R7wM4J32XUv3Li/l5imGBkbtXlsMw/PF1jXozg3iP3aM0Z8XRBFDr1fl7Og9EnTguXx30p/6fjAIozb/i6C4BdB2z6QOfH27ZUFNL0QUELs/tycs4J2zdGEerCADTM1P8df3PxyUZiKPF8zyGHpwGFLC6QCCRuYA4QQQ6mw4hjhYT77GN2qiBWFnV5sXc0xMAgfKx5foVYKURB2vLPbxoM8auODE6ws/fH+77dHtjhxp5OHzywpWf/IIsRk25Rq0CRFY4UVNNndkmqZFRf3YuWaYUS0aE3RP5MXX3/iCOgu3Y1WYfL90sdSDgxRoYTY5mZ2anjwC/AqEBdM4tMJ4dwYs1YiOGSBkYrVHqlQNxoC34OV8BdxK9gQ+guo7bwdYdrXu92nU6nR7Pzc/PSXxfazTj30IpRaWpIqbX4UQoBDkWJlRwLzVeLBTyGs2UcUX5duzvsfPqNpvDovQhnBIdELGaWFk1hclYmLx2fxmFbNm5qXJNvdi2DQ1WAsO1P/5petshyf6v25gJ0nxUUUeiP531s/kvAcor7MDOL2pjz3JzVKpqUoMTpb8QsSqdeTT98fomjyDv8LP5aKI3uAgQP2orCkGAVRVMZxbQhnQJIAzkm3s3Js6GSfkEQEd4+bpa8+TW71P1ANqoB65I93OA2DgV+Z+omgAAAABJRU5ErkJggg==
+ #define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKoSURBVDiNjZNLaJRnFIaf75vvy2UGTWr8NYkxl0IFUYkNXSSZQNWFWlxIEVy1FLLo0i4adddVXRnS4kJwYxci2GaRTWlSFGKFGRXNmFBF62VMO4TENBdjMv9k5p//Oy4SLzgqHs7yPc95eTlHiQjvqniPbVYRzuBoR+FQDEvId4neIPNCY945DayNVff/8NUvn9XXNJMv5hhKnTvYP3ymHmj/IMBSbmHjjP8fycxv+MEzGqtatUI1vK7R7wM4J32XUv3Li/l5imGBkbtXlsMw/PF1jXozg3iP3aM0Z8XRBFDr1fl7Og9EnTguXx30p/6fjAIozb/i6C4BdB2z6QOfH27ZUFNL0QUELs/tycs4J2zdGEerCADTM1P8df3PxyUZiKPF8zyGHpwGFLC6QCCRuYA4QQQ6mw4hjhYT77GN2qiBWFnV5sXc0xMAgfKx5foVYKURB2vLPbxoM8auODE6ws/fH+77dHtjhxp5OHzywpWf/IIsRk25Rq0CRFY4UVNNndkmqZFRf3YuWaYUS0aE3RP5MXX3/iCOgu3Y1WYfL90sdSDgxRoYTY5mZ2anjwC/AqEBdM4tMJ4dwYs1YiOGSBkYrVHqlQNxoC34OV8BdxK9gQ+guo7bwdYdrXu92nU6nR7Pzc/PSXxfazTj30IpRaWpIqbX4UQoBDkWJlRwLzVeLBTyGs2UcUX5duzvsfPqNpvDovQhnBIdELGaWFk1hclYmLx2fxmFbNm5qXJNvdi2DQ1WAsO1P/5petshyf6v25gJ0nxUUUeiP531s/kvAcor7MDOL2pjz3JzVKpqUoMTpb8QsSqdeTT98fomjyDv8LP5aKI3uAgQP2orCkGAVRVMZxbQhnQJIAzkm3s3Js6GSfkEQEd4+bpa8+TW71P1ANqoB65I93OA2DgV+Z+omgAAAABJRU5ErkJggg==
+
+#define pld_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC
<!-- This Source Code Form is subject to the terms of the Mozilla Public
@@ -13,7 +13,7 @@
<dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@">@planet@</a>
</dl>
#endif
-+ <dt><h3>PLD Linux Distribution</h3>
++ <dt><h3>PLD Linux Distribution</h3></dt>
+ <dl><p>
+ <dt><a href="http://www.pld-linux.org/" icon="@pld_icon@">PLD Home Page</a>
+ <dt><a href="http://www.pld-users.org/" icon="@pld_icon@">PLD Users Wiki</a>
diff --git a/seamonkey-sysctl.patch b/seamonkey-sysctl.patch
new file mode 100644
index 0000000..3b2cf74
--- /dev/null
+++ b/seamonkey-sysctl.patch
@@ -0,0 +1,12 @@
+--- mozilla/memory/build/mozjemalloc.cpp.orig 2020-05-04 02:48:42.266052024 +0300
++++ mozilla/memory/build/mozjemalloc.cpp 2020-05-04 02:48:57.020945358 +0300
+@@ -220,9 +220,6 @@
+ #include <sys/param.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+-#if !defined(XP_SOLARIS) && !defined(ANDROID)
+-#include <sys/sysctl.h>
+-#endif
+ #include <sys/uio.h>
+
+ #include <errno.h>
diff --git a/seamonkey-system-virtualenv.patch b/seamonkey-system-virtualenv.patch
index c97400c..9709787 100644
--- a/seamonkey-system-virtualenv.patch
+++ b/seamonkey-system-virtualenv.patch
@@ -1,12 +1,12 @@
---- xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py~ 2013-05-11 21:19:23.000000000 +0200
-+++ xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py 2013-05-14 22:51:32.136719267 +0200
-@@ -37,8 +37,7 @@
+--- seamonkey-2.53.4/mozilla/python/mozbuild/mozbuild/virtualenv.py.orig 2020-10-09 08:14:38.869199627 +0200
++++ seamonkey-2.53.4/mozilla/python/mozbuild/mozbuild/virtualenv.py 2020-10-09 08:30:19.570770076 +0200
+@@ -66,8 +66,7 @@
@property
def virtualenv_script_path(self):
"""Path to virtualenv's own populator script."""
-- return os.path.join(self.topsrcdir, 'python', 'virtualenv',
-- 'virtualenv.py')
+- return os.path.join(self.topsrcdir, 'third_party', 'python',
+- 'virtualenv', 'virtualenv.py')
+ return '/usr/bin/virtualenv-2'
@property
- def python_path(self):
+ def bin_path(self):
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/seamonkey.git/commitdiff/4cad6efe9c0f0ea1746d35a23692c571fe6ebb9d
More information about the pld-cvs-commit
mailing list