- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448014 - avoid needless flattening in AndroidDecoderModule; r=jesup
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 1e7ee8ad5a57315bda89fb5b1f7fba49e63ccce4 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Mon Jun 18 15:27:06 2018 -0400 Bug 1448014 - avoid needless flattening in AndroidDecoderModule; r=jesup --- dom/media/platforms/android/AndroidDecoderModule.cpp | 12 +++++++----- dom/media/platforms/android/AndroidDecoderModule.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dom/media/platforms/android/AndroidDecoderModule.cpp b/dom/media/platforms/android/AndroidDecoderModule.cpp index df32d9b2f4fd..bffefde46a36 100644 --- a/dom/media/platforms/android/AndroidDecoderModule.cpp +++ b/dom/media/platforms/android/AndroidDecoderModule.cpp @@ -33,15 +33,17 @@ namespace mozilla { mozilla::LazyLogModule sAndroidDecoderModuleLog("AndroidDecoderModule"); -const char* +const nsCString TranslateMimeType(const nsACString& aMimeType) { if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP8)) { - return "video/x-vnd.on2.vp8"; + static NS_NAMED_LITERAL_CSTRING(vp8, "video/x-vnd.on2.vp8"); + return vp8; } else if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP9)) { - return "video/x-vnd.on2.vp9"; + static NS_NAMED_LITERAL_CSTRING(vp9, "video/x-vnd.on2.vp9"); + return vp9; } - return PromiseFlatCString(aMimeType).get(); + return nsCString(aMimeType); } static bool @@ -112,7 +114,7 @@ AndroidDecoderModule::SupportsMimeType( } return java::HardwareCodecCapabilityUtils::FindDecoderCodecInfoForMimeType( - nsCString(TranslateMimeType(aMimeType))); + TranslateMimeType(aMimeType)); } already_AddRefed<MediaDataDecoder> diff --git a/dom/media/platforms/android/AndroidDecoderModule.h b/dom/media/platforms/android/AndroidDecoderModule.h index 86a0766c36e6..4f67965d2b3a 100644 --- a/dom/media/platforms/android/AndroidDecoderModule.h +++ b/dom/media/platforms/android/AndroidDecoderModule.h @@ -31,7 +31,7 @@ private: extern LazyLogModule sAndroidDecoderModuleLog; -const char* +const nsCString TranslateMimeType(const nsACString& aMimeType); } // namespace mozilla

1 0

[tor-browser-build/master] Bug 27827: pass -tmpdir to the linker in snowflake build
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit f92f149ea8ffb9dd64a798453c85aa124a9391aa Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 16 18:40:59 2018 -0600 Bug 27827: pass -tmpdir to the linker in snowflake build The update to go 1.11.1 fixed part of #27827, namely the /tmp/go-buildRANDOMNUM paths embedded in the binary. However there is still a single /tmp/go-link-RANDOMNUM/go.o path remaining -- it comes from here: https://github.com/golang/go/blob/go1.11.1/src/cmd/link/internal/ld/lib.go#… The random path affects the Go build ID even if we overwrite the random digits in the binary. Luckily there's a -tmpdir flag that lets us override the random path. --- projects/snowflake/build | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index f3616f4..a66a1e9 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -30,32 +30,13 @@ cd client [% IF c("var/osx") -%] # Without faketime, snowflake-client would contain the timestamp of the # temporary client.a file created during "go build". - [% c("var/faketime") %] go build -ldflags '-s' + # The -tmpdir flag overrides what would otherwise be a randomly generated + # path, /tmp/go-link-RANDOMNUM/go.o. + mkdir -p /var/tmp/go-link.tmpdir + [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' [% ELSE -%] go build -ldflags '-s' [% END -%] -[% IF c("var/osx") -%] - # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 - # on Darwin embeds such paths and the issue is unsolved in upstream Go as of - # 2016-06-28: - # https://github.com/golang/go/issues/9206#issuecomment-310476743 - # The two kinds of paths are ("000000000" stands for 9 random digits): - # /tmp/go-build000000000 - # /tmp/go-link-000000000 - # Such paths are the output of ioutil.TempDir("", "go-build") and - # ioutil.TempDir("", "go-link-"). - cp -a client client.stomped - sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped - # Sanity check: make sure the file actually changed. If it did not, it could - # mean that a change in go or clang has made this step unnecessary. - if cmp client client.stomped - then - echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." - echo "Check projects/snowflake/build" - exit 1 - fi - mv -f client.stomped client -[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd ..

1 0

