diff -Naur thunderbird.orig/mozconfig thunderbird/mozconfig --- thunderbird.orig/mozconfig 2016-08-03 15:47:47.281638448 +0200 +++ thunderbird/mozconfig 2016-08-03 16:37:29.000000000 +0200 @@ -23,6 +23,7 @@ ac_add_options --enable-system-pixman # Features +ac_add_options --enable-calendar ac_add_options --enable-startup-notification ac_add_options --disable-gstreamer ac_add_options --disable-updater diff -Naur thunderbird.orig/PKGBUILD thunderbird/PKGBUILD --- thunderbird.orig/PKGBUILD 2016-08-03 15:47:47.281638448 +0200 +++ thunderbird/PKGBUILD 2016-08-03 19:19:32.000000000 +0200 @@ -5,8 +5,10 @@ # Contributor: Dale Blount # Contributor: Anders Bostrom -pkgname=thunderbird +pkgbase=thunderbird +pkgname=(thunderbird thunderbird-lightning) pkgver=45.2.0 +_tagname=45_2_0 pkgrel=1 pkgdesc="Standalone mail and news reader from mozilla.org" arch=('i686' 'x86_64') @@ -16,8 +18,9 @@ 'dbus-glib' 'alsa-lib' 'libvpx' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font' 'icu') makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf' - 'libpulse' 'inetutils') + 'libpulse' 'inetutils' 'python2-compare-locales') optdepends=('libcanberra: for sound support') +replaces=('thunderbird-i18n-en-us') options=('!emptydirs' '!makeflags') source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz mozconfig @@ -25,14 +28,80 @@ thunderbird-install-dir.patch firefox-gcc-6.0.patch mozilla-1228540.patch mozilla-1228540-1.patch vendor.js) -sha256sums=('bd2389cbb28138668ab41b26f1dce49c455807e09b43fd370ee765ae3f0937c0' - 'b884ccab9bea135600b41a2359073e637dee96dac64d22aceec4adb7fd936b23' - '3fba13d88aeb003ab0811ef739463858172ce0662a1c7d62835df3d83ddbb8fb' - '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' - '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf' - '3a3e84c702ee31450a3e84698441aceb11cf44e64c9fedcaddb8cb50db759417' - 'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19' - 'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed') + +# See mail/locales/shipped-locales for supported languages +_languages=( + '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)"' + '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 (India)"' + '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)"' +) + +_url=http://hg.mozilla.org/releases/l10n/mozilla-release + +for _lang in "${_languages[@]}"; do + _locale=${_lang%% *} + _pkgname=thunderbird-i18n-${_locale,,} + + pkgname+=($_pkgname) + source+=("thunderbird-i18n-$pkgver-$_locale.tar.gz::$_url/$_locale/archive/THUNDERBIRD_${_tagname}_RELEASE.tar.gz") + eval "package_$_pkgname() { + _package $_lang + }" +done # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Arch Linux use ONLY. For your own distribution, please @@ -48,9 +117,16 @@ # more information. _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff - prepare() { - cd $pkgname-$pkgver + [ -e i18n ] && rm -r i18n + mkdir i18n + for _lang in "${_languages[@]}"; do + _locale=${_lang%% *} + _pkgname=$_locale-THUNDERBIRD_${_tagname}_RELEASE + mv $_pkgname i18n/$_locale + done + + cd $pkgbase-$pkgver cp ../mozconfig .mozconfig patch -Np1 -i ../thunderbird-install-dir.patch @@ -74,7 +150,7 @@ } build() { - cd $pkgname-$pkgver + cd $pkgbase-$pkgver # _FORTIFY_SOURCE causes configure failures CPPFLAGS+=" -O2" @@ -89,10 +165,29 @@ export PATH="$srcdir/path:$PATH" make -f client.mk build + + # Include translations in Lightning + pushd obj-*-linux-gnu/calendar/lightning + for _lang in "${_languages[@]}"; do + _locale=${_lang%% *} + make LOCALE_MERGEDIR="$srcdir/i18n-merged/$_locale" L10NBASEDIR="$srcdir/i18n" merge-$_locale + make LOCALE_MERGEDIR="$srcdir/i18n-merged/$_locale" L10NBASEDIR="$srcdir/i18n" libs-$_locale + done + make tools + popd + + # Create langpacks + pushd obj-*-linux-gnu/mail/locales + for _lang in "${_languages[@]}"; do + _locale=${_lang%% *} + make LOCALE_MERGEDIR="$srcdir/i18n-merged/$_locale" L10NBASEDIR="$srcdir/i18n" merge-$_locale + make LOCALE_MERGEDIR="$srcdir/i18n-merged/$_locale" L10NBASEDIR="$srcdir/i18n" langpack-$_locale + done + popd } -package() { - cd $pkgname-$pkgver +package_thunderbird() { + cd $pkgbase-$pkgver make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install install -Dm644 ../vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" @@ -113,4 +208,93 @@ # Replace duplicate binary with symlink # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -sf thunderbird "$pkgdir/usr/lib/thunderbird/thunderbird-bin" + + # Split out Lightning + mv "$pkgdir"/usr/lib/thunderbird/distribution "$srcdir" +} + +package_thunderbird-lightning() { + pkgdesc="Lightning calendar extension for Thunderbird" + depends=("thunderbird>=$pkgver") + optdepends=() + replaces=() + + install -dm755 "$pkgdir/usr/lib/thunderbird" + mv "$srcdir/distribution" "$pkgdir/usr/lib/thunderbird" +} + +_package() { + pkgdesc="$2 language pack for Thunderbird" + depends=("thunderbird>=$pkgver") + optdepends=() + replaces=() + + install -Dm644 $pkgbase-$pkgver/obj-*-linux-gnu/dist/linux-*/xpi/thunderbird-$pkgver.$1.langpack.xpi \ + "$pkgdir/usr/lib/thunderbird/extensions/langpack-$1@thunderbird.mozilla.org.xpi" } + +sha256sums=('bd2389cbb28138668ab41b26f1dce49c455807e09b43fd370ee765ae3f0937c0' + 'a0976827f9c69f0ae3c15a990bb94322d76e9bf9c93468a66eb41264d40d1b60' + '3fba13d88aeb003ab0811ef739463858172ce0662a1c7d62835df3d83ddbb8fb' + '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' + '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf' + '3a3e84c702ee31450a3e84698441aceb11cf44e64c9fedcaddb8cb50db759417' + 'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19' + 'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed' + '2309d1394a21de579130ea5d43045c3d6252209919629df26a21ab867ee6848a' + 'ca21364dcd08ab00352b10eed976d58dee71a52b8deae77df7bd6a5235903b73' + '7a8a085e3c99e833b430d7a8680603dc6ef7eea94b868f731dda3af9d6bafad2' + '13e3b34286233d3b1e71f5aaf4a9469d3f0cfef906b244a866188018d49be114' + '0c28656b85f6b84bb316ccef1c48f6871498d0fe39f19686e0797a4e6e9850c8' + '4086e70bbfe3353001bdcd6cd60cc5d727ae881939d0bb52fc799ba6b24ec339' + '38f41c6555e755e1ccf3b71b960a4d37b484a239e9ae65474dc18e4dcd8fbee1' + 'b2c6f4cced9476c464193329e1c8fb818406af95826c6956b91c89cc3019dbc5' + 'f4f94a73cd1e0138be9e54637e35adb34fa40696d52e878b1845731c39db1488' + 'a3e030e7f2586c6a95f783627eb8ef2fca279f03c54353220ba6798e2214ae37' + 'd9e4a41b33e5dc67ec8b672e725218e49e2f4fc1a1633ae213a89c91347c8d5d' + 'cca75e5a188f9be56ce5ef8f616464c68ebeba40eb33d1210b2fcae812ef6c9d' + 'd7cc97414e9b3a9728db487b848d3688456ca56d65841a85a5c98a116ed975e7' + '8ed0ed064d6ced3e65267ce6abfdf1bb82cd16c87fd1ab351e18fa3c40d209f7' + '3e7133e9c946d4af1c545214f516ddb2a006cd5805bd68fadf16ee6483fa8fb1' + 'd377b620cc6f4a2ff4b710552e5cf44b0820dc3c3d533b5ba236def516287df1' + '22c670a4f688f58f5a2a3b578b5e4ba75c9c758b2c45971834bdca209dec6527' + '633673e5fad8d4508257f990625989b7f8f17c689cf51ed26b1d1a3ff1facd1e' + '9871199471e5059587a2b003bb6dcb971d7c454c9140eb062b7db8f947b5f665' + 'e3634577378c47f523feb1891aacc97a48b15270346daf6c3d0f0315ca06556b' + '7d3edaf968bc4f062924d6d8c5c2f5d04c97339308b5f31964e142e133949b73' + '0dcf6dddb72a78d9d924cdd3f30cbbb8f3dc059182d5cea8f380fe02ec439f33' + '75030a6890fbfcd0e7755a7342e73678c2bf84932703ab6693ebd5f6a2108fa5' + '40968b8fcbd33b540fa425a34c52c38a6151e07de69d1d7e27b001b810da0a5c' + 'f25902892e790cf94ad7f5916a1856ddf36c519418c62f0147316dcd5a41b82c' + '5eb8d2f23a4414f005b55a425f8c39cf7dddaee88cc13a9567693e2a8788593c' + '10121ce396bda6ff6f4cd7abd10e4b0c820a78dc071e8ece4f6b2ef9659b1fc8' + '6bfedfa19f378dfd6ec14ed1c7b104204a73b52bbbbdb277fccb279685e4f2ff' + '10cd464c408be001b2164489613245849a00a4cfbeb02a2a837e2fb0d63c692c' + '014d905432464aad3dfe2bcce28c85d630b1fef00880e4cb966108ed29285d47' + 'bece81cd28af1802af2b9005f13d3720c58ec89f534e2f7d2072a7b36087017e' + '72ba1f63b4b7f0c6f64cdd06251b528a3d385e2ec0fea5f7a3fecceaac30c08f' + '7a7de32efa6767ee45449452bfc193cdf6f96ce4da1e9d4f9d9bb9ff72133525' + '52ec3cde9d4bdfe32d67ab43861b84e9e6a2e57dd41b4a609e40e6beefb75bf4' + '251710bed8f71ed6baee496536fccc5d02a2bf00938aba7f6d1062e9c9952251' + 'a84667aa727d904a7074844b9df54111ba302a69d862d17052bb0fd6fa4dd2cf' + 'd53eb734aeea9bd6a343dfa2f24a8fefc6936de282818a1600748047e10e53dd' + 'ce8bdbbe504ed80b83b2ac81e393e12c9e5a7c279ed537ad06640fdb386474e3' + '3c92d0d97799d2ecf5fd752feee5c79f459d16f1836ca24db272be1c1943f575' + 'f7a8ca685b2b18ffd106102ba2179ab76a8eadfc91a0c72eb0be54c71c6826e6' + '202f934bf043ef507ff31f2c53bc3876fce8c68acb725e1a8ade8d3131c10f48' + 'ae0c5f3d472837f83bff16ca1656fe3337af275f0b1decfc99001e7411d5688a' + 'd9aa80de803c644a664a58be505e2d4a50fe4877de0a7880a1df554645c915c3' + '377ebfd58dae305b761c5b591698f49b0a0de09f542d96289fc39827dcde2dca' + '290740954a84a883e07b1c7dedff9a84ea4bf4738cee70781fb6ef3df6b47f0f' + '27765ef8fa9ec84ceecf661d5dafd2deebfc21c7ddff93319657de4983859e29' + 'a3219ed54096cac9881d1240c5858a21ff51dcc8ed6ef8be9f99e84207ee50a6' + '4ad7fa6c47ca2e0cf6b983c890bc74cf37ea8f0005c6e57573bad930cba97fed' + 'cddefcdb167882555fba670e8accbf2e1c05924f620cc62da89b1016cd7660d7' + 'a65907360a29661ba2b4a053f4ac42da7f759d476fe76bcf3cf49677361504c4' + '0d5254eb5b680f084e383cf12d53578b5c94a266f832960f1cbbfa821df9bce2' + '3fa4e1f88b6ba33f8449fae5bc16e6a3321c6cd74a24a8087e6aac0c813fdb07' + '979635ae3b136e9126a5a5e2814d1eda88d47f366f92a8bd89b63bac6b7888fd' + 'cb5b5d7b65b31b19abc76ae60da8c18546c0433d31972d42f905dbaafdaaab50' + 'f0d79a135f9389d7b8376948c1fd0d3e7acd8016f37fb2c5a4f1e5287cfe17f7' + '84846a48aefefe7f62a06174dc551353738b4e8625e4341ef08c70571f2cc028' + 'e47280e1fb6ead440cbd40915757d56ccbd2125ba2539e78c90c48ff1307e7ae')