[vlc-commits] contrib: sparkle: update snow leopard patch

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Aug  6 14:49:48 2014 +0200| [43375a497f2f71cfb3488152e2158708e5aa2eff] | committer: Felix Paul Kühne

contrib: sparkle: update snow leopard patch

(cherry picked from commit b88ae64d8e0b3b971d5eda00a0ac938a8d39544e)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=43375a497f2f71cfb3488152e2158708e5aa2eff
---

 .../sparkle-fix-compilation-on-snowleopard.patch   |   57 ++++----------------
 1 file changed, 10 insertions(+), 47 deletions(-)

diff --git a/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch b/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch
index ceefab6..efe1e6b 100644
--- a/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch
+++ b/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch
@@ -1,6 +1,6 @@
-diff -ru sparkle/SUAppcast.m sparkle-fixed/SUAppcast.m
---- sparkle/SUAppcast.m	2013-12-09 15:23:42.000000000 +0100
-+++ sparkle-fixed/SUAppcast.m	2014-01-31 13:23:11.000000000 +0100
+diff -ru sparkle/Sparkle/SUAppcast.m sparkle-fixed/Sparkle/SUAppcast.m
+--- sparkle/Sparkle/SUAppcast.m	2013-12-09 15:23:42.000000000 +0100
++++ sparkle-fixed/Sparkle/SUAppcast.m	2014-01-31 13:23:11.000000000 +0100
 @@ -15,6 +15,12 @@
  #import "SUConstants.h"
  #import "SULog.h"
@@ -12,7 +12,7 @@ diff -ru sparkle/SUAppcast.m sparkle-fixed/SUAppcast.m
 +#endif
 +
  @interface NSXMLElement (SUAppcastExtensions)
- - (NSDictionary *)attributesAsDictionary;
+ @property (readonly, copy) NSDictionary *attributesAsDictionary;
  @end
 @@ -32,7 +38,7 @@
  }
@@ -20,33 +20,12 @@ diff -ru sparkle/SUAppcast.m sparkle-fixed/SUAppcast.m
  
 - at interface SUAppcast () <NSURLDownloadDelegate>
 + at interface SUAppcast () // implicit NSURLDownloadDelegate
- - (void)reportError:(NSError *)error;
- - (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes;
- @end
-@@ -95,7 +101,7 @@
- 	if (downloadFilename)
- 	{
-         NSUInteger options = 0;
--        if (NSAppKitVersionNumber < NSAppKitVersionNumber10_7) {
-+        if (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber > 1038) { // Snow Leopard
-             // In order to avoid including external entities when parsing the appcast (a potential security vulnerability; see https://github.com/andymatuschak/Sparkle/issues/169), we ask NSXMLDocument to "tidy" the XML first. This happens to remove these external entities; it wouldn't be a future-proof approach, but it worked in these historical versions of OS X, and we have a more rigorous approach for 10.7+.
-             options = NSXMLDocumentTidyXML;
-         } else {
-diff -ru sparkle/SUBasicUpdateDriver.m sparkle-fixed/SUBasicUpdateDriver.m
---- sparkle/SUBasicUpdateDriver.m	2013-12-09 15:23:42.000000000 +0100
-+++ sparkle-fixed/SUBasicUpdateDriver.m	2014-01-31 13:23:36.000000000 +0100
-@@ -21,7 +21,7 @@
- #import "SUCodeSigningVerifier.h"
- #import "SUUpdater_Private.h"
- 
-- at interface SUBasicUpdateDriver () <NSURLDownloadDelegate>; @end
-+ at interface SUBasicUpdateDriver (); @end // implicit NSURLDownloadDelegate
- 
- 
- @implementation SUBasicUpdateDriver
-diff -ru sparkle/SUDiskImageUnarchiver.m sparkle-fixed/SUDiskImageUnarchiver.m
---- sparkle/SUDiskImageUnarchiver.m	2013-12-09 15:23:42.000000000 +0100
-+++ sparkle-fixed/SUDiskImageUnarchiver.m	2014-01-31 13:25:58.000000000 +0100
+ @property (copy) NSString *downloadFilename;
+ @property (strong) NSURLDownload *download;
+ @property (copy) NSArray *items;
+diff -ru sparkle/Sparkle/SUDiskImageUnarchiver.m sparkle-fixed/Sparkle/SUDiskImageUnarchiver.m
+--- sparkle/Sparkle/SUDiskImageUnarchiver.m	2013-12-09 15:23:42.000000000 +0100
++++ sparkle-fixed/Sparkle/SUDiskImageUnarchiver.m	2014-01-31 13:25:58.000000000 +0100
 @@ -12,6 +12,13 @@
  #import "SULog.h"
  #import <CoreServices/CoreServices.h>
@@ -61,19 +40,3 @@ diff -ru sparkle/SUDiskImageUnarchiver.m sparkle-fixed/SUDiskImageUnarchiver.m
  @implementation SUDiskImageUnarchiver
  
  + (BOOL)canUnarchivePath:(NSString *)path
-diff -ru sparkle/SUPasswordPrompt.m sparkle-fixed/SUPasswordPrompt.m
---- sparkle/SUPasswordPrompt.m	2013-12-09 15:23:42.000000000 +0100
-+++ sparkle-fixed/SUPasswordPrompt.m	2014-01-31 13:27:58.000000000 +0100
-@@ -8,6 +8,12 @@
- 
- #import "SUPasswordPrompt.h"
- 
-+ at interface SUPasswordPrompt ()
-+- (void)setName:(NSString*)name;
-+- (void)setIcon:(NSImage*)icon;
-+- (NSImage *)icon;
-+- (void)setPassword:(NSString*)password;
-+ at end
- 
- @implementation SUPasswordPrompt
-