- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 21239: Adapt Linux Firefox descriptor to ESR52
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit f279b94f424c1c7eeabaa0119ccfc8fea326bed6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:36:20 2017 +0000 Bug 21239: Adapt Linux Firefox descriptor to ESR52 --- gitian/descriptors/linux/gitian-firefox.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 4a756b8..d607f6a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -13,15 +13,14 @@ packages: - "libgtk2.0-dev" - "libdbus-glib-1-dev" - "yasm" -- "libasound2-dev" -- "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" -- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # To pass configure since ESR 45. - "libgconf2-dev" +# To pass configure since ESR 52. +- "libx11-xcb-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00" @@ -84,8 +83,7 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib$ARCH # mkdir -p $INSTDIR/Browser/ - mkdir -p $INSTDIR/Debug/Browser/components - mkdir -p $INSTDIR/Debug/Browser/browser/components + mkdir -p $INSTDIR/Debug/Browser/gmp-clearkey/0.1 cd tor-browser # run get-moz-build-date before removing .git, which is used to get the year @@ -121,7 +119,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -133,7 +131,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB @@ -141,7 +139,6 @@ script: | done # ~/build/re-dzip.sh Browser/omni.ja - ~/build/re-dzip.sh Browser/webapprt/omni.ja ~/build/re-dzip.sh Browser/browser/omni.ja ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip Browser/ ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-debug.zip Debug/

1 0

