vlc | branch: master | Felix Paul Kühne <[email protected]> | Tue Apr 23 00:21:58 2013 +0200| [ff7aeef9e3666cd159d875da5c3fc7c53c74cf52] | committer: Felix Paul Kühne
contrib: use latest sparkle version from git instead of the dated release > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ff7aeef9e3666cd159d875da5c3fc7c53c74cf52 --- contrib/src/sparkle/rules.mak | 30 ++++++++++---------- contrib/src/sparkle/sparkle-fix-formatstring.patch | 11 +++++++ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/contrib/src/sparkle/rules.mak b/contrib/src/sparkle/rules.mak index 533d82a..a5d4d1d 100644 --- a/contrib/src/sparkle/rules.mak +++ b/contrib/src/sparkle/rules.mak @@ -1,27 +1,27 @@ # sparkle -SPARKLE_VERSION := 1.5b6 -SPARKLE_URL := http://sparkle.andymatuschak.org/files/Sparkle%20$(SPARKLE_VERSION).zip +#SPARKLE_VERSION := 1.5b6 +#SPARKLE_URL := http://sparkle.andymatuschak.org/files/Sparkle%20$(SPARKLE_VERSION).zip +SPARKLE_GITURL := git://github.com/andymatuschak/Sparkle.git ifdef HAVE_MACOSX PKGS += sparkle endif -$(TARBALLS)/sparkle-$(SPARKLE_VERSION).zip: - $(call download,$(SPARKLE_URL)) +$(TARBALLS)/sparkle-git.tar.xz: + $(call download_git,$(SPARKLE_GITURL),,HEAD) -.sum-sparkle: sparkle-$(SPARKLE_VERSION).zip - -sparkle: sparkle-$(SPARKLE_VERSION).zip .sum-sparkle - $(RM) -R $@ && mkdir -p $@ && cd $@ && unzip ../$< - cd $@/Extras/Source\ Code/Configurations && \ - sed -i.orig -e s/"GCC_TREAT_WARNINGS_AS_ERRORS = YES"/"GCC_TREAT_WARNINGS_AS_ERRORS = NO"/g \ - -e s/"ARCHS = .*"/"ARCHS = $(ARCH)"/ ConfigCommonRelease.xcconfig && \ - sed -i.orig -e s/MacOSX10.5.sdk/MacOSX$(OSX_VERSION).sdk/g ConfigCommon.xcconfig +.sum-sparkle: sparkle-git.tar.xz + $(warning $@ not implemented) touch $@ +sparkle: sparkle-git.tar.xz .sum-sparkle + $(UNPACK) + $(APPLY) $(SRC)/sparkle/sparkle-fix-formatstring.patch + $(MOVE) + .sparkle: sparkle - cd $</Extras/Source\ Code && $(MAKE) && xcodebuild $(XCODE_FLAGS) - cd $</Extras/Source\ Code && install_name_tool -id @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle build/Release/Sparkle.framework/Sparkle - cd $< && cp -R Extras/Source\ Code/build/Release/Sparkle.framework "$(PREFIX)" + cd $< && xcodebuild $(XCODE_FLAGS) + cd $< && install_name_tool -id @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle build/Release/Sparkle.framework/Sparkle + cd $< && cp -R build/Release/Sparkle.framework "$(PREFIX)" touch $@ diff --git a/contrib/src/sparkle/sparkle-fix-formatstring.patch b/contrib/src/sparkle/sparkle-fix-formatstring.patch new file mode 100644 index 0000000..7229b63 --- /dev/null +++ b/contrib/src/sparkle/sparkle-fix-formatstring.patch @@ -0,0 +1,11 @@ +--- 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]; + } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
