[packages/seamonkey] - updated to 2.46 (sync with iceape.spec)

Mon Jul 24 19:06:39 CEST 2017

commit ceb753a6c02b91f2c5b7c39bf1907a38dea311f9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jul 24 19:08:32 2017 +0200

    - updated to 2.46 (sync with iceape.spec)

 makefile.patch                       |  38 -----
 seamonkey-chat.desktop               |   9 --
 seamonkey-enable-addons.patch        |  12 +-
 seamonkey-fonts.patch                | 140 ----------------
 seamonkey-icu-detect.patch           |  19 +++
 seamonkey-kill_slim_hidden_def.patch |  11 --
 seamonkey-ldap-with-nss.patch        |  40 -----
 seamonkey-lib_path.patch             |  12 --
 seamonkey-libevent21.patch           |  13 ++
 seamonkey-nss-http2.patch            |  15 ++
 seamonkey-system-virtualenv.patch    |  13 +-
 seamonkey-system-xulrunner.patch     |  11 --
 seamonkey-ti-agent.patch             |  12 --
 seamonkey.sh                         |  36 ++---
 seamonkey.spec                       | 301 +++++++++--------------------------
 system-mozldap.patch                 | 151 ------------------
 16 files changed, 140 insertions(+), 693 deletions(-)
---

diff --git a/seamonkey.spec b/seamonkey.spec
index 07959fd..47c8766 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -1,62 +1,58 @@
+# TODO: consider --enable-libproxy
 #
 # Conditional build:
-%bcond_with	gtk3		# GTK+ 3.x instead of 2.x
+%bcond_without	gtk3		# GTK+ 3.x instead of 2.x
 %bcond_without	ldap		# disable e-mail address lookups in LDAP directories
-%bcond_without	lightning	# disable Sunbird/Lightning calendar
 %bcond_without	kerberos	# disable krb5 support
-%bcond_with	xulrunner	# build with system xulrunner (incomplete?)
 %bcond_with	crashreporter	# report crashes to crash-stats.mozilla.com
 %bcond_with	tests		# enable tests (whatever they check)
 
-%define		nspr_ver	4.10.3
-%define		nss_ver		3.17.2
-%define		xulrunner_ver	34.0
+%define		nspr_ver	4.12
+%define		nss_ver		3.25
 
-%if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
 %define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
-%endif
 
 Summary:	SeaMonkey Community Edition - web browser
 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.31
+Version:	2.46
 Release:	1
 License:	MPL v2.0
 Group:		X11/Applications/Networking
-Source0:	http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.bz2
-# Source0-md5:	44b6f9cfc2a95fd08dba35ff236d306e
+Source0:	http://ftp.mozilla.org/pub/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.xz
+# Source0-md5:	436a158e16eee151b97f96c053b82d45
 Source4:	%{name}.desktop
 Source5:	%{name}-composer.desktop
-Source6:	%{name}-chat.desktop
 Source7:	%{name}-mail.desktop
 Source9:	%{name}.sh
 Patch1:		%{name}-pld-branding.patch
 Patch2:		%{name}-agent.patch
 Patch3:		%{name}-enable-addons.patch
-Patch4:		system-mozldap.patch
-Patch5:		makefile.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
-Patch7:		%{name}-system-virtualenv.patch
-Patch9:		%{name}-system-xulrunner.patch
-URL:		http://www.seamonkey-project.org/
+Patch4:		%{name}-system-virtualenv.patch
+Patch5:		%{name}-icu-detect.patch
+Patch6:		%{name}-nss-http2.patch
+Patch7:		%{name}-libevent21.patch
+URL:		https://www.seamonkey-project.org/
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	OpenGL-devel
 BuildRequires:	alsa-lib-devel
-BuildRequires:	automake
+BuildRequires:	autoconf2_13 >= 2.13
 BuildRequires:	bzip2-devel
 BuildRequires:	cairo-devel >= 1.10.2-5
 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.20
+BuildRequires:	glib2-devel >= 1:2.22
 %{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.18}
-%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
+%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.4.0}
 %{?with_kerberos:BuildRequires:	heimdal-devel >= 0.7.1}
 BuildRequires:	hunspell-devel
-BuildRequires:	libIDL-devel >= 0.8.0
-BuildRequires:	libdnet-devel
+# DECnet (dnprogs.spec), not dummy net (libdnet.spec)
+#BuildRequires:	libdnet-devel
 BuildRequires:	libevent-devel >= 1.4.7
 # standalone libffi 3.0.9 or gcc's from 4.5(?)+
 BuildRequires:	libffi-devel >= 6:3.0.9
@@ -66,65 +62,68 @@ BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	libnotify-devel >= 0.4
 BuildRequires:	libpng(APNG)-devel >= 0.10
-BuildRequires:	libpng-devel >= 2:1.6.13
-BuildRequires:	libstdc++-devel
-BuildRequires:	libvpx-devel >= 1.3.0
+BuildRequires:	libpng-devel >= 2:1.6.21
+BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	libvpx-devel >= 1.5.0
 BuildRequires:	mozldap-devel >= 6.0
 BuildRequires:	nspr-devel >= 1:%{nspr_ver}
 BuildRequires:	nss-devel >= 1:%{nss_ver}
 BuildRequires:	pango-devel >= 1:1.22.0
 BuildRequires:	perl-base >= 1:5.6
 BuildRequires:	perl-modules >= 5.004
+BuildRequires:	pixman-devel >= 0.19.2
 BuildRequires:	pkgconfig
-BuildRequires:	python >= 1:2.5
-BuildRequires:	python-modules
-BuildRequires:	python-virtualenv >= 1.11.6-2
+BuildRequires:	python >= 1:2.7
+BuildRequires:	python-modules >= 1:2.7
+BuildRequires:	python-virtualenv >= 1.15
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel >= 3.8.6
+BuildRequires:	sqlite3-devel >= 3.13.0
 BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXScrnSaver-devel
+BuildRequires:	xorg-lib-libXcomposite-devel
+BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXinerama-devel
+BuildRequires:	xorg-lib-libXfixes-devel
 BuildRequires:	xorg-lib-libXt-devel
-%if %{with xulrunner}
-BuildRequires:	xulrunner-devel >= 2:%{xulrunner_ver}
-BuildRequires:	xulrunner-devel < 2:30
+BuildRequires:	xz
+%ifarch %{ix86} %{x8664}
+BuildRequires:	yasm >= 1.0.1
 %endif