[tor-browser-build/master] Merge remote-tracking branch 'dcf/bug_27827'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 889be4318d80f11f2b5b2b845ab11868149c48f1 Merge: d8ce7fc f92f149 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 10:21:29 2018 +0000 Merge remote-tracking branch 'dcf/bug_27827' projects/go/config | 4 ++-- projects/snowflake/build | 27 ++++----------------------- 2 files changed, 6 insertions(+), 25 deletions(-)

1 0

[tor-browser-build/master] Bug 27827: update go to 1.11.1
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 6cdefb462010bf92ce57751f0c3ccb44ea45d353 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 17 09:28:58 2018 -0600 Bug 27827: update go to 1.11.1 --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 2a3b1ad..1841705 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.8.3 +version: 1.11.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 + sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Merge remote-tracking branch 'arthur/28082'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit d8ce7fca64a15cf9b71f7685ef2a8f36dae6a21a Merge: 0166d3d fbb72c6 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 09:16:59 2018 +0000 Merge remote-tracking branch 'arthur/28082' rbm.conf | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-browser-build/master] Bug 28082: Add locales cs, el, hu, ka
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit fbb72c65a24ac70619062ebcd16c67a9afb4feae Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 16 20:47:48 2018 -0700 Bug 28082: Add locales cs, el, hu, ka --- rbm.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rbm.conf b/rbm.conf index d7f1420..13aec99 100644 --- a/rbm.conf +++ b/rbm.conf @@ -53,17 +53,21 @@ var: locales: - ar - ca + - cs - da - de + - el - es-ES - fa - fr - ga-IE - he + - hu - id - is - it - '[% c("var/locale_ja") %]' + - ka - ko - nb-NO - nl

1 0

[tor-launcher/master] Bug 28082: Add locales cs, el, hu, ka
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 3aa20983122b4aaed6ae77cfc5bdb48107aa33a4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 16 20:41:50 2018 -0700 Bug 28082: Add locales cs, el, hu, ka --- src/chrome/content/network-settings.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index aaa91ac..1599c28 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -306,17 +306,21 @@ function populateLocaleList(aLangPackAddons) "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", "ca" : "català", + "cs" : "\u010De\u0161tina", "da" : "Dansk", "de" : "Deutsch", + "el" : "\u03B5\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", "ga" : "Gaeilge (Irish)", "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", + "hu" : "Magyar nyelv", "id" : "bahasa Indonesia", "is" : "\u0355slenska", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", + "ka" : "\u10E5\u10D0\u10E0\u10D7\u10E3\u10DA\u10D8", "ko" : "\ud55c\uad6d\uc5b4", "nl" : "Nederlands", "nb" : "Norsk bokmå\u0345l",

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/28082'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 38cc505106a37e704ce11a41d22b74cfde36449f Merge: 9e5c4406 c94a5589 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 09:17:17 2018 +0000 Merge remote-tracking branch 'arthur/28082' trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[torbutton/master] Bug 28082: Add locales cs, el, hu, ka
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit c94a5589ffeabf71ea95c3c5c1a3396bdbe14da5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 16 20:10:02 2018 -0700 Bug 28082: Add locales cs, el, hu, ka --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index d13f8259..8f562208 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[tor-browser-build/master] Bug 26475: Disable building Rust with Thin LTO
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit e2da10a29f46762a8561e30c36915f8568d18c71 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 15 09:48:59 2018 +0000 Bug 26475: Disable building Rust with Thin LTO Building Rust with Thin LTO enabled leads to Tor Browser builds on macOS and probably Linux not being reproducible. The exact reason for that is unknown at the moment, although it seems fixed testing nightly Rust source tarballs as of mid-September 2018. We therefore disable Thin LTO for now by setting `codegen-units` to `1`. --- projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/rust/build | 10 ++++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 5d56ad3..a87bf35 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -49,9 +49,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# We need to disable for Stylo right now, as we have reproducibility issues on -# macOS with it enabled, see: #26475. -ac_add_options --disable-stylo # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes diff --git a/projects/rust/build b/projects/rust/build index 936f49f..61a5d50 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -65,6 +65,16 @@ cd /var/tmp/build/rustc-[% c('version') %]-src mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] + +# We need to disable Thin LTO due to reproducibility issues on macOS and +# probably Linux. Alas, there is no direct option available in the config.toml +# in 1.26.1 yet, so we need to toggle this indirectly via `codegen-units`. +[% IF c("var/osx") || c("var/linux") %] + # It seems hard to pass the proper value via ./configure so we resort to our + # old friend `sed`. + sed -i 's/#codegen-units = 1/codegen-units = 1/' config.toml +[% END %] + make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist

1 0