morgan pushed to branch maint-14.0 at The Tor Project / Applications / 
tor-browser-build


Commits:
a6600db7 by Morgan at 2024-11-14T00:08:29+00:00
Bug 41291: Enable mingw changes for WebRTC unconditionally

- - - - -
2272e06e by Morgan at 2024-11-14T00:09:41+00:00
Bug 41299: Mullvad Browser 14.0 build2

- - - - -


3 changed files:

- projects/mingw-w64-clang/build
- projects/mingw-w64-clang/config
- rbm.conf


Changes:

=====================================
projects/mingw-w64-clang/build
=====================================
@@ -89,9 +89,7 @@ EOF
   patch -p1 < "$rootdir/mingw-dispatchqueue.patch"
   patch -p1 < "$rootdir/mingw-ts_sd.patch"
   patch -p1 < "$rootdir/mingw-composition.patch"
-  [% IF !c("var/release") %]
-    patch -p1 < "$rootdir/mingw-webrtc.patch"
-  [% END %]
+  patch -p1 < "$rootdir/mingw-webrtc.patch"
 
   cd $builddir/mingw-w64-clang/mingw-w64-headers
   mkdir build && cd build


=====================================
projects/mingw-w64-clang/config
=====================================
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% pc("llvm-project", "version") 
%]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
 git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64
-git_hash: '[% IF c("var/release") %]cd4cf9b279f8fb0815f8b9665d3cea60a30290bc[% 
ELSE %]4ef04b0a7f7a20735de2f58b5c0496fcb4c7d191[% END -%]'
+git_hash: '4ef04b0a7f7a20735de2f58b5c0496fcb4c7d191'
 version: '[% c("abbrev") %]'
 container:
   use_container: 1
@@ -36,4 +36,3 @@ input_files:
   - filename: mingw-ts_sd.patch
   - filename: mingw-composition.patch
   - filename: mingw-webrtc.patch
-    enable: '[% !c("var/release") %]'
\ No newline at end of file


=====================================
rbm.conf
=====================================
@@ -74,7 +74,7 @@ buildconf:
 
 var:
   torbrowser_version: '[% IF c("var/tor-browser") %]14.0.2[% ELSE %]14.0[% END 
%]'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   # This should be the date of when the build is started. For the build
   # to be reproducible, browser_release_date should always be in the past.
   browser_release_date: '2024/11/12 20:16:21'



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/0665c0226fa24f3d6159f6c45de7cdce62872f74...2272e06eafd4f91eac266ee153dcb52b43109c68

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/0665c0226fa24f3d6159f6c45de7cdce62872f74...2272e06eafd4f91eac266ee153dcb52b43109c68
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to