-BuildRequires:	yasm
 BuildRequires:	zip
 BuildRequires:	zlib-devel >= 1.2.3
 Requires(post):	mktemp >= 1.5-18
 Requires:	desktop-file-utils
+Requires:	fontconfig >= 1:2.7.0
 Requires:	hicolor-icon-theme
-%if %{with xulrunner}
-%requires_eq_to	xulrunner xulrunner-devel
-%else
 Requires:	browser-plugins >= 2.0
 Requires:	cairo >= 1.10.2-5
 Requires:	dbus-glib >= 0.60
-Requires:	glib2 >= 1:2.20
+Requires:	glib2 >= 1:2.22
 %{!?with_gtk3:Requires:	gtk+2 >= 2:2.18}
-%{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
+%{?with_gtk3:Requires:	gtk+3 >= 3.4.0}
 Requires:	libjpeg-turbo
-Requires:	libpng >= 2:1.6.13
+Requires:	libpng >= 2:1.6.21
 Requires:	libpng(APNG) >= 0.10
-Requires:	libvpx >= 1.3.0
+Requires:	libvpx >= 1.5.0
 Requires:	myspell-common
 Requires:	nspr >= 1:%{nspr_ver}
 Requires:	nss >= 1:%{nss_ver}
 Requires:	pango >= 1:1.22.0
+Requires:	pixman >= 0.19.2
 Requires:	sqlite3 >= %{sqlite_build_version}
 Requires:	startup-notification >= 0.8
-%endif
 Provides:	seamonkey-embedded = %{version}-%{release}
 Provides:	wwwbrowser
 Obsoletes:	light
 Obsoletes:	mozilla
 Obsoletes:	mozilla-gnomevfs
+Obsoletes:	seamonkey-addon-lightning < 2.46
+Obsoletes:	seamonkey-char < 2.46
 Obsoletes:	seamonkey-calendar
+Obsoletes:	seamonkey-dom-inspector < 2.46
 Obsoletes:	seamonkey-js-debugger
 Obsoletes:	seamonkey-libs
 Obsoletes:	seamonkey-mailnews
@@ -140,9 +139,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # don't satisfy other packages
 %define		_noautoprovfiles	%{_libdir}/%{name}
 # and as we don't provide them, don't require either
-%if %{without xulrunner}
-%define		_noautoreq	libmozalloc.so libmozjs.so libmozsandbox.so libxul.so
-%endif
+%define		_noautoreq	liblgpllibs.so libmozgtk.so libmozjs.so libxul.so
 
 %description
 SeaMonkey Community Edition is an open-source web browser, designed
@@ -166,120 +163,26 @@ SeaMonkey Community Edition - полнофункциональный web-browser
 открытыми исходными текстами, разработанный для максимального
 соотвествия стандартам, максмимальной переносимости и скорости работы
 
-%package addon-lightning
-Summary:	An integrated calendar for SeaMonkey
-Summary(pl.UTF-8):	Zintegrowany kalendarz dla SeaMonkey
-License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
-Group:		Applications/Networking
-Requires:	%{name} = %{version}-%{release}
-
-%description addon-lightning
-Lightning is an calendar extension to Icedove email client.
-
-%description addon-lightning -l pl.UTF-8
-Lightning to rozszerzenie do klienta poczty Icedove dodające
-funkcjonalność kalendarza.
-
-%package chat
-Summary:	SeaMonkey Community Edition Chat - integrated IRC client
-Summary(pl.UTF-8):	SeaMonkey Community Edition Chat - zintegrowany klient IRC-a
-Group:		X11/Applications/Networking
-Requires(post,postun):	%{name} = %{version}-%{release}
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	mozilla-chat
-
-%description chat
-SeaMonkey Community Edition Chat - IRC client that is integrated with
-the SeaMonkey Community Edition web browser.
-
-%description chat -l pl.UTF-8
-SeaMonkey Community Edition Chat - klient IRC-a zintegrowany z
-przeglądarką SeaMonkey Community Edition.
-
-%package js-debugger
-Summary:	JavaScript debugger for use with SeaMonkey Community Edition
-Summary(pl.UTF-8):	Odpluskwiacz JavaScriptu do używania z SeaMonkey Community Edition
-Group:		X11/Applications/Networking
-Requires(post,postun):	%{name} = %{version}-%{release}
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	mozilla-js-debugger
-
-%description js-debugger
-JavaScript debugger for use with SeaMonkey Community Edition.
-
-%description js-debugger -l pl.UTF-8
-Odpluskwiacz JavaScriptu do używania z SeaMonkey Community Edition.
-
-%package dom-inspector
-Summary:	A tool for inspecting the DOM of pages in SeaMonkey Community Edition
-Summary(pl.UTF-8):	Narzędzie do oglądania DOM stron w SeaMonkey Community Edition
-Group:		X11/Applications/Networking
-Requires(post,postun):	%{name} = %{version}-%{release}
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	mozilla-dom-inspector
-
-%description dom-inspector
-This is a tool that allows you to inspect the DOM for web pages in
-SeaMonkey Community Edition. This is of great use to people who are
-doing SeaMonkey Community Edition chrome development or web page
-development.
-
-%description dom-inspector -l pl.UTF-8
-To narzędzie pozwala na oglądanie DOM dla stron WWW w SeaMonkey
-Community Edition. Jest bardzo przydatne dla ludzi rozwijających
-chrome w SeaMonkey Community Edition lub tworzących strony WWW.
-
 %prep
-%setup -qc
-cd comm-release
+%setup -q
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
-%patch9 -p2
 
 %build
-cd comm-release
-%if %{with xulrunner}
-if [ "$(grep -E '^[0-9]+\.' mozilla/config/milestone.txt)" != "%{xulrunner_ver}" ]; then
-	echo >&2
-	echo >&2 "Xulrunner version %{xulrunner_ver} does not match mozilla/config/milestone.txt!"
-	echo >&2
-	exit 1
-fi
-%endif
-
-cp -f %{_datadir}/automake/config.* build/autoconf
-cp -f %{_datadir}/automake/config.* mozilla/build/autoconf
-cp -f %{_datadir}/automake/config.* mozilla/nsprpub/build/autoconf
-cp -f %{_datadir}/automake/config.* ldap/sdks/c-sdk/config/autoconf
-
 cat << EOF > .mozconfig
 mk_add_options MOZ_OBJDIR=%{objdir}
 
-export CFLAGS="%{rpmcflags}"
-export CXXFLAGS="%{rpmcflags}"
-
 %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 --exec-prefix=%{_exec_prefix}
-ac_add_options --bindir=%{_bindir}
-ac_add_options --sbindir=%{_sbindir}
-ac_add_options --sysconfdir=%{_sysconfdir}
-ac_add_options --datadir=%{_datadir}
-ac_add_options --includedir=%{_includedir}
-ac_add_options --libdir=%{_libdir}
-ac_add_options --libexecdir=%{_libexecdir}
-ac_add_options --localstatedir=%{_localstatedir}
-ac_add_options --sharedstatedir=%{_sharedstatedir}
-ac_add_options --mandir=%{_mandir}
-ac_add_options --infodir=%{_infodir}
 %if %{?debug:1}0
 ac_add_options --disable-optimize
 ac_add_options --enable-debug
@@ -288,58 +191,42 @@ ac_add_options --enable-debugger-info-modules
 ac_add_options --enable-crash-on-assert
 %else
 ac_add_options --disable-debug
-ac_add_options --disable-debug-modules
-ac_add_options --disable-logging
 ac_add_options --enable-optimize="%{rpmcflags} -Os"
 %endif
 ac_add_options --disable-strip
-ac_add_options --disable-strip-libs
 %if %{with tests}
 ac_add_options --enable-tests
 %else
 ac_add_options --disable-tests
 %endif
-%if %{with lightning}
-ac_add_options --enable-calendar
-%else
-ac_add_options --disable-calendar
-%endif
 %if %{with crashreporter}
 ac_add_options --enable-crashreporter
 %else
 ac_add_options --disable-crashreporter
 %endif
-ac_add_options --disable-elf-dynstr-gc
+ac_add_options --disable-elf-hack
 ac_add_options --disable-gnomeui
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-installer
-ac_add_options --disable-javaxpcom
+ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
-ac_add_options --disable-xterm-updates
 ac_add_options --enable-application=suite
-ac_add_options --enable-crypto
+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-extensions=default,irc
 ac_add_options --enable-gio
 %if %{with ldap}
 ac_add_options --enable-ldap
-ac_add_options --enable-system-ldap
 %else
 ac_add_options --disable-ldap
 %endif
-ac_add_options --enable-libxul
-ac_add_options --enable-pango
-ac_add_options --enable-postscript
-ac_add_options --enable-shared-js
+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
-%if %{with xulrunner}
-ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
-ac_add_options --with-system-libxul
-%endif
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
 ac_add_options --with-system-ffi
@@ -354,12 +241,13 @@ ac_add_options --with-system-zlib
 EOF
 
 %{__make} -j1 -f client.mk build \
+	AUTOCONF=/usr/bin/autoconf2_13 \
 	STRIP="/bin/true" \
 	MOZ_MAKE_FLAGS="%{?_smp_mflags}" \
 	installdir=%{_libdir}/%{name} \
 	XLIBS="-lX11 -lXt" \
 	CC="%{__cc}" \
-	CXX="%{__cxx}"
+	CXX="%{__cxx} -std=gnu++11"
 
 %if %{with crashreporter}
 # create debuginfo for crash-stats.mozilla.com
@@ -368,7 +256,6 @@ EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd comm-release
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_libdir}} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
@@ -381,7 +268,6 @@ install -d \
 cd %{objdir}
 cwd=`pwd`
 %{__make} -C suite/installer stage-package \