[tor-browser-bundle/master] Bug 18831: Use own Yasm for Firefox cross-compilation
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 910094fc33ae4e75e10fee754bec106e83e0eac5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 29 11:00:23 2017 +0000 Bug 18831: Use own Yasm for Firefox cross-compilation Starting with Firefox ESR52 Yasm < 1.2.0 is not sufficient anymore to compile our browser part for Windows. Ubuntu Precise still ships with such a version, though. We compile our own version until we get off of Precise. --- gitian/descriptors/windows/gitian-firefox.yml | 6 ++++-- gitian/descriptors/windows/gitian-utils.yml | 11 +++++++++++ gitian/fetch-inputs.sh | 5 +++-- gitian/mkbundle-windows.sh | 5 ++++- gitian/verify-tags.sh | 2 +- gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ gitian/versions.nightly | 4 ++++ 8 files changed, 35 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index fabc40d..7ba0615 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -6,7 +6,6 @@ architectures: packages: - "unzip" - "autoconf2.13" -- "yasm" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -14,6 +13,7 @@ remotes: "dir": "tor-browser" files: - "gcc-linux32-precise-utils.zip" +- "yasm-linux32-precise-utils.zip" - "mingw-w64-win32-utils.zip" - "get-moz-build-date" - "re-dzip.sh" @@ -34,6 +34,8 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $OUTDIR/ + # Firefox ESR52 needs Yasm >= 1.2.0 which Ubuntu Precise does not ship. + unzip -d $INSTDIR yasm-linux32-precise-utils.zip unzip -d $INSTDIR gcc-linux32-precise-utils.zip # We need a link to our GCC, otherwise the system cc gets used which points to # /usr/bin/gcc. @@ -42,7 +44,7 @@ script: | unzip -d $INSTDIR gcclibs-win32-utils.zip # Make sure our custom mingw and GCC (as host compiler) get used. export LD_LIBRARY_PATH=$INSTDIR/gcc/lib - export PATH=$INSTDIR/mingw-w64/bin:$INSTDIR/gcc/bin:$PATH + export PATH=$INSTDIR/mingw-w64/bin:$INSTDIR/gcc/bin:$INSTDIR/yasm/bin:$PATH # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > msvcr100.spec diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9c31834..6cfbbf1 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -26,6 +26,7 @@ remotes: files: - "binutils.tar.bz2" - "gcc.tar.bz2" +- "yasm.tar.gz" - "openssl.tar.gz" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" @@ -52,6 +53,15 @@ script: | make install cd .. + # Building Yasm to use it for our Firefox compilation later. Firefox ESR52 + # requires Yasm >= 1.2.0 which Ubuntu Precise does not ship. + tar xaf yasm.tar.gz + cd yasm-* + ./configure --prefix=$INSTDIR/yasm + make $MAKEOPTS + make install + cd .. + # Building binutils tar xjf binutils.tar.bz2 cd binutils* @@ -186,6 +196,7 @@ script: | # We might want to bump binutils independent of bumping mingw-w64. touch binutils-$BINUTILS_VER-win32-utils.zip ~/build/dzip.sh gcc-$GCC_VER-linux32-precise-utils.zip gcc + ~/build/dzip.sh yasm-$YASM_VER-linux32-precise-utils.zip yasm ~/build/dzip.sh mingw-w64-$GCC_VER-win32-utils.zip mingw-w64 ~/build/dzip.sh zlib-${ZLIB_TAG#v}-win32-utils.zip zlib ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-win32-utils.zip libevent diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 44f96aa..b7fcf36 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO YASM do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -174,7 +174,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK are not signed at all) -for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN YASM do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -251,6 +251,7 @@ ln -sf "$GO14_PACKAGE" go14.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz ln -sf "$NSIS_PACKAGE" nsis.tar.bz2 ln -sf "$NSIS_DEBIAN_PACKAGE" nsis-debian.tar.xz +ln -sf "$YASM_PACKAGE" yasm.tar.gz # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6254937..451bb29 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -108,7 +108,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-win32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-win32-utils.zip -o \ - ! -f inputs/nsis-$NSIS_VER-win32-utils.zip ]; + ! -f inputs/nsis-$NSIS_VER-win32-utils.zip -o \ + ! -f inputs/yasm-$YASM_VER-linux32-precise-utils.zip ]; then echo echo "****** Starting Utilities Component of Windows Bundle (1/5 for Windows) ******" @@ -131,6 +132,7 @@ then ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip ln -sf nsis-$NSIS_VER-win32-utils.zip nsis-win32-utils.zip + ln -sf yasm-$YASM_VER-linux32-precise-utils.zip yasm-linux32-precise-utils.zip cd .. #cp -a result/utils-win-res.yml inputs/ else @@ -148,6 +150,7 @@ else ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip ln -sf nsis-$NSIS_VER-win32-utils.zip nsis-win32-utils.zip + ln -sf yasm-$YASM_VER-linux32-precise-utils.zip yasm-linux32-precise-utils.zip cd .. fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 4facfa5..dc207f5 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -147,7 +147,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK are not signed at all) -for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN YASM do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index a13cc08..caaa487 100755 --- a/gitian/versions +++ b/gitian/versions @@ -67,6 +67,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 +YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -100,6 +101,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +YASM_PACKAGE=yasm-${YASM_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 @@ -127,6 +129,7 @@ NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa +YASM_HASH=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -160,3 +163,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2655f23..0fe1846 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -70,6 +70,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 +YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -103,6 +104,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +YASM_PACKAGE=yasm-${YASM_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -130,6 +132,7 @@ NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa +YASM_HASH=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -163,3 +166,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4fdc685..c0b68f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -77,6 +77,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 +YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -110,6 +111,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +YASM_PACKAGE=yasm-${YASM_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -137,6 +139,7 @@ NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa +YASM_HASH=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -170,3 +173,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE}

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 70fd0587c18f111fbae0e64b03ca7a273e5c0e94 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 30 09:18:53 2017 +0000 fixup! TB3: Tor Browser's official .mozconfigs. --- .mozconfig-mingw | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 74f5db8..de86c49b 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -2,6 +2,7 @@ CROSS_COMPILE=1 ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" @@ -26,5 +27,3 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests - -#ac_add_options --disable-ctypes

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Getting Tor Browser to build with accessibility enabled on Windows
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 1be3aec99fc7731563715dcfc7724fcd7ca4a6fb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 10 11:05:34 2017 +0000 Getting Tor Browser to build with accessibility enabled on Windows Patch by Jacek Caban --- ipc/mscom/Interceptor.h | 2 +- other-licenses/ia2/IA2TypeLibrary.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipc/mscom/Interceptor.h b/ipc/mscom/Interceptor.h index ecddbdd..88acdf6 100644 --- a/ipc/mscom/Interceptor.h +++ b/ipc/mscom/Interceptor.h @@ -112,7 +112,7 @@ CreateInterceptor(STAUniquePtr<InterfaceT> aTargetInterface, return E_INVALIDARG; } - REFIID iidTarget = __uuidof(aTargetInterface); + REFIID iidTarget = __uuidof(InterfaceT); STAUniquePtr<IUnknown> targetUnknown(aTargetInterface.release()); return Interceptor::Create(Move(targetUnknown), aEventSink, iidTarget, diff --git a/other-licenses/ia2/IA2TypeLibrary.idl b/other-licenses/ia2/IA2TypeLibrary.idl index 2519aca..97aa08b 100644 --- a/other-licenses/ia2/IA2TypeLibrary.idl +++ b/other-licenses/ia2/IA2TypeLibrary.idl @@ -68,7 +68,7 @@ cpp_quote("") library IAccessible2Lib { importlib ("stdole2.tlb"); - importlib ("oleacc.dll"); + //importlib ("oleacc.dll"); interface IAccessible2; interface IAccessible2_2; interface IAccessible2_3;

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b9d5e7c1a8ec3455857e2752d021b85dcc187ea9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:42:49 2017 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 21239: Use GTK2 for ESR52 Linux builds --- .mozconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mozconfig b/.mozconfig index 7b25244..cde5b49 100755 --- a/.mozconfig +++ b/.mozconfig @@ -9,6 +9,9 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding +# Let's support GTK2 for ESR52 +ac_add_options --enable-default-toolkit=cairo-gtk2 + ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -21,7 +24,6 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc # Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for Linux right now) ac_add_options --disable-eme #ac_add_options --disable-ctypes ac_add_options --enable-jemalloc=4

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1336527 Define RegisterIdlePeriod r=baku
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit a6a430bf6393f51a778b8dfe19103ae708bfcc5c Author: Tom Ritter <tom(a)mozilla.com> Date: Fri Feb 17 13:29:12 2017 -0600 Bug 1336527 Define RegisterIdlePeriod r=baku MozReview-Commit-ID: A41UJ6OHvP7 --HG-- extra : rebase_source : 0191c1bbece94bb9dabbf2daf56351a624efa481 --- dom/workers/WorkerThread.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dom/workers/WorkerThread.h b/dom/workers/WorkerThread.h index d1df133..f128702 100644 --- a/dom/workers/WorkerThread.h +++ b/dom/workers/WorkerThread.h @@ -77,6 +77,14 @@ public: uint32_t RecursionDepth(const WorkerThreadFriendKey& aKey) const; + // Required for MinGW build #1336527 to handle compiler bug: + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79582 + NS_IMETHOD + RegisterIdlePeriod(already_AddRefed<nsIIdlePeriod> aIdlePeriod) override + { + return nsThread::RegisterIdlePeriod(already_AddRefed<nsIIdlePeriod>(aIdlePeriod.take())); + } + NS_DECL_ISUPPORTS_INHERITED private:

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1331349
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit d4b359c42ae2dbd3ab6406cdf99db796602aaedf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 1 11:52:36 2017 +0000 Backport of tjr's patch for bug 1331349 --- js/src/gc/Memory.cpp | 6 +++--- mfbt/Attributes.h | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp index 00f3c23..981ecc0 100644 --- a/js/src/gc/Memory.cpp +++ b/js/src/gc/Memory.cpp @@ -854,7 +854,7 @@ ProtectPages(void* p, size_t size) DWORD oldProtect; if (!VirtualProtect(p, size, PAGE_NOACCESS, &oldProtect)) { snprintf(sCrashReason, sizeof(sCrashReason), - "MOZ_CRASH(VirtualProtect(PAGE_NOACCESS) failed! Error code: %u)", GetLastError()); + "MOZ_CRASH(VirtualProtect(PAGE_NOACCESS) failed! Error code: %lu)", GetLastError()); MOZ_CRASH_ANNOTATE(sCrashReason); MOZ_REALLY_CRASH(); } @@ -875,7 +875,7 @@ MakePagesReadOnly(void* p, size_t size) DWORD oldProtect; if (!VirtualProtect(p, size, PAGE_READONLY, &oldProtect)) { snprintf(sCrashReason, sizeof(sCrashReason), - "MOZ_CRASH(VirtualProtect(PAGE_READONLY) failed! Error code: %u)", GetLastError()); + "MOZ_CRASH(VirtualProtect(PAGE_READONLY) failed! Error code: %lu)", GetLastError()); MOZ_CRASH_ANNOTATE(sCrashReason); MOZ_REALLY_CRASH(); } @@ -896,7 +896,7 @@ UnprotectPages(void* p, size_t size) DWORD oldProtect; if (!VirtualProtect(p, size, PAGE_READWRITE, &oldProtect)) { snprintf(sCrashReason, sizeof(sCrashReason), - "MOZ_CRASH(VirtualProtect(PAGE_READWRITE) failed! Error code: %u)", GetLastError()); + "MOZ_CRASH(VirtualProtect(PAGE_READWRITE) failed! Error code: %lu)", GetLastError()); MOZ_CRASH_ANNOTATE(sCrashReason); MOZ_REALLY_CRASH(); } diff --git a/mfbt/Attributes.h b/mfbt/Attributes.h index df6172f..bcd393c 100644 --- a/mfbt/Attributes.h +++ b/mfbt/Attributes.h @@ -594,7 +594,10 @@ * PR_snprintf and friends, which are "printf-like" but which assign * different meanings to the various formats. */ -#ifdef __GNUC__ +#ifdef __MINGW__ +#define MOZ_FORMAT_PRINTF(stringIndex, firstToCheck) \ + __attribute__ ((format (ms_printf, stringIndex, firstToCheck))) +#elseif __GNUC__ #define MOZ_FORMAT_PRINTF(stringIndex, firstToCheck) \ __attribute__ ((format (printf, stringIndex, firstToCheck))) #else

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1314979
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b63cc0d449954e51a72721f34e3628e75daba59a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 1 19:25:39 2017 +0000 Backport of tjr's patch for bug 1314979 --- build/moz.configure/toolchain.configure | 6 +++++- moz.configure | 6 ++++-- old-configure.in | 12 +++++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 8b24161..288bf48 100644 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -906,5 +906,9 @@ set_define('HAVE_VISIBILITY_ATTRIBUTE', set_config('WRAP_SYSTEM_INCLUDES', wrap_system_includes) set_config('VISIBILITY_FLAGS', visibility_flags) -include('windows.configure') +@depends(target, c_compiler) +def is_windows(target, compiler): + return target.kernel == 'WINNT' and compiler.type in ['msvc', 'clang-cl'] + +include('windows.configure', when=is_windows) include('rust.configure') diff --git a/moz.configure b/moz.configure index ec90697..8457d48 100644 --- a/moz.configure +++ b/moz.configure @@ -278,11 +278,13 @@ system_hunspell = pkg_check_modules('MOZ_HUNSPELL', 'hunspell', set_config('MOZ_SYSTEM_HUNSPELL', depends_if(system_hunspell)(lambda _: True)) -@depends(target) +@depends(target, c_compiler) @imports('os') -def makensis_progs(target): +def makensis_progs(target, compiler): if target.kernel != 'WINNT': return + elif target.kernel == 'WINNT' and compiler.type not in ['msvc', 'clang-cl']: + return candidates = [ 'makensis-3.0b3.exe', diff --git a/old-configure.in b/old-configure.in index 11a7d58..abf8323 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3384,7 +3384,17 @@ if test -n "$MOZ_ANGLE_RENDERER"; then AC_MSG_RESULT([Windows SDK not found.]) fi else - AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.]) + if test "$target" != "$host"; then + case "$target" in + *-mingw*) + AC_MSG_RESULT([Windows SDK not needed for ANGLE in MinGW build.]) + ;; + *) + AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.]) + esac + else + AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.]) + fi fi if test -z "$MOZ_D3DCOMPILER_VISTA_DLL_PATH"; then

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Fix SSE2 compilation for mingw-w64
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 01f545c45a48f7805637b6eb0db26589dc079a96 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 30 09:22:37 2017 +0000 Fix SSE2 compilation for mingw-w64 This is tjr's workaround for bug 1331335. --- gfx/angle/src/libANGLE/moz.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gfx/angle/src/libANGLE/moz.build b/gfx/angle/src/libANGLE/moz.build index 605f30d..d05c77c 100755 --- a/gfx/angle/src/libANGLE/moz.build +++ b/gfx/angle/src/libANGLE/moz.build @@ -112,7 +112,6 @@ UNIFIED_SOURCES += [ '../compiler/translator/VersionGLSL.cpp', '../image_util/copyimage.cpp', '../image_util/imageformats.cpp', - '../image_util/loadimage.cpp', '../image_util/loadimage_etc.cpp', '../third_party/compiler/ArrayBoundsClamper.cpp', '../third_party/murmurhash/MurmurHash3.cpp', @@ -290,10 +289,12 @@ SOURCES += [ '../compiler/translator/glslang_tab.cpp', '../compiler/translator/RewriteTexelFetchOffset.cpp', '../compiler/translator/ShaderLang.cpp', + '../image_util/loadimage.cpp', 'Display.cpp', 'renderer/d3d/DisplayD3D.cpp', 'renderer/d3d/HLSLCompiler.cpp', ] +SOURCES['../image_util/loadimage.cpp'].flags += CONFIG['SSE2_FLAGS'] if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: UNIFIED_SOURCES += [ 'renderer/d3d/d3d11/Blit11.cpp',

1 0

[tor-browser-bundle/master] Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 50b6e6fff4a535044f9b506854535df757125267 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 14 12:10:08 2017 -0400 Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID Use org.torproject as the MOZ_DISTRIBUTION_ID. This results in a bundle ID of org.torproject.torbrowser. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 6f3d3ad..4a756b8 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -96,7 +96,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 6355485..efa7acf 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -69,7 +69,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build # diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index ef956fc..fabc40d 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -77,7 +77,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/

1 0