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 Bug 44167: Drop the nsis-uninstall patch - - - - - 3 changed files: - projects/firefox/build - projects/firefox/config - − projects/firefox/nsis-uninstall.patch Changes: ===================================== projects/firefox/build ===================================== @@ -78,7 +78,6 @@ MOZCONFIG_EOF [% IF c("var/windows") -%] # Make sure widl is not inserting random timestamps, see #21837. export WIDL_TIME_OVERRIDE="0" - patch -p1 < $rootdir/nsis-uninstall.patch # mingw-w64 does not support SEH on 32bit systems. Be explicit about that. export LDFLAGS="[% c('var/flag_noSEH') %]" [% END -%] ===================================== projects/firefox/config ===================================== @@ -195,8 +195,6 @@ input_files: enable: '[% c("var/has_l10n") && c("var/tor-browser") %]' - filename: fix-info-plist.py enable: '[% c("var/macos") %]' - - filename: nsis-uninstall.patch - enable: '[% c("var/windows") %]' - project: rust name: rust - project: cbindgen ===================================== projects/firefox/nsis-uninstall.patch deleted ===================================== @@ -1,40 +0,0 @@ -From 67c1d7d66d99494102832e12059a84fa439c88e0 Mon Sep 17 00:00:00 2001 -From: Sukhbir Singh <sukhbir@torproject.org> -Date: Tue, 12 Jun 2018 21:58:24 -0400 -Subject: [PATCH] Bug 26205: Don't build the uninstaller for Windows during - Firefox compilation - - -diff --git a/browser/Makefile.in b/browser/Makefile.in -index 364f590f5116d..6bda1c5aadaac 100644 ---- a/browser/Makefile.in -+++ b/browser/Makefile.in -@@ -6,10 +6,6 @@ include $(topsrcdir)/config/rules.mk - - ifdef MAKENSISU - --# For Windows build the uninstaller during the application build since the --# uninstaller is included with the application for mar file generation. --libs:: -- $(MAKE) -C installer/windows uninstaller - ifdef ENABLE_TESTS - $(MAKE) -C installer/windows install_deps - endif #ENABLE_TESTS -diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in -index 3827c46cefa8e..f10451b8cada4 100644 ---- a/browser/installer/Makefile.in -+++ b/browser/installer/Makefile.in -@@ -88,10 +88,6 @@ ifdef NECKO_WIFI - DEFINES += -DNECKO_WIFI - endif - --ifdef MAKENSISU --DEFINES += -DHAVE_MAKENSISU=1 --endif -- - ifdef MOZ_DEFAULT_BROWSER_AGENT - DEFINES += -DMOZ_DEFAULT_BROWSER_AGENT=1 - endif --- -2.27.0 - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/85... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/85... You're receiving this email because of your account on gitlab.torproject.org.