boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
8504804a
by Beatriz Rizental at 2025-09-22T17:42:15+02:00
3 changed files:
Changes:
| ... | ... | @@ -78,7 +78,6 @@ MOZCONFIG_EOF |
| 78 | 78 | [% IF c("var/windows") -%]
|
| 79 | 79 | # Make sure widl is not inserting random timestamps, see #21837.
|
| 80 | 80 | export WIDL_TIME_OVERRIDE="0"
|
| 81 | - patch -p1 < $rootdir/nsis-uninstall.patch
|
|
| 82 | 81 | # mingw-w64 does not support SEH on 32bit systems. Be explicit about that.
|
| 83 | 82 | export LDFLAGS="[% c('var/flag_noSEH') %]"
|
| 84 | 83 | [% END -%]
|
| ... | ... | @@ -195,8 +195,6 @@ input_files: |
| 195 | 195 | enable: '[% c("var/has_l10n") && c("var/tor-browser") %]'
|
| 196 | 196 | - filename: fix-info-plist.py
|
| 197 | 197 | enable: '[% c("var/macos") %]'
|
| 198 | - - filename: nsis-uninstall.patch
|
|
| 199 | - enable: '[% c("var/windows") %]'
|
|
| 200 | 198 | - project: rust
|
| 201 | 199 | name: rust
|
| 202 | 200 | - project: cbindgen
|
| 1 | -From 67c1d7d66d99494102832e12059a84fa439c88e0 Mon Sep 17 00:00:00 2001
|
|
| 2 | -From: Sukhbir Singh <sukhbir@torproject.org>
|
|
| 3 | -Date: Tue, 12 Jun 2018 21:58:24 -0400
|
|
| 4 | -Subject: [PATCH] Bug 26205: Don't build the uninstaller for Windows during
|
|
| 5 | - Firefox compilation
|
|
| 6 | - |
|
| 7 | - |
|
| 8 | -diff --git a/browser/Makefile.in b/browser/Makefile.in
|
|
| 9 | -index 364f590f5116d..6bda1c5aadaac 100644
|
|
| 10 | ---- a/browser/Makefile.in
|
|
| 11 | -+++ b/browser/Makefile.in
|
|
| 12 | -@@ -6,10 +6,6 @@ include $(topsrcdir)/config/rules.mk
|
|
| 13 | -
|
|
| 14 | - ifdef MAKENSISU
|
|
| 15 | -
|
|
| 16 | --# For Windows build the uninstaller during the application build since the
|
|
| 17 | --# uninstaller is included with the application for mar file generation.
|
|
| 18 | --libs::
|
|
| 19 | -- $(MAKE) -C installer/windows uninstaller
|
|
| 20 | - ifdef ENABLE_TESTS
|
|
| 21 | - $(MAKE) -C installer/windows install_deps
|
|
| 22 | - endif #ENABLE_TESTS
|
|
| 23 | -diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
|
|
| 24 | -index 3827c46cefa8e..f10451b8cada4 100644
|
|
| 25 | ---- a/browser/installer/Makefile.in
|
|
| 26 | -+++ b/browser/installer/Makefile.in
|
|
| 27 | -@@ -88,10 +88,6 @@ ifdef NECKO_WIFI
|
|
| 28 | - DEFINES += -DNECKO_WIFI
|
|
| 29 | - endif
|
|
| 30 | -
|
|
| 31 | --ifdef MAKENSISU
|
|
| 32 | --DEFINES += -DHAVE_MAKENSISU=1
|
|
| 33 | --endif
|
|
| 34 | --
|
|
| 35 | - ifdef MOZ_DEFAULT_BROWSER_AGENT
|
|
| 36 | - DEFINES += -DMOZ_DEFAULT_BROWSER_AGENT=1
|
|
| 37 | - endif
|
|
| 38 | ---
|
|
| 39 | -2.27.0
|
|
| 40 | - |