-	LD_LIBRARY_PATH=$cwd/mozilla/dist/lib \
 	DESTDIR=$RPM_BUILD_ROOT \
 	installdir=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
@@ -389,60 +275,45 @@ cwd=`pwd`
 cp -a dist/seamonkey/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
 cp -p dist/man/man1/seamonkey.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-%if %{with xulrunner}
-# >= 5.0 seems to require this
-ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
-%endif
-
 # Enable crash reporter for Thunderbird application
 %if %{with crashreporter}
 %{__sed} -i -e 's/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/' $RPM_BUILD_ROOT%{_libdir}/%{name}/application.ini
 
 # Add debuginfo for crash-stats.mozilla.com
 install -d $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{_libdir}/%{name}
-cp -a mozilla/dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/%{name}
+cp -a dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/%{name}
 %endif
 
-# copy manually lightning and chat files, somewhy they are not installed by make
-cp -a dist/bin/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
-cp -a dist/bin/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
-
 # move arch independant ones to datadir
-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}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
+%{__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}/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}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
 
-%if %{without xulrunner}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
 ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
-%endif
-
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/* \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/
 
 # dir for arch independant extensions besides arch dependant extensions
 # see mozilla/xpcom/build/nsXULAppAPI.h
 # XRE_SYS_LOCAL_EXTENSION_PARENT_DIR and XRE_SYS_SHARE_EXTENSION_PARENT_DIR
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
  
-%if %{without xulrunner}
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
-%endif
 
 sed 's, at LIBDIR@,%{_libdir},' %{SOURCE9} > $RPM_BUILD_ROOT%{_bindir}/seamonkey
 chmod a+rx $RPM_BUILD_ROOT%{_bindir}/seamonkey
 
-install %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} \
+install %{SOURCE4} %{SOURCE5} %{SOURCE7} \
 	$RPM_BUILD_ROOT%{_desktopdir}
 
-cp -p %{topdir}/comm-release/suite/branding/nightly/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+for d in 32 48 64 ; 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
+done
 
 # files created by seamonkey -register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
@@ -465,21 +336,28 @@ 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %{_libdir}/%{name}/register || :
 %update_browser_plugins
+%update_icon_cache hicolor
 %update_desktop_database
 
 %postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
+	%update_icon_cache hicolor
 fi
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS
 %attr(755,root,root) %{_bindir}/seamonkey
 %{_mandir}/man1/seamonkey.1*
 
@@ -488,12 +366,11 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
 
 %dir %{_libdir}/%{name}
-%if %{without xulrunner}
-%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
-%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
-%attr(755,root,root) %{_libdir}/%{name}/libmozsandbox.so
+%attr(755,root,root) %{_libdir}/%{name}/liblgpllibs.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozgtk.so
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
-%endif
+%dir %{_libdir}/%{name}/gtk2
+%attr(755,root,root) %{_libdir}/%{name}/gtk2/libmozgtk.so
 
 %{_libdir}/%{name}/blocklist.xml
 %{_libdir}/%{name}/omni.ja
@@ -514,16 +391,11 @@ fi
 %{_libdir}/%{name}/components/components.manifest
 %attr(755,root,root) %{_libdir}/%{name}/components/libsuite.so
 
-%if %{without xulrunner}
 %{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/platform.ini
-%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
 %attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
 %attr(755,root,root) %{_libdir}/%{name}/seamonkey-bin
-%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
 %attr(755,root,root) %{_libdir}/%{name}/plugin-container
-%endif
 
 %attr(755,root,root) %{_libdir}/%{name}/seamonkey
 %dir %{_libdir}/%{name}/plugins
@@ -532,11 +404,7 @@ fi
 %{_libdir}/%{name}/chrome
 %{_libdir}/%{name}/defaults
 %{_libdir}/%{name}/searchplugins
-%if %{with xulrunner}
-%{_libdir}/%{name}/xulrunner
-%else
 %{_libdir}/%{name}/dictionaries
-%endif
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
@@ -553,7 +421,6 @@ fi
 %ghost %{_libdir}/%{name}/components/compreg.dat
 %ghost %{_libdir}/%{name}/components/xpti.dat
 
-%if %{without xulrunner}
 %{_libdir}/%{name}/isp
 %dir %{_datadir}/%{name}/isp
 %{_datadir}/%{name}/isp/Bogofilter.sfd
@@ -563,24 +430,8 @@ fi
 %{_datadir}/%{name}/isp/SpamPal.sfd
 %{_datadir}/%{name}/isp/movemail.rdf
 %{_datadir}/%{name}/isp/rss.rdf
-%endif
 
-%{_pixmapsdir}/seamonkey.png
+%{_iconsdir}/hicolor/*x*/apps/seamonkey.png
 %{_desktopdir}/%{name}.desktop
 %{_desktopdir}/%{name}-composer.desktop
 %{_desktopdir}/%{name}-mail.desktop
