<div dir="ltr">Oops, accidental re-send. Please ignore (but I still need confirmation it doesn't cause a regression on 10.6).</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jul 25, 2014 at 7:21 PM, Sean McGovern <span dir="ltr"><<a href="mailto:gseanmcg@gmail.com" target="_blank">gseanmcg@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This is the last version to support "Snow Leopard" 10.6<br>
---<br>
contrib/src/sparkle/SHA512SUMS | 2 +-<br>
contrib/src/sparkle/rules.mak | 19 +--<br>
.../sparkle-fix-compilation-on-snowleopard.patch | 79 ---------<br>
contrib/src/sparkle/sparkle-fix-formatstring.patch | 11 --<br>
...le-fix-xcode-project-for-current-releases.patch | 189 ---------------------<br>
5 files changed, 8 insertions(+), 292 deletions(-)<br>
delete mode 100644 contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch<br>
delete mode 100644 contrib/src/sparkle/sparkle-fix-formatstring.patch<br>
delete mode 100644 contrib/src/sparkle/sparkle-fix-xcode-project-for-current-releases.patch<br>
<br>
diff --git a/contrib/src/sparkle/SHA512SUMS b/contrib/src/sparkle/SHA512SUMS<br>
index 84be94b..95df2b5 100644<br>
--- a/contrib/src/sparkle/SHA512SUMS<br>
+++ b/contrib/src/sparkle/SHA512SUMS<br>
@@ -1 +1 @@<br>
-645c8878af97a398db5d7835f0fa905a75945d8d5534cbeea1031b69d4ee018633905c6d365c7e8e725c4764009db9549582883582041d73bceacf7d689dc7fa sparkle-1.5b6.zip<br>
+050541b9ffb98ff98137c9c388ddb9ce73e260a4ff79b68176aa6057a1029d22a7483a2bab4748f81e8f98d18a381d9eb3e1956cf66a8075111fe1c0cdf9bb3c Sparkle-1.6.1.tar.gz<br>
diff --git a/contrib/src/sparkle/rules.mak b/contrib/src/sparkle/rules.mak<br>
index f0cee79..8cf5042 100644<br>
--- a/contrib/src/sparkle/rules.mak<br>
+++ b/contrib/src/sparkle/rules.mak<br>
@@ -1,25 +1,20 @@<br>
# sparkle<br>
<br>
-#SPARKLE_VERSION := 1.5b6<br>
-#SPARKLE_URL := <a href="http://sparkle.andymatuschak.org/files/Sparkle%20$(SPARKLE_VERSION).zip" target="_blank">http://sparkle.andymatuschak.org/files/Sparkle%20$(SPARKLE_VERSION).zip</a><br>
-SPARKLE_GITURL := git://<a href="http://github.com/andymatuschak/Sparkle.git" target="_blank">github.com/andymatuschak/Sparkle.git</a><br>
+SPARKLE_VERSION := 1.6.1<br>
+SPARKLE_URL := <a href="https://github.com/sparkle-project/Sparkle/archive/$(SPARKLE_VERSION).tar.gz
+#SPARKLE_GITURL" target="_blank">https://github.com/sparkle-project/Sparkle/archive/$(SPARKLE_VERSION).tar.gz<br>
+#SPARKLE_GITURL</a> := git://<a href="http://github.com/andymatuschak/Sparkle.git" target="_blank">github.com/andymatuschak/Sparkle.git</a><br>
<br>
ifdef HAVE_MACOSX<br>
PKGS += sparkle<br>
endif<br>
<br>
-$(TARBALLS)/sparkle-git.tar.xz:<br>
- $(call download_git,$(SPARKLE_GITURL),,HEAD)<br>
+$(TARBALLS)/Sparkle-$(SPARKLE_VERSION).tar.gz:<br>
+ $(call download,$(SPARKLE_URL))<br>
<br>
-.sum-sparkle: sparkle-git.tar.xz<br>
- $(warning $@ not implemented)<br>
- touch $@<br>
+.sum-sparkle: Sparkle-$(SPARKLE_VERSION).tar.gz<br>
<br>
-sparkle: sparkle-git.tar.xz .sum-sparkle<br>
+sparkle: Sparkle-$(SPARKLE_VERSION).tar.gz .sum-sparkle<br>
$(UNPACK)<br>
- $(APPLY) $(SRC)/sparkle/sparkle-fix-formatstring.patch<br>
- $(APPLY) $(SRC)/sparkle/sparkle-fix-xcode-project-for-current-releases.patch<br>
- $(APPLY) $(SRC)/sparkle/sparkle-fix-compilation-on-snowleopard.patch<br>
$(MOVE)<br>
<br>
.sparkle: sparkle<br>
diff --git a/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch b/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch<br>
deleted file mode 100644<br>
index ceefab6..0000000<br>
--- a/contrib/src/sparkle/sparkle-fix-compilation-on-snowleopard.patch<br>
+++ /dev/null<br>
@@ -1,79 +0,0 @@<br>
-diff -ru sparkle/SUAppcast.m sparkle-fixed/SUAppcast.m<br>
---- sparkle/SUAppcast.m 2013-12-09 15:23:42.000000000 +0100<br>
-+++ sparkle-fixed/SUAppcast.m 2014-01-31 13:23:11.000000000 +0100<br>
-@@ -15,6 +15,12 @@<br>
- #import "SUConstants.h"<br>
- #import "SULog.h"<br>
-<br>
-+#ifndef MAC_OS_X_VERSION_10_7<br>
-+enum {<br>
-+ NSXMLNodeLoadExternalEntitiesSameOriginOnly = 1UL << 15<br>
-+};<br>
-+#endif<br>
-+<br>
- @interface NSXMLElement (SUAppcastExtensions)<br>
- - (NSDictionary *)attributesAsDictionary;<br>
- @end<br>
-@@ -32,7 +38,7 @@<br>
- }<br>
- @end<br>
-<br>
--@interface SUAppcast () <NSURLDownloadDelegate><br>
-+@interface SUAppcast () // implicit NSURLDownloadDelegate<br>
- - (void)reportError:(NSError *)error;<br>
- - (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes;<br>
- @end<br>
-@@ -95,7 +101,7 @@<br>
- if (downloadFilename)<br>
- {<br>
- NSUInteger options = 0;<br>
-- if (NSAppKitVersionNumber < NSAppKitVersionNumber10_7) {<br>
-+ if (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber > 1038) { // Snow Leopard<br>
- // In order to avoid including external entities when parsing the appcast (a potential security vulnerability; see <a href="https://github.com/andymatuschak/Sparkle/issues/169" target="_blank">https://github.com/andymatuschak/Sparkle/issues/169</a>), 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+.<br>
- options = NSXMLDocumentTidyXML;<br>
- } else {<br>
-diff -ru sparkle/SUBasicUpdateDriver.m sparkle-fixed/SUBasicUpdateDriver.m<br>
---- sparkle/SUBasicUpdateDriver.m 2013-12-09 15:23:42.000000000 +0100<br>
-+++ sparkle-fixed/SUBasicUpdateDriver.m 2014-01-31 13:23:36.000000000 +0100<br>
-@@ -21,7 +21,7 @@<br>
- #import "SUCodeSigningVerifier.h"<br>
- #import "SUUpdater_Private.h"<br>
-<br>
--@interface SUBasicUpdateDriver () <NSURLDownloadDelegate>; @end<br>
-+@interface SUBasicUpdateDriver (); @end // implicit NSURLDownloadDelegate<br>
-<br>
-<br>
- @implementation SUBasicUpdateDriver<br>
-diff -ru sparkle/SUDiskImageUnarchiver.m sparkle-fixed/SUDiskImageUnarchiver.m<br>
---- sparkle/SUDiskImageUnarchiver.m 2013-12-09 15:23:42.000000000 +0100<br>
-+++ sparkle-fixed/SUDiskImageUnarchiver.m 2014-01-31 13:25:58.000000000 +0100<br>
-@@ -12,6 +12,13 @@<br>
- #import "SULog.h"<br>
- #import <CoreServices/CoreServices.h><br>
-<br>
-+@interface SUDiskImageUnarchiver ()<br>
-+- (void)extractDMGWithPassword:(NSString *)password;<br>
-+- (BOOL)isEncrypted:(NSData*)resultData;<br>
-+- (void)continueWithPassword:(NSString *)password;<br>
-+- (void)requestPasswordFromDelegate;<br>
-+@end<br>
-+<br>
- @implementation SUDiskImageUnarchiver<br>
-<br>
- + (BOOL)canUnarchivePath:(NSString *)path<br>
-diff -ru sparkle/SUPasswordPrompt.m sparkle-fixed/SUPasswordPrompt.m<br>
---- sparkle/SUPasswordPrompt.m 2013-12-09 15:23:42.000000000 +0100<br>
-+++ sparkle-fixed/SUPasswordPrompt.m 2014-01-31 13:27:58.000000000 +0100<br>
-@@ -8,6 +8,12 @@<br>
-<br>
- #import "SUPasswordPrompt.h"<br>
-<br>
-+@interface SUPasswordPrompt ()<br>
-+- (void)setName:(NSString*)name;<br>
-+- (void)setIcon:(NSImage*)icon;<br>
-+- (NSImage *)icon;<br>
-+- (void)setPassword:(NSString*)password;<br>
-+@end<br>
-<br>
- @implementation SUPasswordPrompt<br>
-<br>
diff --git a/contrib/src/sparkle/sparkle-fix-formatstring.patch b/contrib/src/sparkle/sparkle-fix-formatstring.patch<br>
deleted file mode 100644<br>
index 7229b63..0000000<br>
--- a/contrib/src/sparkle/sparkle-fix-formatstring.patch<br>
+++ /dev/null<br>
@@ -1,11 +0,0 @@<br>
---- sparkle/SUUIBasedUpdateDriver.m 2013-04-23 00:12:42.000000000 +0200<br>
-+++ sparkle-fixed/SUUIBasedUpdateDriver.m 2013-04-23 00:17:00.000000000 +0200<br>
-@@ -201,7 +201,7 @@<br>
-<br>
- - (void)abortUpdateWithError:(NSError *)error<br>
- {<br>
-- NSAlert *alert = [NSAlert alertWithMessageText:SULocalizedString(@"Update Error!", nil) defaultButton:SULocalizedString(@"Cancel Update", nil) alternateButton:nil otherButton:nil informativeTextWithFormat:[error localizedDescription]];<br>
-+ NSAlert *alert = [NSAlert alertWithMessageText:SULocalizedString(@"Update Error!", nil) defaultButton:SULocalizedString(@"Cancel Update", nil) alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@",[error localizedDescription]];<br>
- [self showModalAlert:alert];<br>
- [super abortUpdateWithError:error];<br>
- }<br>
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<br>
deleted file mode 100644<br>
index 9f38e44..0000000<br>
--- a/contrib/src/sparkle/sparkle-fix-xcode-project-for-current-releases.patch<br>
+++ /dev/null<br>
@@ -1,189 +0,0 @@<br>
-diff -ru sparkle/Sparkle.xcodeproj/project.pbxproj sparkle-fixed/Sparkle.xcodeproj/project.pbxproj<br>
---- sparkle/Sparkle.xcodeproj/project.pbxproj 2014-01-11 18:03:33.000000000 +0100<br>
-+++ sparkle-fixed/Sparkle.xcodeproj/project.pbxproj 2014-01-11 18:10:24.000000000 +0100<br>
-@@ -1368,6 +1368,22 @@<br>
- baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;<br>
- buildSettings = {<br>
- COMBINE_HIDPI_IMAGES = YES;<br>
-+ SDKROOT = macosx;<br>
-+ WARNING_CFLAGS = (<br>
-+ "-Wall",<br>
-+ "-Wno-unused-parameter",<br>
-+ "-Wundef",<br>
-+ "-Wendif-labels",<br>
-+ "-Wpointer-arith",<br>
-+ "-Wcast-align",<br>
-+ "-Wwrite-strings",<br>
-+ "-Wmissing-format-attribute",<br>
-+ "-Wpacked",<br>
-+ "-Wredundant-decls",<br>
-+ "-Winline",<br>
-+ "-Wdisabled-optimization",<br>
-+ "-Winvalid-pch",<br>
-+ );<br>
- };<br>
- name = Debug;<br>
- };<br>
-@@ -1376,18 +1392,36 @@<br>
- baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */;<br>
- buildSettings = {<br>
- COMBINE_HIDPI_IMAGES = YES;<br>
-+ SDKROOT = macosx;<br>
-+ WARNING_CFLAGS = (<br>
-+ "-Wall",<br>
-+ "-Wno-unused-parameter",<br>
-+ "-Wundef",<br>
-+ "-Wendif-labels",<br>
-+ "-Wpointer-arith",<br>
-+ "-Wcast-align",<br>
-+ "-Wwrite-strings",<br>
-+ "-Wmissing-format-attribute",<br>
-+ "-Wpacked",<br>
-+ "-Wredundant-decls",<br>
-+ "-Winline",<br>
-+ "-Wdisabled-optimization",<br>
-+ "-Winvalid-pch",<br>
-+ );<br>
- };<br>
- name = Release;<br>
- };<br>
- 1DEB91B208733DA50010E9CD /* Debug */ = {<br>
- isa = XCBuildConfiguration;<br>
- buildSettings = {<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = Debug;<br>
- };<br>
- 1DEB91B308733DA50010E9CD /* Release */ = {<br>
- isa = XCBuildConfiguration;<br>
- buildSettings = {<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = Release;<br>
- };<br>
-@@ -1412,6 +1446,7 @@<br>
- AppKit,<br>
- );<br>
- PRODUCT_NAME = finish_installation;<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = Debug;<br>
- };<br>
-@@ -1435,6 +1470,7 @@<br>
- AppKit,<br>
- );<br>
- PRODUCT_NAME = finish_installation;<br>
-+ SDKROOT = macosx;<br>
- ZERO_LINK = NO;<br>
- };<br>
- name = Release;<br>
-@@ -1457,6 +1493,7 @@<br>
- AppKit,<br>
- );<br>
- PRODUCT_NAME = finish_installation;<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = "Release (GC dual-mode; 10.5+)";<br>
- };<br>
-@@ -1464,6 +1501,7 @@<br>
- isa = XCBuildConfiguration;<br>
- baseConfigurationReference = 5D06E8F20FD68D21005AE3F6 /* ConfigBinaryDeltaDebug.xcconfig */;<br>
- buildSettings = {<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = Debug;<br>
- };<br>
-@@ -1471,6 +1509,7 @@<br>
- isa = XCBuildConfiguration;<br>
- baseConfigurationReference = 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */;<br>
- buildSettings = {<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = Release;<br>
- };<br>
-@@ -1478,12 +1517,14 @@<br>
- isa = XCBuildConfiguration;<br>
- baseConfigurationReference = 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */;<br>
- buildSettings = {<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = "Release (GC dual-mode; 10.5+)";<br>
- };<br>
- 61072EAD0DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */ = {<br>
- isa = XCBuildConfiguration;<br>
- buildSettings = {<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = "Release (GC dual-mode; 10.5+)";<br>
- };<br>
-@@ -1492,6 +1533,22 @@<br>
- baseConfigurationReference = 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */;<br>
- buildSettings = {<br>
- COMBINE_HIDPI_IMAGES = YES;<br>
-+ SDKROOT = macosx;<br>
-+ WARNING_CFLAGS = (<br>
-+ "-Wall",<br>
-+ "-Wno-unused-parameter",<br>
-+ "-Wundef",<br>
-+ "-Wendif-labels",<br>
-+ "-Wpointer-arith",<br>
-+ "-Wcast-align",<br>
-+ "-Wwrite-strings",<br>
-+ "-Wmissing-format-attribute",<br>
-+ "-Wpacked",<br>
-+ "-Wredundant-decls",<br>
-+ "-Winline",<br>
-+ "-Wdisabled-optimization",<br>
-+ "-Winvalid-pch",<br>
-+ );<br>
- };<br>
- name = "Release (GC dual-mode; 10.5+)";<br>
- };<br>
-@@ -1500,6 +1557,7 @@<br>
- baseConfigurationReference = 615409A8103BA09100125AF1 /* ConfigTestAppReleaseGCSupport.xcconfig */;<br>
- buildSettings = {<br>
- COMBINE_HIDPI_IMAGES = YES;<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = "Release (GC dual-mode; 10.5+)";<br>
- };<br>
-@@ -1508,6 +1566,7 @@<br>
- baseConfigurationReference = FA302AFD109D13190060F891 /* ConfigUnitTestReleaseGCSupport.xcconfig */;<br>
- buildSettings = {<br>
- COMBINE_HIDPI_IMAGES = YES;<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = "Release (GC dual-mode; 10.5+)";<br>
- };<br>
-@@ -1516,6 +1575,7 @@<br>
- baseConfigurationReference = FA3AAF3A1050B273004B3130 /* ConfigUnitTestDebug.xcconfig */;<br>
- buildSettings = {<br>
- COMBINE_HIDPI_IMAGES = YES;<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = Debug;<br>
- };<br>
-@@ -1524,6 +1584,7 @@<br>
- baseConfigurationReference = FA3AAF391050B273004B3130 /* ConfigUnitTestRelease.xcconfig */;<br>
- buildSettings = {<br>
- COMBINE_HIDPI_IMAGES = YES;<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = Release;<br>
- };<br>
-@@ -1532,6 +1593,7 @@<br>
- baseConfigurationReference = FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */;<br>
- buildSettings = {<br>
- COMBINE_HIDPI_IMAGES = YES;<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = Debug;<br>
- };<br>
-@@ -1540,6 +1602,7 @@<br>
- baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */;<br>
- buildSettings = {<br>
- COMBINE_HIDPI_IMAGES = YES;<br>
-+ SDKROOT = macosx;<br>
- };<br>
- name = Release;<br>
- };<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.5.2 (Apple Git-48)<br>
<br>
_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
<a href="https://mailman.videolan.org/listinfo/vlc-devel" target="_blank">https://mailman.videolan.org/listinfo/vlc-devel</a><br>
</font></span></blockquote></div><br></div>