[vlc-devel] [PATCH] contrib: sparkle: update to 1.6.1

Sean McGovern gseanmcg at gmail.com
Tue Jul 15 14:16:21 CEST 2014


Felix,

Can you verify that this works on 10.6? I only have access to 10.8 and 10.9 boxes.

Thanks,
Sean McG.
-----Original Message-----
From: Sean McGovern <gseanmcg at gmail.com>
Sender: "vlc-devel" <vlc-devel-bounces at videolan.org>Date: Sat, 12 Jul 2014 15:18:42 
To: <vlc-devel at videolan.org>
Reply-To: Mailing list for VLC media player developers <vlc-devel at videolan.org>
Subject: [vlc-devel] [PATCH] contrib: sparkle: update to 1.6.1

This is the last version to support "Snow Leopard" 10.6
---
 contrib/src/sparkle/SHA512SUMS                     |   2 +-
 contrib/src/sparkle/rules.mak                      |  19 +--
 .../sparkle-fix-compilation-on-snowleopard.patch   |  79 ---------
 contrib/src/sparkle/sparkle-fix-formatstring.patch |  11 --
 ...le-fix-xcode-project-for-current-releases.patch | 189 ---------------------
 5 files changed, 8 insertions(+), 292 deletions(-)
 delete mode 100644 contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch
 delete mode 100644 contrib/src/sparkle/sparkle-fix-formatstring.patch
 delete mode 100644 contrib/src/sparkle/sparkle-fix-xcode-project-for-current-releases.patch

diff --git a/contrib/src/sparkle/SHA512SUMS b/contrib/src/sparkle/SHA512SUMS
index 84be94b..95df2b5 100644
--- a/contrib/src/sparkle/SHA512SUMS
+++ b/contrib/src/sparkle/SHA512SUMS
@@ -1 +1 @@
-645c8878af97a398db5d7835f0fa905a75945d8d5534cbeea1031b69d4ee018633905c6d365c7e8e725c4764009db9549582883582041d73bceacf7d689dc7fa  sparkle-1.5b6.zip
+050541b9ffb98ff98137c9c388ddb9ce73e260a4ff79b68176aa6057a1029d22a7483a2bab4748f81e8f98d18a381d9eb3e1956cf66a8075111fe1c0cdf9bb3c  Sparkle-1.6.1.tar.gz
diff --git a/contrib/src/sparkle/rules.mak b/contrib/src/sparkle/rules.mak
index f0cee79..8cf5042 100644
--- a/contrib/src/sparkle/rules.mak
+++ b/contrib/src/sparkle/rules.mak
@@ -1,25 +1,20 @@
 # sparkle
 
-#SPARKLE_VERSION := 1.5b6
-#SPARKLE_URL := http://sparkle.andymatuschak.org/files/Sparkle%20$(SPARKLE_VERSION).zip
-SPARKLE_GITURL := git://github.com/andymatuschak/Sparkle.git
+SPARKLE_VERSION := 1.6.1
+SPARKLE_URL := https://github.com/sparkle-project/Sparkle/archive/$(SPARKLE_VERSION).tar.gz
+#SPARKLE_GITURL := git://github.com/andymatuschak/Sparkle.git
 
 ifdef HAVE_MACOSX
 PKGS += sparkle
 endif
 
-$(TARBALLS)/sparkle-git.tar.xz:
-	$(call download_git,$(SPARKLE_GITURL),,HEAD)
+$(TARBALLS)/Sparkle-$(SPARKLE_VERSION).tar.gz:
+	$(call download,$(SPARKLE_URL))
 
-.sum-sparkle: sparkle-git.tar.xz
-	$(warning $@ not implemented)
-	touch $@
+.sum-sparkle: Sparkle-$(SPARKLE_VERSION).tar.gz
 
-sparkle: sparkle-git.tar.xz .sum-sparkle
+sparkle: Sparkle-$(SPARKLE_VERSION).tar.gz .sum-sparkle
 	$(UNPACK)
-	$(APPLY) $(SRC)/sparkle/sparkle-fix-formatstring.patch
-	$(APPLY) $(SRC)/sparkle/sparkle-fix-xcode-project-for-current-releases.patch
-	$(APPLY) $(SRC)/sparkle/sparkle-fix-compilation-on-snowleopard.patch
 	$(MOVE)
 
 .sparkle: sparkle
