thunderbird 68.0-1 (i686) 2019-6550
9999
Status | published | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
Submitter | cris [@T] beebgames.com | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
Platform | 4.0 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
Repository | main | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
URL | https://abf.openmandriva.org/build_lists/598988 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
Packages |
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
Build Date | 2019-09-01 13:38:42 +0000 UTC | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
Last Updated | 2019-09-26 16:08:31.089601018 +0000 UTC |
$ git diff --patch-with-stat --summary 13b4dd6947fc785d73ecbefb5b5b936569038e92..d671d47c273081c0ef7b371bc038dca175cb3776 .abf.yml | 109 ++++++++++++++++++++++++++++--------------------------- bz1554949.patch | 47 ++++++++++++++++++++++++ thunderbird.spec | 72 +++++++++++++++++++++++++++--------- 3 files changed, 157 insertions(+), 71 deletions(-) create mode 100644 bz1554949.patch diff --git a/.abf.yml b/.abf.yml index 47f3ac6..3247f11 100644 --- a/.abf.yml +++ b/.abf.yml @@ -11,60 +11,61 @@ removed_sources: enigmail-2.0.8.tar.gz: 2667701b932af9cc75385cd313506a131c1e45d4 enigmail-2.0.9.tar.gz: 79262ed8331d29489d575c7d64be2e6d6cb5e077 sources: - ar.xpi: 684845dc2caeaf33a7631ac1d9d70d48bde78919 - ast.xpi: 5d6bf38a80586ce01346711b0cdebfd881fee617 - be.xpi: 2dc5a998325ddd3235539f57049f3912b3cc960c - bg.xpi: 2e4714947b4e267c9fa532a50f2f9757a5321630 + ar.xpi: c07630d2b35e9617ba8a5effb9fc2f80f2c18d2a + ast.xpi: 207bedd96f70af1b64a482e07bf151ceae2384da + be.xpi: 132a52bdefa9690bf40a6e339eb1aeef6657a62e + bg.xpi: 2c9aff9d038872d53d0e453d9c6e45f8b4301859 bn-BD.xpi: 517ee16d261f25248ddc950309efda97cbeeeef1 - br.xpi: 7d7ca65d8600bd2d0ebb8dbaae3c682583c163d4 - ca.xpi: 8d706c61a24e9ee81e039450457834e21a4ff960 - cs.xpi: cdd82cab5a97e865ea327811713f12c7a1c29b36 - da.xpi: f83e311ca3d67f352395e8adc16627a3906f325f - de.xpi: ebcaef0cf357a29225b4ea6e20d2b3255cc18b0c - el.xpi: b55cf5dece92087e6d1aa005f437e0c1f5bdf3bb - en-GB.xpi: 43d3cec97603642d7d1ee828d0b6b9130869e153 - en-US.xpi: ce2bbd6b70910a4fbe11ea09babe9f73fa190d2b - enigmail-2.0.12.tar.gz: e4964b059621c392fa36430b52e31656b6bae92a - enigmail-2.0.12.tar.gz.asc: e3bc7b687777cf3eb104af856a0496c7876b9a90 - es-AR.xpi: 9548ca71d900b9c385d5871e9d1ab3850b2040f8 - es-ES.xpi: 258daef88a3c7b41d60a90ef263d6d35637c6b30 - et.xpi: 9166abc9cbcbda83a53b2f6c36bbed70d840ef84 - eu.xpi: d03cc3a53fbe126c48f10d0e19deece1258931ad - fi.xpi: e317b8a2cb42d319ab57eb26dd649cd9600ca619 - fr.xpi: 2ac197ba216961e00aba0bcf1dd533db61622a74 - fy-NL.xpi: b7108e00e483fd4a07e2f1d7f3624ca6d27ed053 - ga-IE.xpi: ac98b8c2bc4ac5c615eb05b61c0f13d3fa6c7db5 - gd.xpi: 4b09cf1a140ab69736948f278451e51448b1751c - gl.xpi: d5e9cebd6e670610b6601992d3461ef2b3b9acc9 - he.xpi: 1d5879dccb6b489b1d4db8223a74c75c30a583b7 - hr.xpi: cac1fd81b69a4f6dadf821b5c4a2251dc00ff146 - hu.xpi: faf7f9c9c9ef8c830da0b62379cd8e44c9cc6ed3 - hy-AM.xpi: c46ceeee47988042724b5e6372280f7bfd0c6cb4 - id.xpi: 9b3f2de4ade6049ab3fa13828c710fb2f48fff8f - is.xpi: 7e13ea57bffbc5cf92a2509f1c0f8b508906894c - it.xpi: 5c4c41a13fe9de9f3d3f26d105888c5b7104474d - ja.xpi: 2e90432fad3e7611b12d8be7a6f0b6130ac82fcb - ko.xpi: e1b7056caaf620ba9bd6e9f44314d964e592185b - lt.xpi: c01e27aae3e5dd1cd3d24390a5fcf28735e24861 - nb-NO.xpi: fcf4b842c24bc5765dc4f7d722f9e66f0769a1af - nl.xpi: 0c71f0baba8085233479c15b971004a11b529f20 - nn-NO.xpi: 2190e017eec94cd54e729ab0a3b37bec8f0e0d1a + br.xpi: 9d0422c3dd265164dcede20281da1998fc510151 + ca.xpi: cdddbbb6b17e7c6c0ddeca07bdb7251f9e62bbb0 + cbindgen-vendor.tar.xz: 5ed5e4744f281d217e56035036af4cef24a29935 + cs.xpi: 59536eeff063c9e8f4361be4409dc91639fb7e0b + da.xpi: 2e58752847cbf5fcd99b4fd65f97f305454f7ddb + de.xpi: f7eebb59f972619a3d32182a5ff6166171bd3aa6 + el.xpi: 8df2536ebcde6888a476d922f7a00e5245ec776b + en-GB.xpi: 6018d7f69027bb368989d0dcf07fac06f00df71b + en-US.xpi: 91bdde5baa981b73499584afe7ad4e0cabab9d6b + enigmail-2.1.2.tar.gz: 826412f2d0e4a945bd12271f23da70c759d58f76 + enigmail-2.1.2.tar.gz.asc: dd8038d9b85756a6567720c861136ce456334baa + es-AR.xpi: 6239071b76a857afd8f56b944aa95edc50ac17c6 + es-ES.xpi: 285e6898a635239c6c2c83f2d3d5d35f8ecd456e + et.xpi: 344f800cefcddad098ac64644f03ee83adf9f958 + eu.xpi: 0b4650a20bc9bbe70ca9f214e6dc866fd5b4610c + fi.xpi: 979d4b40b1f79900d333fd8adf963210f0c5a2c7 + fr.xpi: 061411fd3e3dc6b0a47be9a13320e65e4ae08304 + fy-NL.xpi: 7a946d15f6bcd63d6eb20174288622d51831d74c + ga-IE.xpi: 23a9f68c89c609b01f236b4a4815905766849a21 + gd.xpi: 759a5d8e33ca4140b7aafa3aaed76002c978c24a + gl.xpi: a7faf21754b542add687ccc31a471c7ddde7a4d9 + he.xpi: 7ca0e3b0e4a8915c07435055ccc40082710ee24b + hr.xpi: c55d2474276216950f2e184d614c6a42e85bd524 + hu.xpi: 10ad678986117081d8487fdd1bc5aafbe5d2f805 + hy-AM.xpi: 307e2fa6dfdca2776c112ef546bd3b81318c763c + id.xpi: b460402c579d252f6696a6fa24beef48ece3141c + is.xpi: 34a62ba65bf21710bb19013034d33fb8b95d944a + it.xpi: 9929915ad943ae72e0b3005b9ecce72cc82285fe + ja.xpi: 5dcce64052c757b1aea0c0353113cc8021b883a4 + ko.xpi: 2823a8456bfefb30f1228586612bd43b4225a739 + lt.xpi: b8266184b9fe47a2eed61032a8dd55391a6c42d8 + nb-NO.xpi: f676c2194f56be9e068ce1a4ecd7b32de5ecc890 + nl.xpi: 077efb7c4e7622356139b9601edc27be07129dab + nn-NO.xpi: fa47121f92f763250dd1b7b45c8fdeefd025093a pa-IN.xpi: ea454dad19df7c3bc1ddfa4a355e17082c07d90b - pl.xpi: 61be3fc7e481e4d84b52c0e3fdb1f161e3dbf954 - pt-BR.xpi: 08ae0e98f21baed689d9186ba1aebc139c4ee887 - pt-PT.xpi: 679e573b4c5da768ef276a37678566e7b30acca5 - ro.xpi: 70e8dcc52d0ccf3070dca8dacc34c59483b50797 - ru.xpi: 4771617a1ecf38dd6430c92452d28a2852cac645 - si.xpi: 3d004f5de358fcb80e899ae119c5b5f0e6f46101 - sk.xpi: 49369c55894b7436a07ffe527d65cf63020ab054 - sl.xpi: c829b480402b8e6e3fa67a6ad1d58723d64a475f - sq.xpi: 7afee5366f6c7c0254d348309ea94d7baff6c8f3 - sr.xpi: 7e17f790b600034fce9d92caa39bdd937975bc43 - sv-SE.xpi: 9663dfd755d3a6fbff699f3c35725afcb063aca4 + pl.xpi: 89ae5aadda814ce862e7193e177857cf822b82af + pt-BR.xpi: e66a17d0005e20c6669a9fe71df1389c184ebbcf + pt-PT.xpi: 9987441c54c6e5fe0b5f07d5e2f650d4a5b648db + ro.xpi: 038aceb918b072c9dce7de04c23bec45c62c9fce + ru.xpi: 3df5fafa962145a31459484c960b3558fc371f71 + si.xpi: d21eec9ba511f68e833af17ee94a493ecb5ffd26 + sk.xpi: a124fac64f06ee330f8ecc577f631dda347e6c5b + sl.xpi: d26236829fa9188bb6a6f411894e0547e9d4aa9c + sq.xpi: 5c5040418f9ac088766f9c7ae9befe432c67b002 + sr.xpi: b3effe15e5e4d64467cf13607261c2cd783ab588 + sv-SE.xpi: 20d6ac5f3e60ff3353eddc0686d5ea509b7b76f9 ta-LK.xpi: 16c61db0f821e1ad9f83f49784636fc46224bfd1 - thunderbird-60.8.0.source.tar.xz: f269436ebc3b10480cb2dd187a9b98605778ad0a - tr.xpi: d65059f1a8774dbedee27cd3fb118e51155bff6e - uk.xpi: 997add8fd9ff76afd6245297e90a3010f4b08047 - vi.xpi: 6d8091af19a3ca8f934e2106b42603ec75d162d3 - zh-CN.xpi: 488389ee459e9064e0868d550ea88cfa574d0fc0 - zh-TW.xpi: 56899726ee5f4782096b41a17fbb909d232ef8d7 + thunderbird-68.0.source.tar.xz: b41a32bb198b942a3c206942978caa53ca7ed443 + tr.xpi: c6b23884eb359c75c3f1de0883c058d17e76fa64 + uk.xpi: e77b3002aa3ee28e66229e9a7475548a975cde9d + vi.xpi: 44e9f4c46d7ad41ada4d948b3f138832a030f4bd + zh-CN.xpi: ca00e5dd4ae1b68b8a9e050f93f40b2a453424b7 + zh-TW.xpi: 49925f3cd143523541539072e6f4aa2907db5663 diff --git a/bz1554949.patch b/bz1554949.patch new file mode 100644 index 0000000..15b7569 --- /dev/null +++ b/bz1554949.patch @@ -0,0 +1,47 @@ + +# HG changeset patch +# User Emilio Cobos Álvarez <emilio@crisal.io> +# Date 1559048542 0 +# Node ID 49be991ad4d9ab41ddd6dd829edf62a2154fbfea +# Parent 7cae42dee59feb7d5754a755220b27fe9e684eb7 +Bug 1554949 - Fix WebRTC build failure with newer linux kernel. r=dminor + +Recent kernel commit[1] moved a bit the define for this constant. This revealed +a missing include in WebRTC. + +I filed this upstream in: + + * https://bugs.chromium.org/p/webrtc/issues/detail?id=10677 + +And sent a patch in: + + * https://webrtc-review.googlesource.com/c/src/+/138270 + +[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0768e17073dc5 + +Differential Revision: https://phabricator.services.mozilla.com/D32809 + +diff --git a/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc b/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc +--- a/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc ++++ b/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc +@@ -56,16 +56,19 @@ + #if defined(WEBRTC_POSIX) + #include <netinet/tcp.h> // for TCP_NODELAY + #define IP_MTU 14 // Until this is integrated from linux/in.h to netinet/in.h + typedef void* SockOptArg; + + #endif // WEBRTC_POSIX + + #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__) ++#if defined(WEBRTC_LINUX) ++#include <linux/sockios.h> ++#endif + + int64_t GetSocketRecvTimestamp(int socket) { + struct timeval tv_ioctl; + int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl); + if (ret != 0) + return -1; + int64_t timestamp = + rtc::kNumMicrosecsPerSec * static_cast<int64_t>(tv_ioctl.tv_sec) + + diff --git a/thunderbird.spec b/thunderbird.spec index 38e8675..a39bbe3 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -17,10 +17,13 @@ %define objdir obj %define xpi 0 -%define enigmail_version 2.0.12 +%define enigmail_version 2.1.2 %define enigmail_short_version %(echo %{version}| cut -d. -f1,2) %define enigmail_id \{847b3a00-7ab1-11d4-8f02-006008948af5\} +%define lightning_id \{e2fda1a4-762b-4020-b5ad-a41df1933103\} +%define gdata_id \{a62ef8ec-5fdc-40c2-873c-223b8a6925cc\} + %define _provides_exceptions libgtkembedmoz.so\\|libxpcom.so %define _requires_exceptions libgtkembedmoz.so\\|libxpcom.so @@ -201,13 +204,14 @@ Summary: Full-featured email, RSS, and newsgroup client Name: thunderbird -Version: 60.8.0 +Version: 68.0 Release: 1 License: MPL Group: Networking/Mail Url: http://www.mozillamessaging.com/ Source0: http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.xz Source12: mozilla-thunderbird-omv-default-prefs.js +Source22: cbindgen-vendor.tar.xz Source30: mozilla-thunderbird-open-browser.sh Source31: mozilla-thunderbird-open-browser-xdg.sh Source100: thunderbird.rpmlintrc @@ -238,9 +242,10 @@ Source401: thunderbird-l10n-template.in %endif # Build patches # +Patch1: bz1554949.patch # Fedora patches (Patch100+) # -Patch101: rust-1.33-build.patch +#Patch101: rust-1.33-build.patch # # Debian patches (Patch200+) # @@ -262,6 +267,7 @@ BuildRequires: gzip BuildRequires: python2 BuildRequires: unzip BuildRequires: yasm >= 1.0.1 +BuildRequires: nasm BuildRequires: zip BuildRequires: jpeg-devel BuildRequires: libiw-devel @@ -290,8 +296,9 @@ BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(vpx) >= 0.9.7 BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libpng) >= 1.4.8 -BuildRequires: rust >= 1.24.0 -BuildRequires: cargo >= 0.25.0 +BuildRequires: rust >= 1.34.0 +BuildRequires: cargo >= 0.35.0 +BuildRequires: nodejs >= 8.12 BuildRequires: clang-devel BuildRequires: llvm-devel @@ -379,13 +386,29 @@ Calendar extension for Thunderbird. %setup -q -n %{name}-%{version} -%patch101 -p1 -b .rust133 +%patch1 -p1 -b .1554949 + +#patch101 -p1 -b .rust133 %patch201 -p1 -b .default_mail -%patch216 -p1 -b .gdata +#patch216 -p1 -b .gdata %patch300 -p1 -b .progname %patch301 -p1 -b .enigmailpackage %patch304 -p1 -b .run-mozilla +mkdir -p my_rust_vendor +cd my_rust_vendor +tar xf %{SOURCE22} +cd - +mkdir -p .cargo +cat > .cargo/config <<EOL +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "$(pwd)/my_rust_vendor" +EOL +env CARGO_HOME=.cargo cargo install cbindgen + #=============================================================================== # Enigmail %setup -q -T -D -n %{name}-%{version}/extensions -a300 @@ -442,6 +465,18 @@ export CC=gcc %global optflags %optflags -Wno-error -Wno-null-conversion -Wno-inconsistent-missing-override %endif +%ifarch %ix86 +%global optflags %{optflags} -g0 -fno-exceptions -Wno-format-security +%global ldflags %{ldflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads +# avoid oom with rust +export RUSTFLAGS="-Cdebuginfo=0" +%endif + +%setup_compile_flags + +export PATH=$(pwd)/.cargo/bin:$PATH + + export MOZCONFIG=`pwd`/.mozconfig cat > $MOZCONFIG << EOF mk_add_options MOZILLA_OFFICIAL=1 @@ -459,16 +494,16 @@ ac_add_options --with-system-zlib %if %mdvver > 3000000 ac_add_options --with-system-libevent ac_add_options --with-system-icu -ac_add_options --enable-system-hunspell %endif %if %mdvver <= 3000000 ac_add_options --with-system-libvpx %endif ac_add_options --with-system-png +%if %mdvver > 3000000 ac_add_options --enable-system-sqlite +%endif ac_add_options --disable-system-cairo ac_add_options --with-system-bz2 -ac_add_options --with-pthreads ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-updater @@ -478,10 +513,15 @@ ac_add_options --disable-strip ac_add_options --enable-startup-notification ac_add_options --disable-gconf ac_add_options --enable-strip +ac_add_options --enable-update-channel=release ac_add_options --enable-official-branding +%ifarch %{ix86} +ac_add_options --enable-linker=bfd +ac_add_options --disable-optimize +%else ac_add_options --enable-optimize="-O2" +%endif ac_add_options --enable-startup-notification -ac_add_options --enable-pie %ifarch x86_64 aarch64 # ERROR: --enable-rust-simd does not work with Rust 1.33 or later. # See https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 . @@ -490,7 +530,6 @@ ac_add_options --enable-pie %endif EOF -export LDFLAGS="%{ldflags}" ./mach build #=============================================================================== @@ -557,9 +596,8 @@ cp -aL extensions/enigmail/build/enigmail-%{enigmail_short_version}*.xpi %{build # lightning ext here pushd %{objdir}/dist/xpi-stage/ for ext in {gdata-provider,}; do - hash="$(sed -n '/^ <em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' $ext/install.rdf)" - mkdir -p %buildroot%{tbextdir}/$hash - %{_bindir}/unzip -q $ext-*.xpi -d %buildroot%{tbextdir}/$hash/ + mkdir -p %buildroot%{tbextdir}/%{gdata_id} + %{_bindir}/unzip -q ${ext}.xpi -d %buildroot%{tbextdir}/%{gdata_id}/ done popd @@ -693,11 +731,11 @@ fi %{_datadir}/icons/hicolor/128x128/apps/%{name}.png # enigmail %exclude %{tbextdir}/%{enigmail_id} -%exclude %{tbdistextdir}/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi +%exclude %{tbdistextdir}/%{lightning_id}.xpi %files enigmail %{tbextdir}/%{enigmail_id} %files lightning -%{tbextdir}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc} -%{tbdistextdir}/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi +%{tbextdir}/%{gdata_id} +%{tbdistextdir}/%{lightning_id}.xpi
Not Available
benbullard79 [@T] cox.net | Come on vobe | 1667d 15hrs |
benbullard79 [@T] cox.net | Well past 7 days | 1645d 01hrs |
benbullard79 [@T] cox.net | Fullness of time | 1645d 01hrs |