[tor-commits] [tor-messenger-build/master] Remove patch for OS X merged upstream and update cert-installer.patch

[sukhbir at torproject.org]

commit 9ad9d4ff80f740e1858c055f21cc042ec2ca69a3
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sun Sep 13 17:35:38 2015 -0400

    Remove patch for OS X merged upstream and update cert-installer.patch
---
 projects/instantbird/cert-installer.patch          |   12 ---------
 projects/instantbird/config                        |    2 --
 .../instantbird/osx-saved-application-state.patch  |   26 --------------------
 3 files changed, 40 deletions(-)

diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch
index 3ba7e32..06da2ff 100644
--- a/projects/instantbird/cert-installer.patch
+++ b/projects/instantbird/cert-installer.patch
@@ -1,15 +1,3 @@
-diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in
-index 4f48e97..4e02fdf 100644
---- a/im/app/profile/Makefile.in
-+++ b/im/app/profile/Makefile.in
-@@ -15,6 +15,7 @@ include $(topsrcdir)/config/rules.mk
- FILES := \
- 	mimeTypes.rdf \
- 	localstore.rdf \
-+	cert_override.txt \
- 	$(NULL)
- 
- libs:: $(FILES)
 diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in
 index 0234b21..5d20e62 100644
 --- a/im/installer/Makefile.in
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 78e20b8..9715fc4 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -104,8 +104,6 @@ input_files:
   - filename: branding/about.png
   - filename: branding/osx.patch
     enable: '[% c("var/osx") %]'
-  - filename: osx-saved-application-state.patch
-    enable: '[% c("var/osx") %]'
   - filename: cert-installer.patch
     enable: '[% c("var/osx") %]'
   - filename: cert_override.txt
diff --git a/projects/instantbird/osx-saved-application-state.patch b/projects/instantbird/osx-saved-application-state.patch
deleted file mode 100644
index e92e6f7..0000000
--- a/projects/instantbird/osx-saved-application-state.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Arlo Breault <arlolra at gmail.com>
-# Date 1436500709 25200
-#      Thu Jul 09 20:58:29 2015 -0700
-# Node ID 1464e4f7b9d0578859a3c25b55b096be83c782a7
-# Parent  dfe08be4ec2350ca30eb7bc9f95f0ab363f25a10
-Set NSDisablePersistence to prevent disk leaks.
-
-diff --git a/im/app/macbuild/Contents/Info.plist.in b/im/app/macbuild/Contents/Info.plist.in
---- a/im/app/macbuild/Contents/Info.plist.in
-+++ b/im/app/macbuild/Contents/Info.plist.in
-@@ -25,12 +25,14 @@
- 	<key>CFBundleVersion</key>
- 	<string>%APP_VERSION%</string>
- 	<key>NSAppleScriptEnabled</key>
- 	<true/>
- 	<key>LSMinimumSystemVersion</key>
- 	<string>10.6.0</string>
- 	<key>NSSupportsAutomaticGraphicsSwitching</key>
- 	<true/>
-+	<key>NSDisablePersistence</key>
-+	<true/>
- 	<key>NSPrincipalClass</key>
- 	<string>GeckoNSApplication</string>
- </dict>
- </plist>