diff --git a/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch b/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch
deleted file mode 100644
index ceefab6..0000000
--- a/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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
-@@ -15,6 +15,12 @@
- #import "SUConstants.h"
- #import "SULog.h"
- 
-+#ifndef MAC_OS_X_VERSION_10_7
-+enum {
-+    NSXMLNodeLoadExternalEntitiesSameOriginOnly = 1UL << 15
-+};
-+#endif
-+
- @interface NSXMLElement (SUAppcastExtensions)
- - (NSDictionary *)attributesAsDictionary;
- @end
-@@ -32,7 +38,7 @@
- }
- @end
- 
-- 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
-@@ -12,6 +12,13 @@
- #import "SULog.h"
- #import <CoreServices/CoreServices.h>
- 
-+ at interface SUDiskImageUnarchiver ()
-+- (void)extractDMGWithPassword:(NSString *)password;
-+- (BOOL)isEncrypted:(NSData*)resultData;
-+- (void)continueWithPassword:(NSString *)password;
-+- (void)requestPasswordFromDelegate;
-+ at end
-+
- @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
- 
diff --git a/contrib/src/sparkle/sparkle-fix-formatstring.patch b/contrib/src/sparkle/sparkle-fix-formatstring.patch
deleted file mode 100644
index 7229b63..0000000
--- a/contrib/src/sparkle/sparkle-fix-formatstring.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sparkle/SUUIBasedUpdateDriver.m	2013-04-23 00:12:42.000000000 +0200
-+++ sparkle-fixed/SUUIBasedUpdateDriver.m	2013-04-23 00:17:00.000000000 +0200
-@@ -201,7 +201,7 @@
- 
- - (void)abortUpdateWithError:(NSError *)error
- {
--	NSAlert *alert = [NSAlert alertWithMessageText:SULocalizedString(@"Update Error!", nil) defaultButton:SULocalizedString(@"Cancel Update", nil) alternateButton:nil otherButton:nil informativeTextWithFormat:[error localizedDescription]];
-+	NSAlert *alert = [NSAlert alertWithMessageText:SULocalizedString(@"Update Error!", nil) defaultButton:SULocalizedString(@"Cancel Update", nil) alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@",[error localizedDescription]];
- 	[self showModalAlert:alert];
- 	[super abortUpdateWithError:error];
- }
diff --git a/contrib/src/sparkle/sparkle-fix-xcode-project-for-current-releases.patch b/contrib/src/sparkle/sparkle-fix-xcode-project-for-current-releases.patch
deleted file mode 100644
index 9f38e44..0000000
--- a/contrib/src/sparkle/sparkle-fix-xcode-project-for-current-releases.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff -ru sparkle/Sparkle.xcodeproj/project.pbxproj sparkle-fixed/Sparkle.xcodeproj/project.pbxproj
---- sparkle/Sparkle.xcodeproj/project.pbxproj	2014-01-11 18:03:33.000000000 +0100
-+++ sparkle-fixed/Sparkle.xcodeproj/project.pbxproj	2014-01-11 18:10:24.000000000 +0100
-@@ -1368,6 +1368,22 @@
- 			baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
-+				WARNING_CFLAGS = (
-+					"-Wall",
-+					"-Wno-unused-parameter",
-+					"-Wundef",
-+					"-Wendif-labels",
-+					"-Wpointer-arith",
-+					"-Wcast-align",
-+					"-Wwrite-strings",
-+					"-Wmissing-format-attribute",
-+					"-Wpacked",
-+					"-Wredundant-decls",
-+					"-Winline",
-+					"-Wdisabled-optimization",
-+					"-Winvalid-pch",
-+				);
- 			};
- 			name = Debug;
- 		};
-@@ -1376,18 +1392,36 @@
- 			baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
-+				WARNING_CFLAGS = (
-+					"-Wall",
-+					"-Wno-unused-parameter",
-+					"-Wundef",
-+					"-Wendif-labels",
-+					"-Wpointer-arith",
-+					"-Wcast-align",
-+					"-Wwrite-strings",
-+					"-Wmissing-format-attribute",
-+					"-Wpacked",
-+					"-Wredundant-decls",
-+					"-Winline",
-+					"-Wdisabled-optimization",
-+					"-Winvalid-pch",
-+				);
- 			};
- 			name = Release;
- 		};
- 		1DEB91B208733DA50010E9CD /* Debug */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
- 		1DEB91B308733DA50010E9CD /* Release */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};
-@@ -1412,6 +1446,7 @@
- 					AppKit,
- 				);
- 				PRODUCT_NAME = finish_installation;
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -1435,6 +1470,7 @@
- 					AppKit,
- 				);
- 				PRODUCT_NAME = finish_installation;
-+				SDKROOT = macosx;
- 				ZERO_LINK = NO;
- 			};
- 			name = Release;
-@@ -1457,6 +1493,7 @@
- 					AppKit,
- 				);
- 				PRODUCT_NAME = finish_installation;
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1464,6 +1501,7 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 5D06E8F20FD68D21005AE3F6 /* ConfigBinaryDeltaDebug.xcconfig */;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -1471,6 +1509,7 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};
-@@ -1478,12 +1517,14 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
- 		61072EAD0DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1492,6 +1533,22 @@
- 			baseConfigurationReference = 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
-+				WARNING_CFLAGS = (
-+					"-Wall",
-+					"-Wno-unused-parameter",
-+					"-Wundef",
-+					"-Wendif-labels",
-+					"-Wpointer-arith",
-+					"-Wcast-align",
-+					"-Wwrite-strings",
-+					"-Wmissing-format-attribute",
-+					"-Wpacked",
-+					"-Wredundant-decls",
-+					"-Winline",
-+					"-Wdisabled-optimization",
-+					"-Winvalid-pch",
-+				);
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1500,6 +1557,7 @@
- 			baseConfigurationReference = 615409A8103BA09100125AF1 /* ConfigTestAppReleaseGCSupport.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1508,6 +1566,7 @@
- 			baseConfigurationReference = FA302AFD109D13190060F891 /* ConfigUnitTestReleaseGCSupport.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1516,6 +1575,7 @@
- 			baseConfigurationReference = FA3AAF3A1050B273004B3130 /* ConfigUnitTestDebug.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -1524,6 +1584,7 @@
- 			baseConfigurationReference = FA3AAF391050B273004B3130 /* ConfigUnitTestRelease.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};
-@@ -1532,6 +1593,7 @@
- 			baseConfigurationReference = FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -1540,6 +1602,7 @@
- 			baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};
-- 
1.8.5.2 (Apple Git-48)

_______________________________________________
vlc-devel mailing list
To unsubscribe or modify your subscription options:
https://mailman.videolan.org/listinfo/vlc-devel


More information about the vlc-devel mailing list