-
-%if %{with lightning}
-%files addon-lightning
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
-%endif
-
-%files chat
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
-%{_desktopdir}/%{name}-chat.desktop
-
-%files dom-inspector
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/extensions/inspector at mozilla.org.xpi
diff --git a/makefile.patch b/makefile.patch
deleted file mode 100644
index f210af0..0000000
--- a/makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- comm-release/Makefile.in.orig	2014-12-11 16:09:07.771804209 +0100
-+++ comm-release/Makefile.in	2014-12-11 16:37:56.318398334 +0100
-@@ -26,21 +26,7 @@
- 
- include $(topsrcdir)/config/config.mk
- 
--libs binaries export tools:: $(topsrcdir)/configure config.status
--
--$(topsrcdir)/configure: $(topsrcdir)/configure.in
--	@echo 'STOP!  configure.in has changed, and your configure is out of date.'
--	@echo 'Please rerun autoconf and configure.'
--	@echo 'To ignore this message, touch "configure" in the source directory.'
--	@exit 1
--
--config.status: $(topsrcdir)/configure
--	@echo 'STOP!  configure has changed and needs to be run in this build directory.'
--	@echo 'Please rerun configure.'
--	@echo 'To ignore this message, touch "config.status" in the build directory.'
--	@exit 1
--
--default export libs clean realclean distclean alldep \
-+default export libs clean realclean distclean \
- package installer package-compare stage-package install source-package \
- upload source-upload hg-bundle l10n-check \
- maybe_clobber_profiledbuild uploadsymbols all:: $(SUBMAKEFILES)
---- mozilla/client.mk~	2011-08-26 13:10:08.000000000 +0300
-+++ mozilla/client.mk	2011-08-26 13:10:11.365956960 +0300
-@@ -278,8 +278,8 @@
- 	$(TOPSRCDIR)/mozilla/js/src/aclocal.m4 \
- 	$(NULL)
- 
--$(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
--	@echo Generating $@ using autoconf
-+$(CONFIGURES): 
-+	echo Generating $@ using autoconf
- 	cd $(@D); $(AUTOCONF)
- 
- CONFIG_STATUS_DEPS := \
diff --git a/seamonkey-chat.desktop b/seamonkey-chat.desktop
deleted file mode 100644
index 0e26255..0000000
--- a/seamonkey-chat.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=SeaMonkey Community Edition Chat
-Name[pl]=Chat SeaMonkey Community Edition
-Exec=seamonkey -chat
-Icon=seamonkey
-Terminal=false
-Type=Application
-Categories=Network;IRCClient;
-# vi: encoding=utf-8
diff --git a/seamonkey-enable-addons.patch b/seamonkey-enable-addons.patch
index 6002b15..58db926 100644
--- a/seamonkey-enable-addons.patch
+++ b/seamonkey-enable-addons.patch
@@ -9,25 +9,25 @@
  
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
---- comm-release/suite/browser/browser-prefs.js~	2013-11-06 19:54:38.789734061 +0100
-+++ comm-release/suite/browser/browser-prefs.js	2013-11-06 20:55:33.765611935 +0100
+--- 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 @@
  // 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", 0);
++pref("extensions.autoDisableScopes", 3);
  
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
---- comm-release/mozilla/browser/app/profile/firefox.js~	2013-10-29 02:20:40.000000000 +0100
-+++ comm-release/mozilla/browser/app/profile/firefox.js	2013-11-06 20:56:58.633092070 +0100
+--- 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.
 -pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
++pref("extensions.autoDisableScopes", 3);
  
  // Dictionary download preference
  pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
diff --git a/seamonkey-fonts.patch b/seamonkey-fonts.patch
deleted file mode 100644
index 61ece27..0000000
--- a/seamonkey-fonts.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- mozilla.orig/modules/libpref/src/init/all.js	2006-05-08 22:22:51.000000000 +0200
-+++ mozilla/modules/libpref/src/init/all.js	2006-07-25 07:44:06.744790000 +0200
-@@ -1886,33 +1886,33 @@
- 
- // th
- 
--pref("font.name.serif.tr", "Times");
--pref("font.name.sans-serif.tr", "Helvetica");
--pref("font.name.monospace.tr", "Courier");
-+pref("font.name.serif.tr", "serif");
-+pref("font.name.sans-serif.tr", "sans-serif");
-+pref("font.name.monospace.tr", "monospace");
- 
- pref("font.name.serif.x-baltic", "serif");
- pref("font.name.sans-serif.x-baltic", "sans-serif");
- pref("font.name.monospace.x-baltic", "monospace");
- 
--pref("font.name.serif.x-central-euro", "Times");
--pref("font.name.sans-serif.x-central-euro", "Helvetica");
--pref("font.name.monospace.x-central-euro", "Courier");
-+pref("font.name.serif.x-central-euro", "serif");
-+pref("font.name.sans-serif.x-central-euro", "sans-serif");
-+pref("font.name.monospace.x-central-euro", "monospace");
- 
- pref("font.name.serif.x-cyrillic", "serif");
- pref("font.name.sans-serif.x-cyrillic", "sans-serif");
- pref("font.name.monospace.x-cyrillic", "monospace");
- 
--pref("font.name.serif.x-unicode", "Times");
--pref("font.name.sans-serif.x-unicode", "Helvetica");
--pref("font.name.monospace.x-unicode", "Courier");
--
--pref("font.name.serif.x-user-def", "Times");
--pref("font.name.sans-serif.x-user-def", "Helvetica");
--pref("font.name.monospace.x-user-def", "Courier");
--
--pref("font.name.serif.x-western", "Times");
--pref("font.name.sans-serif.x-western", "Helvetica");
--pref("font.name.monospace.x-western", "Courier");
-+pref("font.name.serif.x-unicode", "serif");
-+pref("font.name.sans-serif.x-unicode", "sans-serif");
-+pref("font.name.monospace.x-unicode", "monospace");
-+
-+pref("font.name.serif.x-user-def", "serif");
-+pref("font.name.sans-serif.x-user-def", "sans-serif");
-+pref("font.name.monospace.x-user-def", "monospace");
-+
-+pref("font.name.serif.x-western", "serif");
-+pref("font.name.sans-serif.x-western", "sans-serif");
-+pref("font.name.monospace.x-western", "monospace");
- 
- pref("font.name.serif.zh-CN", "serif");
- pref("font.name.sans-serif.zh-CN", "sans-serif");
-@@ -1989,63 +1989,63 @@
- 
- pref("font.default.ar", "sans-serif");
- pref("font.size.variable.ar", 16);
--pref("font.size.fixed.ar", 12);
-+pref("font.size.fixed.ar", 14);
- 
--pref("font.default.el", "serif");
-+pref("font.default.el", "sans-serif");
- pref("font.size.variable.el", 16);
--pref("font.size.fixed.el", 12);
-+pref("font.size.fixed.el", 14);
- 
- pref("font.default.he", "sans-serif");
- pref("font.size.variable.he", 16);
--pref("font.size.fixed.he", 12);
-+pref("font.size.fixed.he", 14);
- 
- pref("font.default.ja", "sans-serif");
- pref("font.size.variable.ja", 16);
--pref("font.size.fixed.ja", 16);
-+pref("font.size.fixed.ja", 14);
- 
- pref("font.default.ko", "sans-serif");
- pref("font.size.variable.ko", 16);
--pref("font.size.fixed.ko", 16);
-+pref("font.size.fixed.ko", 14);
- 
--pref("font.default.th", "serif");
-+pref("font.default.th", "sans-serif");
- pref("font.size.variable.th", 16);
--pref("font.size.fixed.th", 12);
-+pref("font.size.fixed.th", 14);
- 
--pref("font.default.tr", "serif");
-+pref("font.default.tr", "sans-serif");
- pref("font.size.variable.tr", 16);
--pref("font.size.fixed.tr", 12);
-+pref("font.size.fixed.tr", 14);
- 
--pref("font.default.x-baltic", "serif");
-+pref("font.default.x-baltic", "sans-serif");
- pref("font.size.variable.x-baltic", 16);
--pref("font.size.fixed.x-baltic", 12);
-+pref("font.size.fixed.x-baltic", 14);
- 
--pref("font.default.x-central-euro", "serif");
-+pref("font.default.x-central-euro", "sans-serif");
- pref("font.size.variable.x-central-euro", 16);
--pref("font.size.fixed.x-central-euro", 12);
-+pref("font.size.fixed.x-central-euro", 14);
- 
--pref("font.default.x-cyrillic", "serif");
-+pref("font.default.x-cyrillic", "sans-serif");
- pref("font.size.variable.x-cyrillic", 16);
--pref("font.size.fixed.x-cyrillic", 12);
-+pref("font.size.fixed.x-cyrillic", 14);
- 
--pref("font.default.x-unicode", "serif");
-+pref("font.default.x-unicode", "sans-serif");
- pref("font.size.variable.x-unicode", 16);
--pref("font.size.fixed.x-unicode", 12);
-+pref("font.size.fixed.x-unicode", 14);
- 
--pref("font.default.x-western", "serif");
-+pref("font.default.x-western", "sans-serif");
- pref("font.size.variable.x-western", 16);
--pref("font.size.fixed.x-western", 12);
-+pref("font.size.fixed.x-western", 14);
- 
- pref("font.default.zh-CN", "sans-serif");
- pref("font.size.variable.zh-CN", 16);
--pref("font.size.fixed.zh-CN", 16);
-+pref("font.size.fixed.zh-CN", 14);
- 
- pref("font.default.zh-TW", "sans-serif");
- pref("font.size.variable.zh-TW", 16);
--pref("font.size.fixed.zh-TW", 16);
-+pref("font.size.fixed.zh-TW", 14);
- 
- pref("font.default.zh-HK", "sans-serif");
- pref("font.size.variable.zh-HK", 16);
--pref("font.size.fixed.zh-HK", 16);
-+pref("font.size.fixed.zh-HK", 14);
- 
- // below a certian pixel size outline scaled fonts produce poor results
- pref("font.scale.outline.min",      6);
diff --git a/seamonkey-icu-detect.patch b/seamonkey-icu-detect.patch
new file mode 100644
index 0000000..33d8d9c
--- /dev/null
+++ b/seamonkey-icu-detect.patch
@@ -0,0 +1,19 @@
+--- seamonkey-2.46/mozilla/build/autoconf/icu.m4~	2016-12-14 03:09:42.000000000 +0100
++++ seamonkey-2.46/mozilla/build/autoconf/icu.m4	2017-01-31 16:04:37.386019997 +0100
+@@ -62,15 +62,8 @@
+ 
+ dnl Settings for the implementation of the ECMAScript Internationalization API
+ if test -n "$USE_ICU"; then
+-    icudir="$_topsrcdir/intl/icu/source"
+-    if test ! -d "$icudir"; then
+-        icudir="$_topsrcdir/../../intl/icu/source"
+-        if test ! -d "$icudir"; then
+-            AC_MSG_ERROR([Cannot find the ICU directory])
+-        fi
+-    fi
+ 
+-    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++    version=`sed -n 's/^\s*#\s*define\s\s*U_ICU_VERSION_MAJOR_NUM\s\s*\([0-9][0-9]*\)\s*$/\1/p' "/usr/include/unicode/uvernum.h"`
+     if test x"$version" = x; then
+        AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
+     fi
diff --git a/seamonkey-kill_slim_hidden_def.patch b/seamonkey-kill_slim_hidden_def.patch
deleted file mode 100644
index bc0be27..0000000
--- a/seamonkey-kill_slim_hidden_def.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- seamonkey-1.0.1/gfx/cairo/libpixman/src/icint.h~	2006-04-15 23:10:51.000000000 +0000
-+++ seamonkey-1.0.1/gfx/cairo/libpixman/src/icint.h	2006-04-15 23:12:12.000000000 +0000
-@@ -34,6 +34,8 @@
- #include <limits.h>
- 
- #include "slim_internal.h"
-+#undef slim_hidden_def
-+#define slim_hidden_def(x)	/**/
- 
- /* Include NSPR's prcpucfg.h for endianness information */
- #include "prcpucfg.h"
diff --git a/seamonkey-ldap-with-nss.patch b/seamonkey-ldap-with-nss.patch
deleted file mode 100644
index 211be4d..0000000
--- a/seamonkey-ldap-with-nss.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- seamonkey-1.1.10/configure.in.orig	2008-06-16 00:25:32.000000000 +0200
-+++ seamonkey-1.1.10/configure.in	2008-07-10 18:30:45.487028766 +0200
-@@ -3746,7 +3746,7 @@
- fi
- 
- if test -n "$MOZ_NATIVE_NSS"; then
--   NSS_LIBS="$NSS_LIBS -lcrmf"
-+   NSS_LIBS="-lcrmf $NSS_LIBS"
- else
-    NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
-    NSS_DEP_LIBS="\
-@@ -7629,7 +7629,7 @@
-         mkdir "directory/c-sdk/ldap"    
-     fi
- 
--    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --without-nss --with-mozilla"
-+    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-nss --with-mozilla"
-     if test -z "$MOZ_DEBUG"; then
-         ac_configure_args="$ac_configure_args --disable-debug"
-     fi
---- seamonkey-1.1.10/configure.orig	2008-06-16 00:25:31.000000000 +0200
-+++ seamonkey-1.1.10/configure	2008-07-10 18:31:04.379027928 +0200
-@@ -11842,7 +11842,7 @@
- fi
- 
- if test -n "$MOZ_NATIVE_NSS"; then
--   NSS_LIBS="$NSS_LIBS -lcrmf"
-+   NSS_LIBS="-lcrmf $NSS_LIBS"
- else
-    NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
-    NSS_DEP_LIBS="\
-@@ -21195,7 +21195,7 @@
-         mkdir "directory/c-sdk/ldap"    
-     fi
- 
--    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --without-nss --with-mozilla"
-+    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-nss --with-mozilla"
-     if test -z "$MOZ_DEBUG"; then
-         ac_configure_args="$ac_configure_args --disable-debug"
-     fi
diff --git a/seamonkey-lib_path.patch b/seamonkey-lib_path.patch
deleted file mode 100644
index 0bda0f5..0000000
--- a/seamonkey-lib_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur seamonkey.orig/config/autoconf.mk.in seamonkey/config/autoconf.mk.in
---- seamonkey.orig/config/autoconf.mk.in	2004-03-21 03:31:17.000000000 +0100
-+++ seamonkey/config/autoconf.mk.in	2004-06-17 09:50:30.000000000 +0200
-@@ -37,7 +37,7 @@
- mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/$(MOZ_APP_NAME)
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
diff --git a/seamonkey-libevent21.patch b/seamonkey-libevent21.patch
new file mode 100644
index 0000000..eee1867
--- /dev/null
+++ b/seamonkey-libevent21.patch
@@ -0,0 +1,13 @@
+--- seamonkey-2.46/mozilla/ipc/chromium/src/base/message_pump_libevent.cc~	2016-12-14 03:07:49.000000000 +0100
++++ seamonkey-2.46/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2017-04-04 09:09:31.353732558 +0200
+@@ -23,8 +23,8 @@
+ // This macro checks that the _EVENT_SIZEOF_* constants defined in
+ // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct.
+ #define CHECK_EVENT_SIZEOF(TYPE, type) \
+-    static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \
+-    "bad _EVENT_SIZEOF_"#TYPE);
++    static_assert(EVENT__SIZEOF_##TYPE == sizeof(type), \
++    "bad EVENT__SIZEOF_"#TYPE);
+ 
+ CHECK_EVENT_SIZEOF(LONG,      long);
+ CHECK_EVENT_SIZEOF(LONG_LONG, long long);
diff --git a/seamonkey-nss-http2.patch b/seamonkey-nss-http2.patch
new file mode 100644
index 0000000..7df0b68
--- /dev/null
+++ b/seamonkey-nss-http2.patch
@@ -0,0 +1,15 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1290037
+
+--- seamonkey-2.46/mozilla/netwerk/protocol/http/Http2Session.cpp.orig	2016-10-31 21:15:27.000000000 +0100
++++ seamonkey-2.46/mozilla/netwerk/protocol/http/Http2Session.cpp	2017-01-09 17:45:38.639941993 +0100
+@@ -3542,8 +3542,8 @@
+     LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
+           this, keybits));
+     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+-  } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
+-    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
++  } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
++    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
+           this, keybits));
+     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
+   }
diff --git a/seamonkey-system-virtualenv.patch b/seamonkey-system-virtualenv.patch
index e3f7b2c..c97400c 100644
--- a/seamonkey-system-virtualenv.patch
+++ b/seamonkey-system-virtualenv.patch
@@ -6,18 +6,7 @@
          """Path to virtualenv's own populator script."""
 -        return os.path.join(self.topsrcdir, 'python', 'virtualenv',
 -            'virtualenv.py')
