commit 4503a38008faa79b6a3f9d5ebd7e7e88f39ac6c2 Author: Nicolas Vigier boklm@torproject.org Date: Wed Dec 10 17:20:10 2014 +0100

instantbird: remove changes applied upstream --- projects/instantbird/fix-mingw-build.patch | 18 ------------------ 1 file changed, 18 deletions(-)

diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch index 7317ba1..c7e8c48 100644 --- a/projects/instantbird/fix-mingw-build.patch +++ b/projects/instantbird/fix-mingw-build.patch @@ -11,24 +11,6 @@ index 048ef94facc1..71d1a3409c79 100644 # For Windows build the uninstaller during the application build since the # uninstaller is included with the application for mar file generation. libs:: -diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in -index 2a7af7daf20f..6e3855d87f4d 100644 ---- a/im/installer/Makefile.in -+++ b/im/installer/Makefile.in -@@ -50,9 +50,13 @@ DEFINES += -DJAREXT= - - ifdef MOZ_ANGLE_RENDERER - DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) -+ifdef MOZ_D3DCOMPILER_VISTA_DLL - DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL) -+endif -+ifdef MOZ_D3DCOMPILER_XP_DLL - DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL) - endif -+endif - - ifdef MOZ_UPDATER - DEFINES += -DMOZ_UPDATER=1 diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in index 0376e05c74a5..70c1a6ada34c 100644 --- a/im/installer/package-manifest.in