[tor-commits] [tor-messenger-build/master] mingw build: remove merged patches

[boklm at torproject.org]

commit 5d877d27c238f6d3bf83d43ecc3649062f5ff67e
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Mar 5 19:23:16 2015 +0100

    mingw build: remove merged patches
---
 projects/instantbird/build                     |    6 ----
 projects/instantbird/fix-mingw-build.nsprpatch |   44 ------------------------
 projects/instantbird/fix-mingw-build.patch     |   25 --------------
 3 files changed, 75 deletions(-)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index a486868..91b0320 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -48,12 +48,6 @@ then
 fi
 cd ..
 
-[% IF c("var/windows") %]
-cd mozilla/nsprpub
-patch -p1 < $rootdir/fix-mingw-build.nsprpatch
-cd ../..
-[% END %]
-
 cp ../[% c('input_files_by_name/mozconfig') %] .mozconfig
 ./mozilla/mach build || ./mozilla/mach build
 ./mozilla/mach package
diff --git a/projects/instantbird/fix-mingw-build.nsprpatch b/projects/instantbird/fix-mingw-build.nsprpatch
deleted file mode 100644
index 76040a5..0000000
--- a/projects/instantbird/fix-mingw-build.nsprpatch
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# HG changeset patch
-# User Jacek Caban <jacek at codeweavers.com>
-# Date 1412876662 14400
-# Node ID 133b835b9ad96b3314535a0159bf2909c5429025
-# Parent  84acbf6789fb2f82aefbf605f151888a13211f2d
-Bug 1060401 - change import library name under mingw. r=ted
-
-diff --git a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -78,25 +78,29 @@ ifeq (,$(filter-out WINNT WINCE OS2,$(OS
- 
- #
- # Win95 and OS/2 require library names conforming to the 8.3 rule.
- # other platforms do not.
- #
- ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET)))
- LIBRARY		= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
- SHARED_LIBRARY	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
--IMPORT_LIBRARY	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
- SHARED_LIB_PDB	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
- else
- LIBRARY		= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
- SHARED_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
--IMPORT_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
- SHARED_LIB_PDB	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
- endif
- 
-+ifdef MSC_VER
-+IMPORT_LIBRARY  = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
-+else
-+IMPORT_LIBRARY  = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
-+endif
-+
- else
- 
- LIBRARY		= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
- ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
- SHARED_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr.a
- else
- ifdef MKSHLIB
- SHARED_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-
diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch
index c7e8c48..8c7ca7c 100644
--- a/projects/instantbird/fix-mingw-build.patch
+++ b/projects/instantbird/fix-mingw-build.patch
@@ -1,16 +1,3 @@
-diff --git a/im/Makefile.in b/im/Makefile.in
-index 048ef94facc1..71d1a3409c79 100644
---- a/im/Makefile.in
-+++ b/im/Makefile.in
-@@ -12,7 +12,7 @@ include $(topsrcdir)/config/config.mk
- 
- include $(topsrcdir)/config/rules.mk
- 
--ifeq ($(OS_ARCH),WINNT)
-+ifdef MAKENSISU
- # 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/package-manifest.in b/im/installer/package-manifest.in
 index 0376e05c74a5..70c1a6ada34c 100644
 --- a/im/installer/package-manifest.in
@@ -41,15 +28,3 @@ index 0376e05c74a5..70c1a6ada34c 100644
  
  ; Modules
  @RESPATH@/modules/*
-diff --git a/im/moz.build b/im/moz.build
-index 0778269ffe22..528fb6e371e6 100644
---- a/im/moz.build
-+++ b/im/moz.build
-@@ -16,6 +16,6 @@ DIRS += [
- # app is always last as it packages up the built files on mac.
- DIRS += ['app']
- 
--if CONFIG['OS_ARCH'] == 'WINNT':
-+if CONFIG['MAKENSISU']:
-     DIRS += ['installer/windows']
-