-+        return '/usr/bin/virtualenv'
++        return '/usr/bin/virtualenv-2'
  
      @property
      def python_path(self):
---- comm-release/mail/test/resources/installmozmill.py.orig	2014-10-14 08:26:59.000000000 +0200
-+++ comm-release/mail/test/resources/installmozmill.py	2014-12-02 17:52:03.074177834 +0100
-@@ -79,7 +79,7 @@
-   env = os.environ.copy()
-   env.pop('PYTHONHOME', None)
-   # The --no-site-packages is because of https://github.com/pypa/virtualenv/issues/165
--  returncode = call([sys.executable, os.path.join('virtualenv', 'virtualenv.py'),
-+  returncode = call([sys.executable, '/usr/bin/virtualenv',
-                      destination], env=env)
-   if returncode:
-     print 'Failure to install virtualenv'
diff --git a/seamonkey-system-xulrunner.patch b/seamonkey-system-xulrunner.patch
deleted file mode 100644
index 353c6df..0000000
--- a/seamonkey-system-xulrunner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iceape-2.15.2/comm-release/suite/browser/Makefile.in.orig	2013-02-03 09:04:13.000000000 +0100
-+++ iceape-2.15.2/comm-release/suite/browser/Makefile.in	2013-02-24 15:15:09.573091923 +0100
-@@ -26,7 +26,7 @@
- 
- ifdef LIBXUL_SDK
- PREF_JS_EXPORTS += \
--	$(srcdir)/channel-prefs.js
-+	$(srcdir)/channel-prefs.js \
- 	$(NULL)
- endif
- 
diff --git a/seamonkey-ti-agent.patch b/seamonkey-ti-agent.patch
deleted file mode 100644
index f57fda7..0000000
--- a/seamonkey-ti-agent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/xpfe/bootstrap/browser-prefs.js.orig	2007-03-21 23:39:25.000000000 +0100
-+++ mozilla/xpfe/bootstrap/browser-prefs.js	2007-03-21 23:39:10.000000000 +0100
-@@ -61,6 +61,9 @@
- 
- #expand pref("general.useragent.extra.__MOZ_APP_NAME__", "__MOZ_APP_DISPLAYNAME__/__MOZ_APP_VERSION__");
- 
-+pref("general.useragent.vendor", "PLD");
-+pref("general.useragent.vendorSub", "Titanium");
-+
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
- pref("browser.startup.page",                1);
- pref("browser.startup.homepage",	   "chrome://navigator-region/locale/region.properties");
diff --git a/seamonkey.sh b/seamonkey.sh
index 65b92d2..c019519 100644
--- a/seamonkey.sh
+++ b/seamonkey.sh
@@ -6,33 +6,17 @@ LIBDIR="@LIBDIR@/seamonkey"
 SEAMONKEY="$LIBDIR/seamonkey"
 PWD=${PWD:-$(pwd)}
 
-if [ "$1" = "-remote" ]; then
-	exec $SEAMONKEY "$@"
+if [ -z "$1" ]; then
+	exec $SEAMONKEY
 else
-	if ! $SEAMONKEY -remote 'ping()' 2>/dev/null; then
-		if [ -f "$PWD/$1" ]; then
-			exec $SEAMONKEY "file://$PWD/$1"
-		else
-			exec $SEAMONKEY "$@"
-		fi
+	if [ -f "$PWD/$1" ]; then
+		URL="file://$PWD/$1"
 	else
-		if [ -z "$1" ]; then
-			exec $SEAMONKEY -remote 'xfeDoCommand(openBrowser)'
-		elif [ "$1" = "-mail" ]; then
-			exec $SEAMONKEY -remote 'xfeDoCommand(openInbox)'
-		elif [ "$1" = "-compose" -o "$1" = "-editor" ]; then
-			exec $SEAMONKEY -remote 'xfeDoCommand(composeMessage)'
-		else
-			if [ -f "$PWD/$1" ]; then
-				URL="file://$PWD/$1"
-			else
-				URL="$1"
-			fi
-			if ! grep -q browser.tabs.opentabfor.middleclick.*false ~/.mozilla/seamonkey/*/prefs.js; then
-				exec $SEAMONKEY -new-tab "$URL"
-			else
-				exec $SEAMONKEY -new-window "$URL"
-			fi
-		fi
+		URL="$1"
+	fi
+	if ! grep -q browser.tabs.opentabfor.middleclick.*false ~/.mozilla/seamonkey/*/prefs.js; then
+		exec $SEAMONKEY -new-tab "$URL"
+	else
+		exec $SEAMONKEY -new-window "$URL"
 	fi
 fi
diff --git a/system-mozldap.patch b/system-mozldap.patch
deleted file mode 100644
index a4ce5ac..0000000
--- a/system-mozldap.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- comm-release/mail/configure.in.orig	2014-12-03 07:11:58.000000000 +0100
-+++ comm-release/mail/configure.in	2014-12-10 21:34:07.344611754 +0100
-@@ -50,7 +50,19 @@
-     MOZ_LDAP_XPCOM=,
-     MOZ_LDAP_XPCOM=1)
- 
--if test "$MOZ_LDAP_XPCOM"; then
-+dnl system LDAP Support
-+dnl ========================================================
-+MOZ_ARG_ENABLE_BOOL(system-ldap,
-+[  --enable-system-ldap
-+                          Use system mozldap],
-+    MOZ_LDAP_DIR=yes)
-+
-+if test "$MOZ_LDAP_DIR" ; then
-+    LDAP_CFLAGS=$(pkg-config --cflags mozldap)
-+    LDAP_LIBS=$(pkg-config --libs mozldap)
-+    LDAP_COMPONENT=mozldap
-+    LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
-+elif test "$MOZ_LDAP_XPCOM"; then
-     LDAP_CFLAGS='-I${DIST}/public/ldap'
- fi
- 
-@@ -77,7 +89,7 @@
- 
- # if we're building the LDAP XPCOM component, we need to build
- # the c-sdk first.
--if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
-+if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then
-     # Save configure args so we can restore them after configuring LDAP.
-     _save_ac_configure_args="$ac_configure_args"
-     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
---- comm-release/suite/configure.in.orig	2014-12-03 07:12:00.000000000 +0100
-+++ comm-release/suite/configure.in	2014-12-10 21:35:29.477941640 +0100
-@@ -50,7 +50,19 @@
-     MOZ_LDAP_XPCOM=,
-     MOZ_LDAP_XPCOM=1)
- 
--if test "$MOZ_LDAP_XPCOM"; then
-+dnl system LDAP Support
-+dnl ========================================================
-+MOZ_ARG_ENABLE_BOOL(system-ldap,
-+[  --enable-system-ldap
-+                          Use system mozldap],
-+    MOZ_LDAP_DIR=yes)
-+
-+if test "$MOZ_LDAP_DIR" ; then
-+    LDAP_CFLAGS=$(pkg-config --cflags mozldap)
-+    LDAP_LIBS=$(pkg-config --libs mozldap)
-+    LDAP_COMPONENT=mozldap
-+    LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
-+elif test "$MOZ_LDAP_XPCOM"; then
-     LDAP_CFLAGS='-I${DIST}/public/ldap'
- fi
- 
-@@ -68,6 +80,9 @@
- 
- AC_SUBST(MOZ_LDAP_XPCOM)
- AC_SUBST(LDAP_CFLAGS)
-+AC_SUBST_LIST(LDAP_LIBS)
-+AC_SUBST(LDAP_COMPONENT)
-+AC_SUBST(LDAP_MODULE)
- 
- dnl =========================================================
- dnl = MAPI support (Windows only)
-@@ -77,7 +92,7 @@
- 
- # if we're building the LDAP XPCOM component, we need to build
- # the c-sdk first.
--if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
-+if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then
-     # Save configure args so we can restore them after configuring LDAP.
-     _save_ac_configure_args="$ac_configure_args"
-     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
---- comm-release/ldap/moz.build.orig	2014-12-03 07:11:58.000000000 +0100
-+++ comm-release/ldap/moz.build	2014-12-13 21:33:15.543736333 +0100
-@@ -14,8 +14,4 @@
-         '/ldap/sdks/c-sdk/ldap/libraries/libprldap/nsldappr32v60',
-     ]
- else:
--    USE_LIBS += [
--        '/ldap/sdks/c-sdk/ldap/libraries/libldap/ldap60',
--        '/ldap/sdks/c-sdk/ldap/libraries/libldif/ldif60',
--        '/ldap/sdks/c-sdk/ldap/libraries/libprldap/prldap60',
--    ]
-+    OS_LIBS += CONFIG['LDAP_LIBS']
---- comm-release/ldap/Makefile.in.orig	2014-12-03 07:11:58.000000000 +0100
-+++ comm-release/ldap/Makefile.in	2014-12-14 14:35:24.641162595 +0100
-@@ -7,11 +7,7 @@
- # reach in and just install the headers that we need.
- 
- export::
--	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk/config export
--	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk/ldap/include export
- 
- libs clean distclean::
--	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk $@
- 
- target::
--	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk export
---- comm-release/mozilla/build/autoconf/config.status.m4.orig	2014-12-03 07:22:33.000000000 +0100
-+++ comm-release/mozilla/build/autoconf/config.status.m4	2014-12-20 11:51:52.906485837 +0100
-@@ -157,6 +157,10 @@
-   variable='$'$ac_subst_arg
-   echo "    (''' $ac_subst_arg ''', r''' `eval echo $variable` ''')," >> $CONFIG_STATUS
- done
-+for ac_subst_arg in $_subconfigure_ac_subst_list_args; do
-+  variable='$'$ac_subst_arg
-+  echo "    (''' $ac_subst_arg ''', list(r''' `eval echo $variable` '''.split()))," >> $CONFIG_STATUS
-+done
- 
- cat >> $CONFIG_STATUS <<\EOF
- ] ]
---- comm-release/mozilla/build/autoconf/subconfigure.m4.orig	2014-12-03 07:22:33.000000000 +0100
-+++ comm-release/mozilla/build/autoconf/subconfigure.m4	2014-12-20 11:50:26.996489440 +0100
-@@ -31,6 +31,11 @@
- _subconfigure_ac_subst_args="$_subconfigure_ac_subst_args $1"
- ])
- 
-+AC_DEFUN([AC_SUBST_LIST],
-+[
-+_subconfigure_ac_subst_list_args="$_subconfigure_ac_subst_list_args $1"
-+])
-+
- dnl Override for AC_DEFINE.
- AC_DEFUN([AC_DEFINE],
- [
---- comm-release/mozilla/configure.orig	2014-12-03 07:23:55.000000000 +0100
-+++ comm-release/mozilla/configure	2014-12-21 08:15:22.603405124 +0100
-@@ -29627,6 +29627,10 @@
-   variable='$'$ac_subst_arg
-   echo "    (''' $ac_subst_arg ''', r''' `eval echo $variable` ''')," >> $CONFIG_STATUS
- done
-+for ac_subst_arg in $_subconfigure_ac_subst_list_args; do
-+  variable='$'$ac_subst_arg
-+  echo "    (''' $ac_subst_arg ''', list(r''' `eval echo $variable` '''.split()))," >> $CONFIG_STATUS
-+done
- 
- cat >> $CONFIG_STATUS <<\EOF
- ] ]
---- comm-release/suite/installer/package-manifest.in.orig	2014-12-03 07:12:00.000000000 +0100
-+++ comm-release/suite/installer/package-manifest.in	2014-12-21 16:18:12.162189385 +0100
-@@ -742,7 +742,7 @@
- @APPNAME@/Contents/MacOS/@DLL_PREFIX at ldap60@DLL_SUFFIX@
- @APPNAME@/Contents/MacOS/@DLL_PREFIX at ldif60@DLL_SUFFIX@
- @APPNAME@/Contents/MacOS/@DLL_PREFIX at prldap60@DLL_SUFFIX@
--#else
-+#elif 0
- @BINPATH@/@DLL_PREFIX at ldap60@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX at ldif60@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX at prldap60@DLL_SUFFIX@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/seamonkey.git/commitdiff/ceb753a6c02b91f2c5b7c39bf1907a38dea311f9


