| 1 |
commit: c8e13f0ddf2812355c107dd82262138b5e35c91d |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 6 02:25:25 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 6 02:25:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=c8e13f0d |
| 7 |
|
| 8 |
seamonkey: Fix build with libevent-2.1 |
| 9 |
|
| 10 |
eclass/mozconfig-v6.49.eclass | 12 ++------ |
| 11 |
www-client/seamonkey/files/firefox-52-curve.patch | 34 ---------------------- |
| 12 |
.../files/seamonkey-2.46-configure_regexp.patch | 14 --------- |
| 13 |
www-client/seamonkey/seamonkey-2.46-r1.ebuild | 6 ++-- |
| 14 |
4 files changed, 5 insertions(+), 61 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass |
| 17 |
index 7f9ed15..bc6e7d3 100644 |
| 18 |
--- a/eclass/mozconfig-v6.49.eclass |
| 19 |
+++ b/eclass/mozconfig-v6.49.eclass |
| 20 |
@@ -94,6 +94,7 @@ RDEPEND=">=app-text/hunspell-1.2:= |
| 21 |
dev-libs/atk |
| 22 |
dev-libs/expat |
| 23 |
>=x11-libs/cairo-1.10[X] |
| 24 |
+ >=x11-libs/gtk+-2.18:2 |
| 25 |
x11-libs/gdk-pixbuf |
| 26 |
>=x11-libs/pango-1.22.0 |
| 27 |
>=media-libs/libpng-1.6.21:0=[apng] |
| 28 |
@@ -120,7 +121,7 @@ RDEPEND=">=app-text/hunspell-1.2:= |
| 29 |
system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) |
| 30 |
system-icu? ( >=dev-libs/icu-56.1:= ) |
| 31 |
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) |
| 32 |
- system-libevent? ( =dev-libs/libevent-2.0*:0= ) |
| 33 |
+ system-libevent? ( >=dev-libs/libevent-2.0:0= ) |
| 34 |
system-sqlite? ( >=dev-db/sqlite-3.13.0:3[secure-delete,debug=] ) |
| 35 |
system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) |
| 36 |
system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) |
| 37 |
@@ -134,8 +135,7 @@ if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then |
| 38 |
IUSE+=" gtk3" |
| 39 |
fi |
| 40 |
RDEPEND+=" |
| 41 |
- gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) |
| 42 |
- !gtk3? ( >=x11-libs/gtk+-2.18:2 )" |
| 43 |
+ gtk3? ( >=x11-libs/gtk+-3.4.0:3 )" |
| 44 |
elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then |
| 45 |
if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then |
| 46 |
IUSE+=" +gtk2" |
| 47 |
@@ -143,11 +143,7 @@ elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then |
| 48 |
IUSE+=" gtk2" |
| 49 |
fi |
| 50 |
RDEPEND+=" |
| 51 |
- gtk2? ( >=x11-libs/gtk+-2.18:2 ) |
| 52 |
!gtk2? ( >=x11-libs/gtk+-3.4.0:3 )" |
| 53 |
-else |
| 54 |
- RDEPEND+=" |
| 55 |
- >=x11-libs/gtk+-2.18:2" |
| 56 |
fi |
| 57 |
if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then |
| 58 |
inherit qmake-utils |
| 59 |
@@ -239,8 +235,6 @@ mozconfig_config() { |
| 60 |
fi |
| 61 |
fi |
| 62 |
|
| 63 |
- # Enable position independent executables |
| 64 |
- mozconfig_annotate 'enabled by Gentoo' --enable-pie |
| 65 |
mozconfig_use_enable debug |
| 66 |
mozconfig_use_enable debug tests |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/www-client/seamonkey/files/firefox-52-curve.patch b/www-client/seamonkey/files/firefox-52-curve.patch |
| 70 |
deleted file mode 100644 |
| 71 |
index 508d580..0000000 |
| 72 |
--- a/www-client/seamonkey/files/firefox-52-curve.patch |
| 73 |
+++ /dev/null |
| 74 |
@@ -1,34 +0,0 @@ |
| 75 |
-# HG changeset patch |
| 76 |
-# User Franziskus Kiefer <franziskuskiefer@×××××.com> |
| 77 |
-# Date 1469717280 -7200 |
| 78 |
-# Thu Jul 28 16:48:00 2016 +0200 |
| 79 |
-# Node ID 95aa61f1e3562e526bf88179d9d078fd90ad1bda |
| 80 |
-# Parent d42aacfe34af25e2f5110e2ca3d24a210eabeb33 |
| 81 |
-Update keybits in H2, r=mt |
| 82 |
- |
| 83 |
-MozReview-Commit-ID: 35oWoDMqe1Y |
| 84 |
- |
| 85 |
-diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp |
| 86 |
---- a/netwerk/protocol/http/Http2Session.cpp |
| 87 |
-+++ b/netwerk/protocol/http/Http2Session.cpp |
| 88 |
-@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile() |
| 89 |
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); |
| 90 |
- } |
| 91 |
- |
| 92 |
- uint32_t keybits = ssl->GetKEAKeyBits(); |
| 93 |
- if (kea == ssl_kea_dh && keybits < 2048) { |
| 94 |
- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", |
| 95 |
- this, keybits)); |
| 96 |
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); |
| 97 |
-- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 |
| 98 |
-- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", |
| 99 |
-+ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. |
| 100 |
-+ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", |
| 101 |
- this, keybits)); |
| 102 |
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); |
| 103 |
- } |
| 104 |
- |
| 105 |
- int16_t macAlgorithm = ssl->GetMACAlgorithmUsed(); |
| 106 |
- LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n", |
| 107 |
- this, macAlgorithm)); |
| 108 |
- if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) { |
| 109 |
|
| 110 |
diff --git a/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch b/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch |
| 111 |
deleted file mode 100644 |
| 112 |
index 6928f84..0000000 |
| 113 |
--- a/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch |
| 114 |
+++ /dev/null |
| 115 |
@@ -1,14 +0,0 @@ |
| 116 |
-https://bugs.gentoo.org/604696 |
| 117 |
-https://bugzilla.mozilla.org/show_bug.cgi?id=1329252 |
| 118 |
- |
| 119 |
---- seamonkey-2.46/mozilla/build/autoconf/icu.m4 |
| 120 |
-+++ seamonkey-2.46/mozilla/build/autoconf/icu.m4 |
| 121 |
-@@ -70,7 +70,7 @@ |
| 122 |
- fi |
| 123 |
- fi |
| 124 |
- |
| 125 |
-- 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"` |
| 126 |
-+ 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"` |
| 127 |
- if test x"$version" = x; then |
| 128 |
- AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) |
| 129 |
- fi |
| 130 |
|
| 131 |
diff --git a/www-client/seamonkey/seamonkey-2.46-r1.ebuild b/www-client/seamonkey/seamonkey-2.46-r1.ebuild |
| 132 |
index 2876ebf..7630d0e 100644 |
| 133 |
--- a/www-client/seamonkey/seamonkey-2.46-r1.ebuild |
| 134 |
+++ b/www-client/seamonkey/seamonkey-2.46-r1.ebuild |
| 135 |
@@ -61,8 +61,8 @@ MOZCONFIG_OPTIONAL_WIFI=1 |
| 136 |
MOZCONFIG_OPTIONAL_JIT="enabled" |
| 137 |
inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.49 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas-v2 |
| 138 |
|
| 139 |
-PATCHFF="firefox-49.0-patches-03" |
| 140 |
-PATCH="${PN}-2.46-patches-01" |
| 141 |
+PATCHFF="firefox-49.0-patches-04" |
| 142 |
+PATCH="${PN}-2.46-patches-02" |
| 143 |
EMVER="1.9.6.1" |
| 144 |
|
| 145 |
DESCRIPTION="Seamonkey Web Browser" |
| 146 |
@@ -135,13 +135,11 @@ src_unpack() { |
| 147 |
src_prepare() { |
| 148 |
# Apply our patches |
| 149 |
eapply "${WORKDIR}"/seamonkey |
| 150 |
- eapply "${FILESDIR}"/${PN}-2.46-configure_regexp.patch |
| 151 |
|
| 152 |
# browser patches go here |
| 153 |
pushd "${S}"/mozilla &>/dev/null || die |
| 154 |
rm -f "${WORKDIR}"/firefox/2000-firefox_gentoo_install_dirs.patch |
| 155 |
eapply "${WORKDIR}"/firefox |
| 156 |
- eapply "${FILESDIR}"/firefox-52-curve.patch |
| 157 |
popd &>/dev/null || die |
| 158 |
|
| 159 |
# Shell scripts sometimes contain DOS line endings; bug 391889 |
Archives