[vlc-devel] [PATCH 1/2] sparkle: remove format string patch

Sean McGovern gseanmcg at gmail.com
Tue Jul 8 01:32:18 CEST 2014


Ignore both of these -- I will fix the contrib to snag the last 10.6-compatible release.

-----Original Message-----
From: Sean McGovern <gseanmcg at gmail.com>
Sender: "vlc-devel" <vlc-devel-bounces at videolan.org>Date: Mon,  7 Jul 2014 18:10:15 
To: <vlc-devel at videolan.org>
Reply-To: Mailing list for VLC media player developers <vlc-devel at videolan.org>
Subject: [vlc-devel] [PATCH 1/2] sparkle: remove format string patch

It has been applied upstream.
---
 contrib/src/sparkle/rules.mak                      |    1 -
 contrib/src/sparkle/sparkle-fix-formatstring.patch |   11 -----------
 2 files changed, 12 deletions(-)
 delete mode 100644 contrib/src/sparkle/sparkle-fix-formatstring.patch

diff --git a/contrib/src/sparkle/rules.mak b/contrib/src/sparkle/rules.mak
index f0cee79..e91d2da 100644
--- a/contrib/src/sparkle/rules.mak
+++ b/contrib/src/sparkle/rules.mak
@@ -17,7 +17,6 @@ $(TARBALLS)/sparkle-git.tar.xz:
 
 sparkle: sparkle-git.tar.xz .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)
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];
- }
-- 
1.7.9.2

_______________________________________________
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