[packages/iceape] - up to 2.46 - lightning, chat and dom-inspector removed by upstream - fixed incompatibility with ns
baggins
baggins at pld-linux.org
Tue Jan 31 17:04:36 CET 2017
commit 72a78610b580c6e16062f0862791dcb60b87d6ac
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Jan 31 17:03:12 2017 +0100
- up to 2.46
- lightning, chat and dom-inspector removed by upstream
- fixed incompatibility with nss 3.28
iceape-chat.desktop | 9 ------
iceape.spec | 82 ++++++++++-------------------------------------------
icu-detect.patch | 19 +++++++++++++
libsuite.patch | 14 ---------
no-logging.patch | 22 --------------
nss-http2.patch | 15 ++++++++++
6 files changed, 49 insertions(+), 112 deletions(-)
---
diff --git a/iceape.spec b/iceape.spec
index 9469f60..deaa0f2 100644
--- a/iceape.spec
+++ b/iceape.spec
@@ -1,8 +1,7 @@
#
# 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 crashreporter # report crashes to crash-stats.mozilla.com
%bcond_with tests # enable tests (whatever they check)
@@ -18,18 +17,17 @@ Summary(es.UTF-8): Navegador de Internet Iceape
Summary(pl.UTF-8): Iceape - przeglądarka WWW
Summary(pt_BR.UTF-8): Navegador Iceape
Name: iceape
-Version: 2.40
-Release: 2
+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/seamonkey-%{version}.source.tar.xz
-# Source0-md5: 5789df8f96e14577c275f10fdf8462f3
+# Source0-md5: 436a158e16eee151b97f96c053b82d45
Source1: %{name}-branding.tar.xz
# Source1-md5: 2eca62062b4d1022f94b5cf49bc024d3
Source3: %{name}-rm_nonfree.sh
Source4: %{name}.desktop
Source5: %{name}-composer.desktop
-Source6: %{name}-chat.desktop
Source7: %{name}-mail.desktop
Source8: %{name}.sh
Patch0: %{name}-branding.patch
@@ -38,13 +36,14 @@ Patch2: %{name}-agent.patch
Patch3: enable-addons.patch
# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
Patch4: system-virtualenv.patch
-Patch5: no-logging.patch
-Patch6: libsuite.patch
+Patch5: icu-detect.patch
+Patch6: nss-http2.patch
URL: http://www.pld-linux.org/Packages/Iceape
BuildRequires: GConf2-devel >= 1.2.1
BuildRequires: OpenGL-devel
BuildRequires: alsa-lib-devel
BuildRequires: automake
+BuildRequires: autoconf2_13
BuildRequires: bzip2-devel
BuildRequires: cairo-devel >= 1.10.2-5
BuildRequires: dbus-glib-devel >= 0.60
@@ -115,6 +114,9 @@ Requires: sqlite3 >= %{sqlite_build_version}
Requires: startup-notification >= 0.8
Provides: iceape-embedded = %{version}-%{release}
Provides: wwwbrowser
+Obsoletes: iceape-addon-lightning < 2.46-1
+Obsoletes: iceape-chat < 2.46-1
+Obsoletes: iceape-dom-inspector < 2.46-1
Obsoletes: iceape-mailnews
Obsoletes: iceape-gnomevfs
Obsoletes: light
@@ -230,18 +232,6 @@ export MOZ_DEBUG_SYMBOLS=1
# 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
@@ -250,48 +240,31 @@ 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 --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-updater
-ac_add_options --disable-xterm-updates
ac_add_options --enable-application=suite
-ac_add_options --enable-crypto
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 --with-system-ldap
%else
ac_add_options --disable-ldap
%endif
-ac_add_options --enable-libxul
-ac_add_options --enable-pango
-ac_add_options --enable-postscript
# breaks build
#ac_add_options --enable-shared-js
ac_add_options --enable-startup-notification
@@ -312,16 +285,13 @@ ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-png
ac_add_options --with-system-zlib
-ac_add_options --enable-xinerama
-ac_add_options --disable-xprint
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
ac_add_options --enable-safe-browsing
ac_add_options --enable-chrome-format=omni
ac_add_options --disable-necko-wifi
EOF
%{__make} -j1 -f client.mk build \
+ AUTOCONF=/usr/bin/autoconf2_13 \
STRIP="/bin/true" \
MOZ_MAKE_FLAGS="%{?_smp_mflags}" \
installdir=%{_libdir}/%{name} \
@@ -365,12 +335,6 @@ install -d $RPM_BUILD_ROOT%{_exec_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
-%if %{with lightning}
-# copy manually lightning 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
-%endif
-
# 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
@@ -383,9 +347,6 @@ ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/search
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
-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
@@ -401,7 +362,7 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
sed 's, at LIBDIR@,%{_libdir},' %{SOURCE8} > $RPM_BUILD_ROOT%{_bindir}/iceape
chmod a+rx $RPM_BUILD_ROOT%{_bindir}/iceape
-install %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} \
+install %{SOURCE4} %{SOURCE5} %{SOURCE7} \
$RPM_BUILD_ROOT%{_desktopdir}
# files created by iceape -register
@@ -457,6 +418,9 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/liblgpllibs.so
#%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
%attr(755,root,root) %{_libdir}/%{name}/libxul.so
+%dir %{_libdir}/%{name}/gtk2
+%attr(755,root,root) %{_libdir}/%{name}/gtk2/libmozgtk.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozgtk.so
%{_libdir}/%{name}/blocklist.xml
%{_libdir}/%{name}/omni.ja
@@ -479,7 +443,6 @@ fi
%{_libdir}/%{name}/dependentlibs.list
%{_libdir}/%{name}/platform.ini
-%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
%attr(755,root,root) %{_libdir}/%{name}/iceape-bin
%attr(755,root,root) %{_libdir}/%{name}/plugin-container
@@ -523,18 +486,3 @@ fi
%{_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/iceape-chat.desktop b/iceape-chat.desktop
deleted file mode 100644
index 1b20bf1..0000000
--- a/iceape-chat.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Iceape Chat
-Name[pl]=Chat Iceape
-Exec=iceape -chat
-Icon=iceape
-Terminal=false
-Type=Application
-Categories=Network;IRCClient;
-# vi: encoding=utf-8
diff --git a/icu-detect.patch b/icu-detect.patch
new file mode 100644
index 0000000..33d8d9c
--- /dev/null
+++ b/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/libsuite.patch b/libsuite.patch
deleted file mode 100644
index 8297285..0000000
--- a/libsuite.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nrbu seamonkey-2.39/suite/build/moz.build seamonkey-2.39-OK/suite/build/moz.build
---- seamonkey-2.39/suite/build/moz.build 2015-11-04 04:43:23.000000000 +0300
-+++ seamonkey-2.39-OK/suite/build/moz.build 2016-01-15 23:58:18.603109110 +0300
-@@ -27,10 +27,4 @@
- 'shell32',
- ]
-
--# js needs to come after xul for now, because it is an archive and its content
--# is discarded when it comes first.
--USE_LIBS += [
-- 'js',
--]
--
- OS_LIBS += CONFIG['TK_LIBS']
diff --git a/no-logging.patch b/no-logging.patch
deleted file mode 100644
index d539992..0000000
--- a/no-logging.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- iceweasel-41.0.1/mozilla/gfx/2d/Logging.h.orig 2015-10-11 23:18:21.614362889 +0200
-+++ iceweasel-41.0.1/mozilla/gfx/2d/Logging.h 2015-10-11 21:12:33.117826547 +0200
-@@ -11,9 +11,7 @@
- #include <stdio.h>
- #include <vector>
-
--#ifdef MOZ_LOGGING
- #include "mozilla/Logging.h"
--#endif
-
- #if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
- #include "nsDebug.h"
---- iceweasel-41.0.1/mozilla/dom/media/webm/WebMDemuxer.cpp~ 2015-10-29 23:17:57.000000000 +0100
-+++ iceweasel-41.0.1/mozilla/dom/media/webm/WebMDemuxer.cpp 2015-11-08 11:16:56.213634029 +0100
-@@ -17,6 +17,7 @@
- #include "nsAutoRef.h"
- #include "NesteggPacketHolder.h"
- #include "XiphExtradata.h"
-+#include "prprf.h"
-
- #include <algorithm>
- #include <stdint.h>
diff --git a/nss-http2.patch b/nss-http2.patch
new file mode 100644
index 0000000..7df0b68
--- /dev/null
+++ b/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);
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/29fbdf1a7d5d04a22c42acb7007fcdd0243685c2
More information about the pld-cvs-commit
mailing list