From a53499e653bc4c6327bfdb2b6fd28f0715d8335f Mon Sep 17 00:00:00 2001 From: yopito Date: Thu, 8 Oct 2015 22:26:55 +0200 Subject: [PATCH] thunderbird[-i18n]: updated to 38.3.0, including backported patches from Firefox ESR 38. --- srcpkgs/thunderbird-i18n-cy | 1 + srcpkgs/thunderbird-i18n-dsb | 1 + srcpkgs/thunderbird-i18n-hsb | 1 + srcpkgs/thunderbird-i18n/template | 213 +++++++++--------- srcpkgs/thunderbird/files/mozconfig | 41 ---- srcpkgs/thunderbird/files/stab.h | 71 ++++++ .../patches/0002-Use-C99-math-isfinite.patch | 18 ++ .../thunderbird/patches/fix-gcc-tests.patch | 41 ++++ .../patches/fix-linux-include.patch | 11 + srcpkgs/thunderbird/patches/fix-media.patch | 11 + .../patches/fix-musl-fortify-inline.patch | 12 + .../thunderbird/patches/fix-musl-ipc.patch | 56 +++++ .../thunderbird/patches/fix-musl-memory.patch | 39 ++++ .../thunderbird/patches/fix-musl-stat.patch | 26 +++ .../patches/fix-musl-toolkit.patch | 145 ++++++++++++ srcpkgs/thunderbird/patches/fix-netwerk.patch | 38 ++++ srcpkgs/thunderbird/patches/fix-tools.patch | 66 ++++++ .../thunderbird-31.6.0-libvpx-modern.patch | 24 -- .../patches/thunderbird-install-dir.patch | 14 -- srcpkgs/thunderbird/template | 119 ++++++++-- 20 files changed, 747 insertions(+), 201 deletions(-) create mode 120000 srcpkgs/thunderbird-i18n-cy create mode 120000 srcpkgs/thunderbird-i18n-dsb create mode 120000 srcpkgs/thunderbird-i18n-hsb delete mode 100644 srcpkgs/thunderbird/files/mozconfig create mode 100644 srcpkgs/thunderbird/files/stab.h create mode 100644 srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch create mode 100644 srcpkgs/thunderbird/patches/fix-gcc-tests.patch create mode 100644 srcpkgs/thunderbird/patches/fix-linux-include.patch create mode 100644 srcpkgs/thunderbird/patches/fix-media.patch create mode 100644 srcpkgs/thunderbird/patches/fix-musl-fortify-inline.patch create mode 100644 srcpkgs/thunderbird/patches/fix-musl-ipc.patch create mode 100644 srcpkgs/thunderbird/patches/fix-musl-memory.patch create mode 100644 srcpkgs/thunderbird/patches/fix-musl-stat.patch create mode 100644 srcpkgs/thunderbird/patches/fix-musl-toolkit.patch create mode 100644 srcpkgs/thunderbird/patches/fix-netwerk.patch create mode 100644 srcpkgs/thunderbird/patches/fix-tools.patch delete mode 100644 srcpkgs/thunderbird/patches/thunderbird-31.6.0-libvpx-modern.patch diff --git a/srcpkgs/thunderbird-i18n-cy b/srcpkgs/thunderbird-i18n-cy new file mode 120000 index 00000000000..b0de0522551 --- /dev/null +++ b/srcpkgs/thunderbird-i18n-cy @@ -0,0 +1 @@ +thunderbird-i18n \ No newline at end of file diff --git a/srcpkgs/thunderbird-i18n-dsb b/srcpkgs/thunderbird-i18n-dsb new file mode 120000 index 00000000000..b0de0522551 --- /dev/null +++ b/srcpkgs/thunderbird-i18n-dsb @@ -0,0 +1 @@ +thunderbird-i18n \ No newline at end of file diff --git a/srcpkgs/thunderbird-i18n-hsb b/srcpkgs/thunderbird-i18n-hsb new file mode 120000 index 00000000000..b0de0522551 --- /dev/null +++ b/srcpkgs/thunderbird-i18n-hsb @@ -0,0 +1 @@ +thunderbird-i18n \ No newline at end of file diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index ac313f8b801..adfac77743a 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,8 +1,8 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=31.7.0 +version=38.3.0 revision=1 -homepage="http://www.mozilla.com/" +homepage="http://www.mozilla.org/thunderbird/" short_desc="Thunderbird language packs" maintainer="Enno Boland " license="MPL-2.1" @@ -19,60 +19,64 @@ do_install() { } _languages=( - 'ar "Arabic"' - 'ast "Asturian"' - 'be "Belarusian"' - 'bg "Bulgarian"' - 'bn-BD "Bengali (Bangladesh)"' - 'br "Breton"' - 'ca "Catalan"' - 'cs "Czech"' - 'da "Danish"' - 'de "German"' - 'el "Greek"' - 'en-GB "English (British)"' - 'en-US "English (US)"' - 'es-AR "Spanish (Argentina)"' - 'es-ES "Spanish (Spain)"' - 'et "Estonian"' - 'eu "Basque"' - 'fi "Finnish"' - 'fr "French"' - 'fy-NL "Frisian"' - 'ga-IE "Irish"' - 'gd "Gaelic (Scotland)"' - 'gl "Galician"' - 'he "Hebrew"' - 'hr "Croatian"' - 'hu "Hungarian"' - 'hy-AM "Armenian"' - 'id "Indonesian"' - 'is "Icelandic"' - 'it "Italian"' - 'ja "Japanese"' - 'ko "Korean"' - 'lt "Lithuanian"' - 'nb-NO "Norwegian (Bokmål)"' - 'nl "Dutch"' - 'nn-NO "Norwegian (Nynorsk)"' - 'pa-IN "Punjabi"' - 'pl "Polish"' - 'pt-BR "Portuguese (Brazilian)"' - 'pt-PT "Portuguese (Portugal)"' - 'rm "Romansh"' - 'ro "Romanian"' - 'ru "Russian"' - 'si "Sinhala"' - 'sk "Slovak"' - 'sl "Slovenian"' - 'sq "Albanian"' - 'sr "Serbian"' - 'ta-LK "Tamil (Sri Lanka)"' - 'tr "Turkish"' - 'uk "Ukrainian"' - 'vi "Vietnamese"' - 'zh-CN "Chinese (Simplified)"' - 'zh-TW "Chinese (Traditional)"' + 'ar "Arabic"' + 'ast "Asturian"' + 'be "Belarusian"' + 'bg "Bulgarian"' + 'bn-BD "Bengali (Bangladesh)"' + 'br "Breton"' + 'ca "Catalan"' + 'cs "Czech"' + 'cy "Welsh"' + 'da "Danish"' + 'de "German"' + 'dsb "Lower Sorbian"' + 'el "Greek"' + 'en-GB "English (British)"' + 'en-US "English (US)"' + 'es-AR "Spanish (Argentina)"' + 'es-ES "Spanish (Spain)"' + 'et "Estonian"' + 'eu "Basque"' + 'fi "Finnish"' + 'fr "French"' + 'fy-NL "Frisian"' + 'ga-IE "Irish"' + 'gd "Gaelic (Scotland)"' + 'gl "Galician"' + 'he "Hebrew"' + 'hr "Croatian"' + 'hsb "Upper Sorbian"' + 'hu "Hungarian"' + 'hy-AM "Armenian"' + 'id "Indonesian"' + 'is "Icelandic"' + 'it "Italian"' + 'ja "Japanese"' + 'ko "Korean"' + 'lt "Lithuanian"' + 'nb-NO "Norwegian (Bokmål)"' + 'nl "Dutch"' + 'nn-NO "Norwegian (Nynorsk)"' + 'pa-IN "Punjabi"' + 'pl "Polish"' + 'pt-BR "Portuguese (Brazilian)"' + 'pt-PT "Portuguese (Portugal)"' + 'rm "Romansh"' + 'ro "Romanian"' + 'ru "Russian"' + 'si "Sinhala"' + 'sk "Slovak"' + 'sl "Slovenian"' + 'sq "Albanian"' + 'sr "Serbian"' + 'sv-SE "Swedish"' + 'ta-LK "Tamil (Sri Lanka)"' + 'tr "Turkish"' + 'uk "Ukrainian"' + 'vi "Vietnamese"' + 'zh-CN "Chinese (Simplified)"' + 'zh-TW "Chinese (Traditional)"' ) depends="thunderbird>=${version}" @@ -109,49 +113,54 @@ checksum=" 97bbaea547340a56f528d8675b04a596369fb9b63245e20acd76d74211f7a668 49d3df068e9edcf17ed99754bd45c7d00c50f4bacd7a5484ab86018197258523 d491ebf429f56ad21632bc476f9364857ee838a330ff1b966cae2e8ec5a944e8 - c95a6ce7d22eca56f365f05805393a1b52a5427af02a447f9dba1cd1559dd7c7 - 0debd56af6d8872d525e62ae8fd609620c3a66a425817dec83d701346fd766ba - 9b3ca0a7df6b8bc91274b2b757dfb909beb04815cf51b377b22755114776b536 - d8d4dc74889792dc9b434f11a8934d5363dafb07aada75068809f1d3ceba7d66 - c4e5def480042a55d8532129f3bd5226004b98f5dd3991eeb429a35152f4391e - e0bf50d99447934d0f9865329469559308ab54c32d2d64321a9742b3aa4be063 - 162a5c3879bb4d826b8cfea0dd68cf13f29d417bac79cc2482dd78d76cc0a8f7 - 9f5846d2147eeb8a834a282abc80ef1cd58389faaf4a0dfedfc4e91cd28faaf5 - bba78265515862435a7aa19345460c0bdd192be207550f6a9ac0cdb7de535ac8 - bdf3d4bf05bc66951c9d861af635c791fd3513f578fe32a9ccc150aa81ba6304 - 5700997d79942d74db684fddb255ee1e5a1b10b0c7c0df875b917dbba91f9607 - ed3f3e4bbba12218a0025747257cdaefceb4f37ce65fbf8e3ec1746cacf62d62 - 788127820d6404540b698794a9008990f77005056ec1f15da05785087729c178 - f688f29b6e4032d6f6fd9b3e7ae20d2f94f7ae34e977bcb1ea1e9b4393ac9f4d - 52ba67336de4d8d19ac1d29d22df362af9e8b43a2cb800a0303b51e0b6d4c4fb - 39519209cf6c19208e8c677439b3cad194d9d14f7ff3814c189890d6285b7af7 - 7abab0668491b42dff80e8b656407b9489f8a133a58f0ca42f8c83a1973efd77 - ec4d3c63698bc825fee4a2dedde66a7796fef0efee8df307d8f233f382ba784a - f22b7f8a56d6b92448d4b1cf471fdad56cef13e8668a472e833a8efc8400b53f - 40c62742c10f08f1b93e68b026b48b849dcf323f99987720be19c0bc0f4fbb7f - 1007cd1f3f72deecdbfbb3ec54837955f53235de4b39405158eec9dd74750246 - 6de47224c4342a1fc1c81d8ec0bab90cdacb4b4e54709e9590c2bd341fbfbae7 - 4e3f6637cccafab04d665bb66b2d808797384c3b322a4375efcb9a3be480fe7f - 6c962ee2ce9051223897ace9fa6d7c60ffb7e95b103a52bad0f17803efcfeaf2 - 9dbde5ddc20a9512320490318f5f6278d5626357f3b17401482a439a4f6be654 - 51a38f39dfc18d945a0985a23d0b7770f8fe3cebf8a28f22fd92bb288345a9b0 - 784ba5505afef70f492a85651c632da974c01bf1c5a945ff132df40b077304d7 - cfd312de7632a96facd36acdc00a04bc571101d655c5c8f70300d3f982b58366 - e444889660a60b44a3e5e6fc94972e2b8a2b97e0fa8959b41bcacacfc8be931d - 3ef71ff4f72e28f15ea76764be9179cefdbf92a2270e87dad557cbf6d6c44f36 - 298f9a4a205a77e471f96e38d12dbba00b6fb9ddf89b496e8b5eb106d1f33c97 - e01d684612fd224536e9cb21f44ace5cab81bf8fd15e8e5265847df1b2407a59 - 0d2606836428595232daf0aedbafea4935e641658712fd99e34668e686c0d2e7 - 7de4b8e3ffcf3ac7ced5aeae0ca84d1e9c8603646e54473665505e1f1ac66925 - 38b372432b02c42703e3f425946cee6a42918d574f7bff7df5f9997ddb076f64 - 3441d57aeedf15c5a29800e8f544b8571d41e5ed5a381d8bb2087cda97074970 - dcd56d713daa7b6fb03d64219797e159eab8bef2e7eb9bd7999c0b285a24d153 - 7e7fb8287b9255aa8988bf63677e0bed8ae30c0da5ac7d83ba1300ba2bca41d3 - b9270889a4905233e450be25d61e4a1359a057bc6c021d5aba23a941cde56123 - 0ef471cf54c052214d5169189a72efc0e8d65801e482aeff413ffc7c822c1651 - 3529d8a55ea5458edf24059d55178b6c4935aa82b604bc1c46e4b4bffb88234b - e83e64f528b12b1550efb28ba4dea51e7912ab2af470c1382d78e01d9dc3a3ff - 12c2001834af439d1a0f95ed3f416788672d41c5b02481d26e54f66e721c83a6 - 7a20d9842117105f4ac641d602977cf20d4149564593adba0f3415976fd7b52d - f582fac503f385ceb59761134ed24170ded9f65861106ff77219040b169e6a37 - 3b60993a3c85f61ef57b02334d3a71d864e9e6609ec29f398c1f60094cad43a3" + 96b695296966a61760485210adf967cda82f562290492ca4d34a435966925dc8 + 908fb80a392d1aeb835bbf5e213f6dd62c9c1611b268641a50ff61dba3c4084c + a488ed7de074380ff02db8fc5941375f27579a41e2ee3c63d61f43e18ab88664 + 47b6b3c044a6a25d2e9c116a9f900f4a2aa2c74ae70fb5045b4175971517daf4 + 99b9b14ffd11b5a07aa6d89d947a73f378a113574ef53680c1c6992a8406292a + 1bf89952a3b876fffda0d94cd291a90a68dbebd55d286de9cf9ea87c7c241420 + aff083bcdbe2fe23c314a2725d0b27b02e4b4533f1c6e57b9542d891a915b715 + 021493ea03343e7563c69ef78dcef55c2cbf32d3024d66b4ac50b3c4588414cf + fe97ee27daa33aae86e51f4f6ea16d703a4cdce713c550c6fef35b72730a4fa9 + 7bf5963dfe145dae28f9b7f8b62cd97039eb4b165a00f64ba4d4c654b11c40b1 + e12806a8e1808e6cdba0db393fb444e17144599bdd3634530b89549dc55281e9 + b12b8b0d3ac1d051e33c249add1baecacae6b9e71365f7604d82f2775e725cf1 + dca0f3d8019dfdd3ce0489fa77a06d2d5cb39aa08e0ae3d16bb44ab630f75375 + efb561b34d258448ca28a0c54c681272436198e9f5bc771994b05b005116422f + b809cb068a54bfdd08016a798623653ab3b045a3df1e259e3ef29db6b16a61cb + 66243be7f539ca8dc376ecd5e9cd221b660af2313c0e13fe00c6c6cbbb20d2bf + 28870ca3614baddd95288000e7336503ad2e62d31b04c33394066d5d52443e09 + c74aae3a9048e60669292095c1c446f3806e73cee14d10cd0aab852c9bf19066 + fc6ae694a971c7db823a1809ebdeec91231080e57caa0ff1ff05945a07755c66 + 3f2ea2b3ff1b662d09b3d4d2d611ffaf2f6dffba7cf6b0599587b61355012141 + ebeb2ce1192b5baf8a0a6061cb1dd8e44bd11418a65d2dc118141d1219104407 + b36e1bb1b3bd81185a6ff3f330f04e44a3f51278d900971faac8205b73775323 + 952d1a2a5ba664e5542448d656e37f410d0da60f0d45d88bc128ffff3a193d34 + f97a4ad94f84bb1601d9c1b283ac84e33d191e5f6abbcbe1d6790c93c700c261 + fe0461ac92410b68f6d2d506dd9ed5e85d3adcf090acfe02f88c9aea977f53db + 2aa5e04e9d6a2c10e410e8dcbc51e2d2c093f0d5dc573b3cdc21e37facafb6d6 + ed9e84328318cdac30e605a8be9c609bdb44828f4c288cdc4af141669ba33008 + cab27cb9348180a19fdf32cdb67e03e2d98af10f39a3a158c495a72fcb9544f3 + 62d9c3bc2d0a19384a5df220b9b6a190aeb8ee6ce4327839d08ad3a09b0f5b7b + ffd7ba1110afc8096d0c316a5e4fb55b26f9d9f689705f795b00d3c296ceb5d3 + 48d4095cfdd47fa876c17a13592be4c4b31f57709d770ea8cefa9293e54d8f87 + 78d139e9894b9ea9913f921d78ee3b8894770c08ad32c8530e32782439a36383 + 8805fa13167f5fa509f44a31729e39800d8f022224cd86012bb18fc19ac21815 + c7e4582522489eb8149db41c4f2c7f7a4d3121f4f5bbcf136e456ece8189d975 + 639a3b6d32be9dcc8d2f2eb8a2cca1cdbdb444ef00b10b76aa6f8dc9035e5b4e + 72be95aae125d50fc9565c8bf40623040e37c5ca511d0f0a38f3924ddf48c845 + 51a28a8984e070e6ca886238aa834ebd9bf845c536ba44407976db7c8bd0ab04 + 2e16abf3a7f2c133b8ee8a078834e81f141143cff35306056111830252e435b8 + 0561d311a4607e9db41d913fdae19dfc4ef9d0135d1b6bbb4bec8ec60617256f + 5c937a4cc87299365991743f791d89a7ea11693f93a538659715f3dadb7d5b0d + a5d64faf18f4e05ecc68830ad7623bc378d30ab041d4fa65d9d15970c552a628 + f82cbbfed792a36383a8a78bd66b499de837dbbf1c0386a579bb602db31400e8 + 2fc3d2fda47c02cc3299e42a178b329dd43d3e09cb1b79be85a490deac77302a + 0eeb64f903032b8456ec9fe9b1484add7ac45aa76406479f44abdb30b5bce119 + 2f68f7c0596253b3fa2a3c9d895cde48d8bdc55f006264cae84eaa485ae10f37 + be6321c62f3d5dceee8df225810ed42ecc76ec79c35330da62fdb11027eb9e10 + 3e64a3c28621b7e76b2b705cee2e721fddba762728ab180449873e69ccd9bcc2 + d2d03bccd1bf564415e38ef3980b4a7e0a32fe30cada1ea8c15c0f96babca151 + 8c3455bbe76b167f94f1b1f7c836aafd7f5d11e5fa7cc4071bde0fe77b4bcf49 + fd10d148424c21731b877104ac50628c973348f8bc813573130503d08a0e045e" + diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig deleted file mode 100644 index d13efdb6016..00000000000 --- a/srcpkgs/thunderbird/files/mozconfig +++ /dev/null @@ -1,41 +0,0 @@ -mk_add_options MOZ_CO_PROJECT=mail -ac_add_options --enable-application=mail - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -# ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo -ac_add_options --enable-system-pixman -ac_add_options --with-pthreads - -# Features -ac_add_options --enable-official-branding -ac_add_options --enable-safe-browsing -ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --disable-gstreamer -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer - -# Optimization -ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 diff --git a/srcpkgs/thunderbird/files/stab.h b/srcpkgs/thunderbird/files/stab.h new file mode 100644 index 00000000000..6f70af39897 --- /dev/null +++ b/srcpkgs/thunderbird/files/stab.h @@ -0,0 +1,71 @@ +/* $OpenBSD: stab.h,v 1.3 2003/06/02 19:34:12 millert Exp $ */ +/* $NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $ */ + +/*- + * Copyright (c) 1991 The Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)stab.h 5.2 (Berkeley) 4/4/91 + */ + +#ifndef _STAB_H_ +#define _STAB_H_ + +/* + * The following are symbols used by various debuggers and by the Pascal + * compiler. Each of them must have one (or more) of the bits defined by + * the N_STAB mask set. + */ + +#define N_GSYM 0x20 /* global symbol */ +#define N_FNAME 0x22 /* F77 function name */ +#define N_FUN 0x24 /* procedure name */ +#define N_STSYM 0x26 /* data segment variable */ +#define N_LCSYM 0x28 /* bss segment variable */ +#define N_MAIN 0x2a /* main function name */ +#define N_PC 0x30 /* global Pascal symbol */ +#define N_RSYM 0x40 /* register variable */ +#define N_SLINE 0x44 /* text segment line number */ +#define N_DSLINE 0x46 /* data segment line number */ +#define N_BSLINE 0x48 /* bss segment line number */ +#define N_SSYM 0x60 /* structure/union element */ +#define N_SO 0x64 /* main source file name */ +#define N_LSYM 0x80 /* stack variable */ +#define N_BINCL 0x82 /* include file beginning */ +#define N_SOL 0x84 /* included source file name */ +#define N_PSYM 0xa0 /* parameter variable */ +#define N_EINCL 0xa2 /* include file end */ +#define N_ENTRY 0xa4 /* alternate entry point */ +#define N_LBRAC 0xc0 /* left bracket */ +#define N_EXCL 0xc2 /* deleted include file */ +#define N_RBRAC 0xe0 /* right bracket */ +#define N_BCOMM 0xe2 /* begin common */ +#define N_ECOMM 0xe4 /* end common */ +#define N_ECOML 0xe8 /* end common (local name) */ +#define N_LENG 0xfe /* length of preceding entry */ + +#endif /* !_STAB_H_ */ diff --git a/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch b/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch new file mode 100644 index 00000000000..d234e0ee3cc --- /dev/null +++ b/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch @@ -0,0 +1,18 @@ +Patch from Firefox ESR 38 Void packaging. +--- mozilla/xpcom/ds/nsMathUtils.h.orig ++++ mozilla/xpcom/ds/nsMathUtils.h +@@ -104,12 +104,12 @@ + #ifdef WIN32 + // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. + return !!_finite(aNum); +-#elif defined(XP_DARWIN) ++#elif defined(XP_DARWIN) || defined(_GLIBCXX_CMATH) + // Darwin has deprecated |finite| and recommends |isfinite|. The former is + // not present in the iOS SDK. + return std::isfinite(aNum); + #else +- return finite(aNum); ++ return isfinite(aNum); + #endif + } + diff --git a/srcpkgs/thunderbird/patches/fix-gcc-tests.patch b/srcpkgs/thunderbird/patches/fix-gcc-tests.patch new file mode 100644 index 00000000000..f1863e1a8cd --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-gcc-tests.patch @@ -0,0 +1,41 @@ +Patch from Firefox ESR 38 Void packaging. +--- configure.orig 2015-09-28 14:41:14.000000000 +0200 ++++ configure 2015-10-07 13:36:23.281995377 +0200 +@@ -511,8 +511,9 @@ + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5' ++ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5' ++ + cross_compiling=$ac_cv_prog_cc_cross + + ac_exeext= +--- mozilla/configure.orig 2015-05-29 18:30:41.474423097 +0200 ++++ mozilla/configure 2015-05-29 18:30:53.451550589 +0200 +@@ -10966,8 +10966,8 @@ ac_have_llvm_pr8927="no" + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5' ++ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + +--- mozilla/js/src/configure.orig 2015-05-29 18:31:25.049874012 +0200 ++++ mozilla/js/src/configure 2015-05-29 18:31:36.898995291 +0200 +@@ -9820,8 +9820,8 @@ ac_have_llvm_pr8927="no" + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5' ++ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + diff --git a/srcpkgs/thunderbird/patches/fix-linux-include.patch b/srcpkgs/thunderbird/patches/fix-linux-include.patch new file mode 100644 index 00000000000..38936b74af7 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-linux-include.patch @@ -0,0 +1,11 @@ +Patch from Firefox ESR 38 Void packaging. +--- mozilla/xpcom/io/nsLocalFileUnix.cpp.orig ++++ mozilla/xpcom/io/nsLocalFileUnix.cpp +@@ -28,6 +28,7 @@ + #define USE_LINUX_QUOTACTL + #include + #include ++#include + #endif + + #include "xpcom-private.h" diff --git a/srcpkgs/thunderbird/patches/fix-media.patch b/srcpkgs/thunderbird/patches/fix-media.patch new file mode 100644 index 00000000000..5fe399e6e54 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-media.patch @@ -0,0 +1,11 @@ +Patch from Firefox ESR 38 Void packaging. +--- mozilla/media.orig/mtransport/third_party/nICEr/src/stun/addrs.c ++++ mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c +@@ -45,7 +45,6 @@ + #include + #include + #ifndef ANDROID +-#include + #include + #else + #include diff --git a/srcpkgs/thunderbird/patches/fix-musl-fortify-inline.patch b/srcpkgs/thunderbird/patches/fix-musl-fortify-inline.patch new file mode 100644 index 00000000000..c9dabda07ae --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-musl-fortify-inline.patch @@ -0,0 +1,12 @@ +Patch from Firefox ESR 38 Void packaging. +--- mozilla/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h ++++ mozilla/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h +@@ -27,8 +27,5 @@ + typedef int16_t int16; + typedef unsigned short ushort; + typedef unsigned long ulong; +-#ifndef __GNUC_STDC_INLINE__ +-#define inline +-#endif + + #endif /* _SDP_OS_DEFS_H_ */ diff --git a/srcpkgs/thunderbird/patches/fix-musl-ipc.patch b/srcpkgs/thunderbird/patches/fix-musl-ipc.patch new file mode 100644 index 00000000000..1aa3201a79b --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-musl-ipc.patch @@ -0,0 +1,56 @@ +Patch from Firefox ESR 38 Void packaging. +--- mozilla/ipc/chromium/src/base/file_util.h ++++ mozilla/ipc/chromium/src/base/file_util.h +@@ -14,10 +14,15 @@ + #include + #elif defined(ANDROID) + #include ++#define NO_FTS + #elif defined(OS_POSIX) + #include +-#include + #include ++#ifdef __GLIBC__ ++#include ++#else ++#define NO_FTS ++#endif + #endif + + #include +--- mozilla/ipc/chromium/src/base/file_util_posix.cc ++++ mozilla/ipc/chromium/src/base/file_util_posix.cc +@@ -8,13 +8,13 @@ + #include + #include + #include +-#ifndef ANDROID ++#ifndef NO_FTS + #include + #endif + #include + #include + #include +-#include ++#include + #include + #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures + #include +@@ -67,7 +67,7 @@ + if (!recursive) + return (rmdir(path_str) == 0); + +-#ifdef ANDROID ++#ifdef NO_FTS + // XXX Need ftsless impl for bionic + return false; + #else +@@ -140,7 +140,7 @@ + return false; + } + +-#ifdef ANDROID ++#ifdef NO_FTS + // XXX Need ftsless impl for bionic + return false; + #else diff --git a/srcpkgs/thunderbird/patches/fix-musl-memory.patch b/srcpkgs/thunderbird/patches/fix-musl-memory.patch new file mode 100644 index 00000000000..069db35f6e2 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-musl-memory.patch @@ -0,0 +1,39 @@ +fix for musl libc. +--- mozilla/memory/mozjemalloc/jemalloc.c.orig 2015-09-28 14:41:00.000000000 +0200 ++++ mozilla/memory/mozjemalloc/jemalloc.c 2015-10-09 07:24:21.161462303 +0200 +@@ -325,7 +325,7 @@ + #endif + #include + #include +-#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) ++#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) && defined(__GLIBC__) + #include + #endif + #include +@@ -664,7 +664,7 @@ + /* No init lock for Windows. */ + #elif defined(MOZ_MEMORY_DARWIN) + static malloc_mutex_t init_lock = {OS_SPINLOCK_INIT}; +-#elif defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID) ++#elif defined(MOZ_MEMORY_LINUX) && defined(__GLIBC__) && !defined(MOZ_MEMORY_ANDROID) + static malloc_mutex_t init_lock = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP; + #elif defined(MOZ_MEMORY) + static malloc_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER; +@@ -1636,7 +1636,7 @@ + return (true); + #elif defined(MOZ_MEMORY_DARWIN) + mutex->lock = OS_SPINLOCK_INIT; +-#elif defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID) ++#elif defined(MOZ_MEMORY_LINUX) && defined(__GLIBC__) && !defined(MOZ_MEMORY_ANDROID) + pthread_mutexattr_t attr; + if (pthread_mutexattr_init(&attr) != 0) + return (true); +@@ -1698,7 +1698,7 @@ + return (true); + #elif defined(MOZ_MEMORY_DARWIN) + lock->lock = OS_SPINLOCK_INIT; +-#elif defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID) ++#elif defined(MOZ_MEMORY_LINUX) && defined(__GLIBC__) && !defined(MOZ_MEMORY_ANDROID) + pthread_mutexattr_t attr; + if (pthread_mutexattr_init(&attr) != 0) + return (true); diff --git a/srcpkgs/thunderbird/patches/fix-musl-stat.patch b/srcpkgs/thunderbird/patches/fix-musl-stat.patch new file mode 100644 index 00000000000..e92f96722f1 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-musl-stat.patch @@ -0,0 +1,26 @@ +Patch from Firefox ESR 38 Void packaging. +--- mozilla/dom/system/OSFileConstants.cpp.orig 2013-04-17 06:17:29.798371189 +0000 ++++ mozilla/dom/system/OSFileConstants.cpp 2013-04-17 06:30:30.032285977 +0000 +@@ -509,6 +509,11 @@ + INT_CONSTANT(_STAT_VER), + #endif // defined(_STAT_VER) + ++ // glibc's stat/lstat/fstat are macros while uclibc's are not ++#if defined(__GLIBC__) && !defined(__UCLIBC__) ++ { "OSFILE_STAT_MACROS", INT_TO_JSVAL(1) }, ++#endif // defined(stat) ++ + PROP_END + }; + +--- mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2014-04-03 13:08:26.686409787 +0000 ++++ mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm 2014-04-03 13:34:14.101716259 +0000 +@@ -512,7 +512,7 @@ + /*path*/ Type.fd, + /*buf*/ Type.stat.out_ptr + ); +- } else if (Const._STAT_VER != undefined) { ++ } else if (Const.OSFILE_STAT_MACROS != undefined) { + const ver = Const._STAT_VER; + let xstat_name, lxstat_name, fxstat_name; + if (OS.Constants.Sys.Name == "SunOS") { diff --git a/srcpkgs/thunderbird/patches/fix-musl-toolkit.patch b/srcpkgs/thunderbird/patches/fix-musl-toolkit.patch new file mode 100644 index 00000000000..ce8609c634e --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-musl-toolkit.patch @@ -0,0 +1,145 @@ +Patch from Firefox ESR 38 Void packaging. +--- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-03-15 05:19:36.000000000 +0000 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-04-17 10:24:33.793431933 +0000 +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + #include + #include +--- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-03-15 05:19:36.000000000 +0000 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-04-17 10:24:33.793431933 +0000 +@@ -41,6 +41,10 @@ + + #include "common/using_std_string.h" + ++#ifndef N_UNDF ++#define N_UNDF 0 ++#endif ++ + using std::vector; + + namespace google_breakpad { +--- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-03-15 05:19:36.000000000 +0000 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-04-17 10:24:33.793431933 +0000 +@@ -53,9 +53,10 @@ + #include + #endif + +-#ifdef HAVE_A_OUT_H ++#if 0 + #include + #endif ++ + #ifdef HAVE_MACH_O_NLIST_H + #include + #endif +--- mozilla/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-03-15 05:19:37.000000000 +0000 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-04-17 10:24:33.793431933 +0000 +@@ -2813,7 +2813,7 @@ + LSS_INLINE _syscall6(void*, mmap, void*, s, + size_t, l, int, p, + int, f, int, d, +- __off64_t, o) ++ off_t, o) + + LSS_INLINE _syscall4(int, newfstatat, int, d, + const char *, p, +--- mozilla/toolkit.orig/mozapps/update/common/updatedefines.h 2014-03-15 05:19:37.000000000 +0000 ++++ mozilla/toolkit/mozapps/update/common/updatedefines.h 2014-04-17 10:24:33.793431933 +0000 +@@ -105,7 +105,7 @@ + + #ifdef SOLARIS + # include +-#else ++#elif !defined(__linux__) || defined(__GLIBC__) + # include + #endif + # include +--- mozilla/toolkit.orig/mozapps/update/updater/updater.cpp 2014-03-15 05:19:37.000000000 +0000 ++++ mozilla/toolkit/mozapps/update/updater/updater.cpp 2014-04-17 10:24:33.796765327 +0000 +@@ -3432,6 +3432,7 @@ + int add_dir_entries(const NS_tchar *dirpath, ActionList *list) + { + int rv = OK; ++#if !defined(__linux__) || defined(__GLIBC__) + FTS *ftsdir; + FTSENT *ftsdirEntry; + NS_tchar searchpath[MAXPATHLEN]; +@@ -3534,6 +3535,7 @@ + } + + fts_close(ftsdir); ++#endif + + return rv; + } +--- mozilla/toolkit.orig/xre/nsSigHandlers.cpp 2014-03-15 05:19:38.000000000 +0000 ++++ mozilla/toolkit/xre/nsSigHandlers.cpp 2014-04-17 10:24:33.796765327 +0000 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include "prthread.h" + #include "plstr.h" + #include "prenv.h" +@@ -152,7 +153,7 @@ + status->__invalid = status->__denorm = status->__zdiv = status->__ovrfl = status->__undfl = + status->__precis = status->__stkflt = status->__errsumm = 0; + +- __uint32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr; ++ u_int32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr; + *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ + *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ + #endif +@@ -172,13 +173,13 @@ + *sw &= ~FPU_STATUS_FLAGS; + #endif + #if defined(__amd64__) +- __uint16_t *cw = &uc->uc_mcontext.fpregs->cwd; ++ u_int16_t *cw = &uc->uc_mcontext.fpregs->cwd; + *cw |= FPU_EXCEPTION_MASK; + +- __uint16_t *sw = &uc->uc_mcontext.fpregs->swd; ++ u_int16_t *sw = &uc->uc_mcontext.fpregs->swd; + *sw &= ~FPU_STATUS_FLAGS; + +- __uint32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr; ++ u_int32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr; + *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ + *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ + #endif +@@ -187,24 +188,24 @@ + ucontext_t *uc = (ucontext_t *)context; + + #if defined(__i386) +- uint32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0]; ++ u_int32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0]; + *cw |= FPU_EXCEPTION_MASK; + +- uint32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1]; ++ u_int32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1]; + *sw &= ~FPU_STATUS_FLAGS; + + /* address of the instruction that caused the exception */ +- uint32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3]; ++ u_int32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3]; + uc->uc_mcontext.gregs[REG_PC] = *ip; + #endif + #if defined(__amd64__) +- uint16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw; ++ u_int16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw; + *cw |= FPU_EXCEPTION_MASK; + +- uint16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw; ++ u_int16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw; + *sw &= ~FPU_STATUS_FLAGS; + +- uint32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr; ++ u_int32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr; + *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ + *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ + #endif diff --git a/srcpkgs/thunderbird/patches/fix-netwerk.patch b/srcpkgs/thunderbird/patches/fix-netwerk.patch new file mode 100644 index 00000000000..f03178bc8f7 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-netwerk.patch @@ -0,0 +1,38 @@ +Patch from Firefox ESR 38 Void packaging. +--- mozilla/netwerk.orig/sctp/src/netinet/sctp_os_userspace.h ++++ mozilla/netwerk/sctp/src/netinet/sctp_os_userspace.h +@@ -400,11 +400,8 @@ + }; + + #else /* !defined(Userspace_os_Windows) */ +-#include /* needed? added from old __FreeBSD__ */ + #include +-#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID) + #include +-#endif + typedef pthread_mutex_t userland_mutex_t; + typedef pthread_cond_t userland_cond_t; + typedef pthread_t userland_thread_t; +--- mozilla/netwerk.orig/sctp/src/netinet/sctp_pcb.c ++++ mozilla/netwerk/sctp/src/netinet/sctp_pcb.c +@@ -30,6 +30,9 @@ + * THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#define _BSD_SOURCE /* for IPPORT_RESERVED */ ++#include ++ + #ifdef __FreeBSD__ + #include + __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 258765 2013-11-30 12:51:19Z tuexen $"); +--- mozilla/netwerk.orig/sctp/src/user_queue.h ++++ mozilla/netwerk/sctp/src/user_queue.h +@@ -31,7 +31,7 @@ + #ifndef _USER_QUEUE_H_ + #define _USER_QUEUE_H_ + +-#if !defined (__Userspace_os_Windows) ++#if defined(__Userspace_os_FreeBSD) + #include + #endif + /* diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch new file mode 100644 index 00000000000..523d68a25a5 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-tools.patch @@ -0,0 +1,66 @@ +Patch from Firefox ESR 38 Void packaging. +--- mozilla/tools/profiler/local_debug_info_symbolizer.cc ++++ mozilla/tools/profiler/local_debug_info_symbolizer.cc +@@ -3,6 +3,7 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#include + #include "PlatformMacros.h" + #include "nsAutoPtr.h" + +--- mozilla/tools/profiler/platform-linux.cc ++++ mozilla/tools/profiler/platform-linux.cc +@@ -84,7 +84,7 @@ + + #define SIGNAL_SAVE_PROFILE SIGUSR2 + +-#if defined(__GLIBC__) ++#if 1 + // glibc doesn't implement gettid(2). + #include + pid_t gettid() +--- mozilla/tools/profiler/platform.h ++++ mozilla/tools/profiler/platform.h +@@ -29,6 +29,8 @@ + #ifndef TOOLS_PLATFORM_H_ + #define TOOLS_PLATFORM_H_ + ++#include ++ + #ifdef ANDROID + #include + #else +--- mozilla/tools/profiler/LulElf.cpp ++++ mozilla/tools/profiler/LulElf.cpp +@@ -579,10 +579,10 @@ + // Return the non-directory portion of FILENAME: the portion after the + // last slash, or the whole filename if there are no slashes. + string BaseFileName(const string &filename) { +- // Lots of copies! basename's behavior is less than ideal. +- char *c_filename = strdup(filename.c_str()); +- string base = basename(c_filename); +- free(c_filename); ++ // basename's behavior is less than ideal so avoid it ++ const char *c_filename = filename.c_str(); ++ const char *p = strrchr(c_filename, '/'); ++ string base = p ? p+1 : c_filename; + return base; + } + +--- mozilla/tools/profiler/platform-linux.cc.orig 2015-06-11 18:39:35.689739054 +0200 ++++ mozilla/tools/profiler/platform-linux.cc 2015-06-11 18:40:04.479706749 +0200 +@@ -651,11 +651,13 @@ void OS::Startup() { + void TickSample::PopulateContext(void* aContext) + { + MOZ_ASSERT(aContext); ++#if defined(__GLIBC__) + ucontext_t* pContext = reinterpret_cast(aContext); + if (!getcontext(pContext)) { + context = pContext; + SetSampleContext(this, aContext); + } ++#endif + } + + void OS::SleepMicro(int microseconds) diff --git a/srcpkgs/thunderbird/patches/thunderbird-31.6.0-libvpx-modern.patch b/srcpkgs/thunderbird/patches/thunderbird-31.6.0-libvpx-modern.patch deleted file mode 100644 index 493e4118233..00000000000 --- a/srcpkgs/thunderbird/patches/thunderbird-31.6.0-libvpx-modern.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 14:30:05.525960513 -0400 -+++ mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 14:32:22.478199058 -0400 -@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const Vid - // Creating a wrapper to the image - setting image data to NULL. Actual - // pointer will be set in encode. Setting align to 1, as it is meaningless - // (actual memory is not allocated). -- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height, -+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height, - 1, NULL); - // populate encoder configuration with default values - if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) { -@@ -349,9 +349,9 @@ int VP8EncoderImpl::Encode(const I420Vid - } - // Image in vpx_image_t format. - // Input image is const. VP8's raw image is not defined as const. -- raw_->planes[PLANE_Y] = const_cast(input_image.buffer(kYPlane)); -- raw_->planes[PLANE_U] = const_cast(input_image.buffer(kUPlane)); -- raw_->planes[PLANE_V] = const_cast(input_image.buffer(kVPlane)); -+ raw_->planes[VPX_PLANE_Y] = const_cast(input_image.buffer(kYPlane)); -+ raw_->planes[VPX_PLANE_U] = const_cast(input_image.buffer(kUPlane)); -+ raw_->planes[VPX_PLANE_V] = const_cast(input_image.buffer(kVPlane)); - // TODO(mikhal): Stride should be set in initialization. - raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane); - raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane); diff --git a/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch b/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch index 951f978fe53..0f62154656c 100644 --- a/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch +++ b/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch @@ -1,17 +1,3 @@ ---- config/baseconfig.mk.orig 2014-07-23 17:41:26.898090299 +0200 -+++ config/baseconfig.mk 2014-07-23 17:43:06.407093842 +0200 -@@ -1,7 +1,7 @@ --includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - MOZILLA_SRCDIR = $(topsrcdir)/mozilla - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist --- mozilla/config/baseconfig.mk.orig 2014-07-23 17:41:26.899090299 +0200 +++ mozilla/config/baseconfig.mk 2014-07-23 17:44:37.283097079 +0200 @@ -2,10 +2,10 @@ diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 9c9b2ab2367..05c413ec357 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -1,48 +1,127 @@ # Template build file for 'thunderbird'. pkgname=thunderbird -version=31.7.0 -revision=2 -lib32disabled=yes +version=38.3.0 +revision=1 wrksrc="comm-esr${version/.*/}" short_desc="Standalone Mail/News reader" maintainer="Enno Boland " homepage="http://www.mozilla.org/thunderbird/" license="MPL-1.1, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" -checksum=dc3a6afaab486ba09745898f55986f98cc9bf7647cd992849f9c7ead563479b7 +skip_extraction="stab.h" +checksum="9f3cb19a5ceabc5e8fa31f782b6d92720a77ef2c2d6c7b63b3d792cde491c961 + 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28" nocross="http://build.voidlinux.eu/builders/armv7l_builder/builds/10490/steps/shell_3/logs/stdio" +lib32disabled=yes -hostmakedepends="unzip zip perl python yasm pkg-config autoconf" -makedepends="python-devel cairo-devel libjpeg-turbo-devel pixman-devel - nss-devel sqlite-devel libXrender-devel gtk+-devel libevent-devel - libvpx-devel hunspell-devel startup-notification-devel dbus-glib-devel - alsa-lib-devel wireless_tools-devel libXScrnSaver-devel libSM-devel libXt-devel - pulseaudio-devel" +hostmakedepends="unzip zip pkg-config perl python yasm autoconf" +makedepends="python-devel nss-devel libjpeg-turbo-devel + icu-devel pixman-devel sqlite-devel gst-plugins-base1-devel gtk+-devel + libevent-devel libvpx-devel libXrender-devel + startup-notification-devel dbus-glib-devel alsa-lib-devel pulseaudio-devel + hunspell-devel libXcomposite-devel libSM-devel libXScrnSaver-devel + libXt-devel cairo-devel" depends="desktop-file-utils hicolor-icon-theme" -do_build() { - cp -f ${FILESDIR}/mozconfig .mozconfig - export LDFLAGS="-Wl,-R/usr/lib/thunderbird" +pre_configure() { + case "$XBPS_TARGET_MACHINE" in + *-musl) + # http://git.alpinelinux.org/cgit/aports/plain/community/firefox/stab.h + cp $FILESDIR/stab.h mozilla/toolkit/crashreporter/google-breakpad/src/ + ;; + esac - SHELL=/bin/bash make ${makejobs} -f client.mk build MOZ_MAKE_FLAGS="${makejobs}" + # configure script misdetects the preprocessor without an optimization level + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + [ ! -d xbps-build ] && mkdir -p xbps-build } +do_configure() { + local cross_args + case "$XBPS_TARGET_MACHINE" in + *-musl) # XXX gold linking with --hash-style=sysv results in unhidden symbols + # XXX see https://sourceware.org/ml/binutils/2014-09/msg00230.html + # + # XXX disable jemalloc. + cross_args+=" --disable-jemalloc --enable-gold=no" + ;; + esac + + # FIXME really needed ? + if [ "$CROSS_BUILD" ]; then + cross_args+=" --target=$XBPS_CROSS_TRIPLET --disable-jemalloc" + + # Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find + # the required includes. Set system nspr and nss include paths. + export HOST_CFLAGS="${XBPS_CFLAGS}" + export HOST_CXXFLAGS="${XBPS_CXXFLAGS}" + export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/alsa \ + -I${XBPS_CROSS_BASE}/usr/include/pulse \ + -I${XBPS_CROSS_BASE}/usr/include/nspr \ + -I${XBPS_CROSS_BASE}/usr/include/nss" + export CXXFLAGS+=" ${CFLAGS}" + export LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib" + + export ac_cv_sqlite_secure_delete=yes \ + ac_cv_sqlite_threadsafe=yes \ + ac_cv_sqlite_enable_fts3=yes \ + ac_cv_sqlite_dbstat_vtab=yes \ + ac_cv_sqlite_enable_unlock_notify=yes \ + ac_cv_prog_hostcxx_works=1 + fi + + mkdir -p /usr/lib/thunderbird + export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird" + + cd xbps-build + # disable --enable-gstreamer for now + # Use bundled libpng, our does not have the apng patch. + SHELL=/bin/bash ../configure --prefix=/usr --libdir=/usr/lib \ + --enable-application=mail \ + --with-system-nspr --with-system-nss --with-system-bz2 \ + --with-system-jpeg --with-system-zlib --without-system-png \ + --with-system-libevent --with-system-libvpx \ + --enable-system-cairo \ + --enable-system-pixman --enable-system-hunspell --enable-system-sqlite \ + --enable-system-ffi --enable-startup-notification --enable-gio \ + --with-pthreads --enable-official-branding --enable-safe-browsing \ + --disable-skia --disable-debug --disable-gnomevfs --disable-gconf \ + --disable-crashreporter --disable-updater --disable-xprint --disable-tests \ + --disable-mochitest --disable-installer --disable-elf-hack \ + --with-system-icu --enable-pulseaudio --enable-gstreamer=1.0 \ + --disable-cpp-exceptions --disable-javaxpcom \ + --with-nspr-prefix=${XBPS_CROSS_BASE}/usr \ + --with-nss-prefix=${XBPS_CROSS_BASE}/usr ${cross_args} \ + --enable-optimize="$CFLAGS" --disable-strip --disable-install-strip \ + --disable-static --enable-pie \ + --disable-profiling --disable-profilelocking +} +do_build() { + cd xbps-build + SHELL=/bin/bash make ${makejobs} +} do_install() { - make -f client.mk DESTDIR=${DESTDIR} install + cd xbps-build + make DESTDIR=${DESTDIR} install vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/pref - vinstall ${FILESDIR}/thunderbird.desktop 644 usr/share/applications + for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - vinstall other-licenses/branding/thunderbird/mailicon${i%x*}.png 644 \ + vinstall ${wrksrc}/other-licenses/branding/thunderbird/mailicon${i%x*}.png 644 \ usr/share/icons/hicolor/${i}/apps thunderbird.png done + # Use system-provided dictionaries rm -rf ${DESTDIR}/usr/lib/thunderbird/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell ${DESTDIR}/usr/lib/thunderbird/dictionaries - ln -sf /usr/share/hyphen ${DESTDIR}/usr/lib/thunderbird/hyphenation + ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/thunderbird/dictionaries + ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/thunderbird/hyphenation # We don't want the development stuff - rm -r ${DESTDIR}/usr/{include,lib/thunderbird-devel,share/idl} + rm -rf ${DESTDIR}/usr/{include,lib/thunderbird-devel,share/idl} + + # same binaries : usr/lib/thunderbird/{thunderbird-bin,thunderbird} + rm -f ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin }