vlc | branch: master | Marvin Scholz <epira...@gmail.com> | Tue Apr 10 01:32:39 2018 +0200| [492120e9803f68557f36202376b25f16619ae40a] | committer: Marvin Scholz
contrib: remove Growl > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=492120e9803f68557f36202376b25f16619ae40a --- contrib/src/growl/SHA512SUMS | 1 - contrib/src/growl/fix-function-check.patch | 11 ----- contrib/src/growl/growl-log-delegate.patch | 22 --------- contrib/src/growl/growl-partial-availability.diff | 59 ----------------------- contrib/src/growl/rules.mak | 28 ----------- contrib/src/growl/security-nothanks.patch | 36 -------------- 6 files changed, 157 deletions(-) diff --git a/contrib/src/growl/SHA512SUMS b/contrib/src/growl/SHA512SUMS deleted file mode 100644 index 53aee3929b..0000000000 --- a/contrib/src/growl/SHA512SUMS +++ /dev/null @@ -1 +0,0 @@ -0e387977ade9a7475ddec3711b60842349521be5c9b60849f443f9819675cb0f490ce91d7a2092ee70288b48feb49988367ab030c30395ece8a1098d2ac811c0 GrowlSDK-2.0.1-src.tar.gz diff --git a/contrib/src/growl/fix-function-check.patch b/contrib/src/growl/fix-function-check.patch deleted file mode 100644 index 92c5f4e5ae..0000000000 --- a/contrib/src/growl/fix-function-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Framework/Source/GrowlApplicationBridge.m 2018-02-28 01:20:14.000000000 +0100 -+++ b/Framework/Source/GrowlApplicationBridge.m 2018-02-28 01:20:33.000000000 +0100 -@@ -1128,7 +1128,7 @@ - - checked = YES; - -- if(xpc_connection_create == NULL){ -+ if(&xpc_connection_create == NULL){ - sandboxed = NO; - networkClient = NO; //Growl.app 1.3+ is required to be a network client, Growl.app 1.3+ requires 10.7+ - return; diff --git a/contrib/src/growl/growl-log-delegate.patch b/contrib/src/growl/growl-log-delegate.patch deleted file mode 100644 index 7de9474def..0000000000 --- a/contrib/src/growl/growl-log-delegate.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Framework/Source/GrowlApplicationBridge.m 2018-02-28 01:49:46.000000000 +0100 -+++ b/Framework/Source/GrowlApplicationBridge.m 2018-02-28 01:52:48.000000000 +0100 -@@ -730,7 +730,7 @@ - regDict = [self bestRegistrationDictionary]; - - if(!regDict){ -- NSLog(@"Cannot register without a registration dictionary!"); -+ //NSLog(@"Cannot register without a registration dictionary!"); - return NO; - } - -@@ -815,8 +815,8 @@ - NSDictionary *registrationDictionary = [self registrationDictionaryFromDelegate]; - if (!registrationDictionary) { - registrationDictionary = [self registrationDictionaryFromBundle:nil]; -- if (!registrationDictionary) -- NSLog(@"GrowlApplicationBridge: The Growl delegate did not supply a registration dictionary, and the app bundle at %@ does not have one. Please tell this application's developer.", [[NSBundle mainBundle] bundlePath]); -+ //if (!registrationDictionary) -+ //NSLog(@"GrowlApplicationBridge: The Growl delegate did not supply a registration dictionary, and the app bundle at %@ does not have one. Please tell this application's developer.", [[NSBundle mainBundle] bundlePath]); - } - - return [self registrationDictionaryByFillingInDictionary:registrationDictionary]; diff --git a/contrib/src/growl/growl-partial-availability.diff b/contrib/src/growl/growl-partial-availability.diff deleted file mode 100644 index 09e5672a30..0000000000 --- a/contrib/src/growl/growl-partial-availability.diff +++ /dev/null @@ -1,59 +0,0 @@ ---- growl/Framework/Source/GrowlApplicationBridge.m 2018-03-03 09:23:45.000000000 +0100 -+++ growl_new/Framework/Source/GrowlApplicationBridge.m 2018-03-03 09:21:46.000000000 +0100 -@@ -133,6 +133,8 @@ - - #pragma mark - - -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wpartial-availability" - #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - - // Obnoxiously, the Mountain Lion notification center requires an -@@ -254,6 +256,7 @@ - - @end - -+#pragma clang diagnostic pop - #endif // MAC_OS_X_VERSION_10_8 - - #pragma mark - -@@ -660,6 +663,8 @@ - - + (void) _fireAppleNotificationCenter:(NSDictionary *)growlDict - { -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wpartial-availability" - #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - BOOL defaultOnly = YES; - if([[NSUserDefaults standardUserDefaults] valueForKey:GROWL_FRAMEWORK_NOTIFICATIONCENTER_DEFAULT_ONLY]) -@@ -692,6 +697,7 @@ - [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:appleNotification]; - [appleNotification release]; - #endif -+#pragma clang diagnostic pop - } - - #pragma mark - -diff -ru growl/Framework/Source/Mist/GrowlMistView.m growl_new/Framework/Source/Mist/GrowlMistView.m ---- growl/Framework/Source/Mist/GrowlMistView.m 2012-12-12 07:18:11.000000000 +0100 -+++ growl_new/Framework/Source/Mist/GrowlMistView.m 2018-03-03 09:26:16.000000000 +0100 -@@ -122,7 +122,10 @@ - [strokePath setLineWidth:3.0f]; - [strokePath stroke]; - } -- -+ -+ // drawInRect: is reimplemented in category -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wpartial-availability" - // Draw image. - NSRect imageRect = NSZeroRect; - if (notificationImage) { -@@ -131,6 +134,7 @@ - imageRect.origin.y = self.bounds.origin.y + MIST_PADDING; - [notificationImage drawInRect:imageRect]; - } -+#pragma clang diagnostic pop - - // Draw title. - NSRect titleRect = NSZeroRect; diff --git a/contrib/src/growl/rules.mak b/contrib/src/growl/rules.mak deleted file mode 100644 index 2685041621..0000000000 --- a/contrib/src/growl/rules.mak +++ /dev/null @@ -1,28 +0,0 @@ -# growl - -GROWL_VERSION := 2.0.1 -GROWL_URL := https://download.videolan.org/contrib/GrowlSDK-$(GROWL_VERSION)-src.tar.gz - -ifdef HAVE_MACOSX -PKGS += growl -endif - -$(TARBALLS)/GrowlSDK-$(GROWL_VERSION)-src.tar.gz: - $(call download_pkg,$(GROWL_URL),growl) - -.sum-growl: GrowlSDK-$(GROWL_VERSION)-src.tar.gz - -growl: GrowlSDK-$(GROWL_VERSION)-src.tar.gz .sum-growl - $(UNPACK) - $(APPLY) $(SRC)/growl/fix-function-check.patch - $(APPLY) $(SRC)/growl/security-nothanks.patch - $(APPLY) $(SRC)/growl/growl-log-delegate.patch - $(APPLY) $(SRC)/growl/growl-partial-availability.diff - $(MOVE) - -.growl: growl - cd $< && xcodebuild $(XCODE_FLAGS) MACOSX_DEPLOYMENT_TARGET=10.7 CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" GCC_TREAT_WARNINGS_AS_ERRORS=NO -target Growl.framework -configuration Release - install -d $(PREFIX) - cd $< && mkdir -p "$(PREFIX)/Frameworks" && rm -Rf $(PREFIX)/Frameworks/Growl.framework && \ - cp -Rf build/Release/Growl.framework "$(PREFIX)/Frameworks" - touch $@ diff --git a/contrib/src/growl/security-nothanks.patch b/contrib/src/growl/security-nothanks.patch deleted file mode 100644 index bf38641615..0000000000 --- a/contrib/src/growl/security-nothanks.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/Core/Source/GNTPKey.m 2018-02-28 01:36:15.000000000 +0100 -+++ b/Core/Source/GNTPKey.m 2018-02-28 01:36:47.000000000 +0100 -@@ -7,7 +7,6 @@ - // - - #import "GNTPKey.h" --#import <openssl/evp.h> - #import <Security/SecRandom.h> - #import <CommonCrypto/CommonCryptor.h> - #import <CommonCrypto/CommonDigest.h> -@@ -355,8 +354,8 @@ - { - NSData *ivData = nil; - -- const -- EVP_CIPHER *cipher = nil; -+ //const -+ //EVP_CIPHER *cipher = nil; - NSInteger blockSize = 0; - switch ([self encryptionAlgorithm]) - { -@@ -369,12 +368,12 @@ - if (iv) { - bzero(iv, blockSize * sizeof(unsigned char)); - //unsigned char evpKey[EVP_MAX_KEY_LENGTH] = {"\0"}; -- if (cipher) { -+ //if (cipher) { - /* TODO: Find replacement for EVP in OpenSSL*/ - - //Cast explanation: EVP_BytesToKey takes an int for the length, but NSData's length method returns NSUInteger. As long as encryption keys are created by hashing strings, they are not likely to ever be large enough for their lengths to exceed the range of an int. - //EVP_BytesToKey(cipher, EVP_md5(), NULL, (const unsigned char*)[[self encryptionKey] bytes], (int)[[self encryptionKey] length], 1, evpKey, iv); -- } -+ //} - - ivData = [NSData dataWithBytesNoCopy:iv length:blockSize freeWhenDone:YES]; - } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
