tbb-commits September 2014

tbb-commits@lists.torproject.org

2 participants
83 discussions

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 12811: Add MOZ_D3DCOMPILER_DLL iff available.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 73a628a5cebfa6dae1fca4c5fde072376ce4d06f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 12 09:37:39 2014 +0000 Bug 12811: Add MOZ_D3DCOMPILER_DLL iff available. It seems MOZ_D3DCOMPILER_DLL is not avilable when compiling with mingw-w64. Trying to include it nevertheless breaks the packaging step as `@BINPATH@/@MOZ_D3DCOMPILER_DLL@` resolves to `bin/` which results in including all the things beginning with a `bin/` (again) which is treated as an error in case they got already included. This got fixed more or less by accident by bug 999260 which did not make it into ESR 31 (https://hg.mozilla.org/mozilla-central/rev/8b48386fc226). --- browser/installer/package-manifest.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 521538f..c9117cf 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -597,8 +597,10 @@ #ifdef MOZ_ANGLE_RENDERER @BINPATH@/libEGL.dll @BINPATH@/libGLESv2.dll +#ifdef MOZ_D3DCOMPILER_DLL_PATH @BINPATH@/@MOZ_D3DCOMPILER_DLL@ #endif +#endif ; [Browser Chrome Files] @BINPATH@/browser/chrome.manifest

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 1010972 - Don't use MSVC assembly on mingw. r=jesup
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 907c46f4c33704486b126236974548bb6b7720bc Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 17:24:49 2014 +0200 Bug 1010972 - Don't use MSVC assembly on mingw. r=jesup --- media/libyuv/source/cpu_id.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/libyuv/source/cpu_id.cc b/media/libyuv/source/cpu_id.cc index 84a362e..dec3abf 100644 --- a/media/libyuv/source/cpu_id.cc +++ b/media/libyuv/source/cpu_id.cc @@ -97,7 +97,7 @@ int TestOsSaveYmm() { uint32 xcr0 = 0u; #if defined(_MSC_VER) && defined(_XCR_XFEATURE_ENABLED_MASK) xcr0 = (uint32)(_xgetbv(_XCR_XFEATURE_ENABLED_MASK)); -#elif defined(_M_IX86) +#elif defined(_MSC_VER) && defined(_M_IX86) __asm { xor ecx, ecx // xcr 0 _asm _emit 0x0f _asm _emit 0x01 _asm _emit 0xd0 // For VS2010 and earlier.

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 10715: Enable Webgl for mingw-w64 again.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit c2a5e4b513677a02a57709a6fff4ed9d5d3629c3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 5 13:08:45 2014 +0000 Bug 10715: Enable Webgl for mingw-w64 again. --- .mozconfig-mingw | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.mozconfig-mingw b/.mozconfig-mingw index f3fc080..b4432e2 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -24,8 +24,4 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# Accessibility now builds under MinGw. WebGL still doesn't :/. -#ac_add_options --disable-accessibility -ac_add_options --disable-webgl - #ac_add_options --disable-ctypes

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 12811: Fix for Mozilla's bug 1058778.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit c77ae2b34ba28808c6ada78da752a5e3e1cd8aa5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 1 13:29:52 2014 +0000 Bug 12811: Fix for Mozilla's bug 1058778. This is the fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1058778 which breaks cross-compilation with mingw-w64. --- security/build/moz.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/security/build/moz.build b/security/build/moz.build index 99fe8d6..e295613 100644 --- a/security/build/moz.build +++ b/security/build/moz.build @@ -5,10 +5,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. if CONFIG['MOZ_FOLD_LIBS']: + # Having thid if block here is needed to fix bug 1058778. + if CONFIG['OS_TARGET'] == 'WINNT': + DEFFILE = 'nss3.def' # TODO: The library name can be changed when bug 845217 is fixed. LIBRARY_NAME = 'nss3' FORCE_SHARED_LIB = True - -if CONFIG['OS_TARGET'] == 'WINNT': - DEFFILE = 'nss3.def'

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 12811: WTypes.h -> wtypes.h
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 557444bbe19e080dcfca20552f4dce7c0627c542 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 20 10:42:16 2014 +0000 Bug 12811: WTypes.h -> wtypes.h --- .../google-breakpad/src/google_breakpad/common/breakpad_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/crashreporter/google-breakpad/src/google_breakpad/common/breakpad_types.h b/toolkit/crashreporter/google-breakpad/src/google_breakpad/common/breakpad_types.h index a60c5f3..e92436f 100644 --- a/toolkit/crashreporter/google-breakpad/src/google_breakpad/common/breakpad_types.h +++ b/toolkit/crashreporter/google-breakpad/src/google_breakpad/common/breakpad_types.h @@ -58,7 +58,7 @@ */ #include BREAKPAD_CUSTOM_STDINT_H #else -#include <WTypes.h> +#include <wtypes.h> typedef unsigned __int8 uint8_t; typedef unsigned __int16 uint16_t;

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 973138 - Fixed goto crossing variable declaration (fixes GCC compilation).
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 014431cc558784f89eb9602af976e602f4ea2cff Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 12 11:01:53 2014 +0200 Bug 973138 - Fixed goto crossing variable declaration (fixes GCC compilation). --HG-- extra : rebase_source : 8b488731cb06cab3fc1e74e66f88046583e95fc2 --- mozglue/build/WindowsDllBlocklist.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp index 38bdc24..dde0d8b 100644 --- a/mozglue/build/WindowsDllBlocklist.cpp +++ b/mozglue/build/WindowsDllBlocklist.cpp @@ -487,6 +487,7 @@ patched_LdrLoadDll (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileNam #define DLLNAME_MAX 128 char dllName[DLLNAME_MAX+1]; wchar_t *dll_part; + char *dot; DllBlockInfo *info; int len = moduleFileName->Length / 2; @@ -553,7 +554,7 @@ patched_LdrLoadDll (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileNam // Block a suspicious binary that uses various 12-digit hex strings // e.g. MovieMode.48CA2AEFA22D.dll (bug 973138) - char * dot = strchr(dllName, '.'); + dot = strchr(dllName, '.'); if (dot && (strchr(dot+1, '.') == dot+13)) { char * end = nullptr; _strtoui64(dot+1, &end, 16);

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Disable ICU when cross-compiling; clean-up.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit f7a88a9e7c50eb440a6b3e6f548f715018918868 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 22 11:00:52 2014 +0000 Disable ICU when cross-compiling; clean-up. --- .mozconfig-mac | 8 ++++---- .mozconfig-mingw | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index 01ed601..4abcc7c 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -10,9 +10,6 @@ FLAGS="-arch i386 -isysroot $SYSROOTDIR" # complaining with this patch on compile time anymore it won't start... # CROSS_PRIVATE_FRAMEWORKS=$SYSROOTDIR/System/Library/PrivateFrameworks -# Needed for our otool patch -TOOLCHAIN_PREFIX=x86_64-apple-darwin10- - CC="$ROOTDIR/x86_64-apple-darwin10-clang $FLAGS" CXX="$ROOTDIR/x86_64-apple-darwin10-clang++ $FLAGS" @@ -38,11 +35,14 @@ ac_add_options --disable-debug # See above for a reason why this is currently disabled # ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS -#ac_add_options --disable-updater + ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging # We do not use signed MAR files yet (Mozilla uses them on Windows only). ac_add_options --disable-verify-mar + +# ICU seems still to have cross-compiling issues: +ac_add_options --without-intl-api ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc diff --git a/.mozconfig-mingw b/.mozconfig-mingw index b4432e2..691178b 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -19,6 +19,9 @@ ac_add_options --enable-update-packaging # We do not use signed MAR files yet (Mozilla uses them on Windows only). ac_add_options --disable-verify-mar +# ICU seems still to have cross-compiling issues: +# https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19 +ac_add_options --without-intl-api ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc

1 0

[tor-browser-bundle/master] Bug 12798: Add pulseaudio development headers.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 485c866a13c56dcd54732d085adfa8baa8b197b7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 8 23:26:45 2014 +0000 Bug 12798: Add pulseaudio development headers. --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 509f63a..4284a5d 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -24,6 +24,8 @@ packages: - "libiw-dev" - "hardening-wrapper" - "libgstreamer-plugins-base0.10-dev" +# To pass configure since ESR 31. +- "libpulse-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git"

1 0

[tor-browser-bundle/master] Bug 11189: Adding BUILD_HOSTNAME.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 713656161615ea584ccfa28e96b714b1098c1c8e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 16 14:59:40 2014 +0000 Bug 11189: Adding BUILD_HOSTNAME. --- 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 633444d..07927fb 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -102,7 +102,7 @@ script: | make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" find -type f | xargs touch --date="$REFERENCE_DATETIME" # - make $MAKEOPTS -f client.mk build + make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ # Remove firefox-bin (we don't use it, see ticket #10126) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index be3544e..40693b0 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -60,7 +60,7 @@ script: | make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" find -type f | xargs touch --date="$REFERENCE_DATETIME" # - make $MAKEOPTS -f client.mk build + make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true cp -a obj-macos/dist/firefox/* $INSTDIR diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index d6a6756..2975ab5 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -78,7 +78,7 @@ script: | cp ~/build/i686* ~/build/bin/ export PATH=~/build/bin:$PATH # - make $MAKEOPTS -f client.mk build + make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/

1 0

[tor-browser-bundle/master] Bug 12811: Bumping mingw-w64 commit.
by gk＠torproject.org 30 Sep '14

30 Sep '14

commit 74f0221f33873ff3191bc0f04adb739ad8ee9c6e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 17 10:45:53 2014 +0000 Bug 12811: Bumping mingw-w64 commit. Tag 3.1.0 is too old for building Firefox ESR 31. --- gitian/versions.nightly | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5032058..58d647f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -16,7 +16,8 @@ HTTPSE_TAG=master NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 +# A mingw-w64 commit that works. The 3.1.0 tag is too old. +MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits September 2014