Commit 14f59cf2 authored by Marvin Scholz's avatar Marvin Scholz

contrib: Update Growl to 2.0.1

This fixes Growl on modern macOS versions.

(cherry picked from commit b3d17308)
Signed-off-by: Marvin Scholz's avatarMarvin Scholz <epirat07@gmail.com>
parent e5b29767
2c58f029613810f85b7e94303be272fec1b14e91492601c74906e5d0f7e8c5a7c9024b583f422a62db379bc26946897255ed552616d2543c330dd23e5c72441a growl-1.2.2.tar.bz2
0e387977ade9a7475ddec3711b60842349521be5c9b60849f443f9819675cb0f490ce91d7a2092ee70288b48feb49988367ab030c30395ece8a1098d2ac811c0 GrowlSDK-2.0.1-src.tar.gz
--- 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 -ru growl/Framework/Source/GrowlApplicationBridge.m growl-patched/Framework/Source/GrowlApplicationBridge.m
--- growl/Framework/Source/GrowlApplicationBridge.m 2011-05-25 04:10:27.000000000 +0200
+++ growl-patched/Framework/Source/GrowlApplicationBridge.m 2015-10-15 15:26:27.000000000 +0200
@@ -398,8 +398,8 @@
--- 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];
......
This diff is collapsed.
# growl
GROWL_VERSION := 1.2.2
GROWL_URL := http://growl.googlecode.com/files/Growl-$(GROWL_VERSION)-src.tbz
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)/growl-$(GROWL_VERSION).tar.bz2:
$(TARBALLS)/GrowlSDK-$(GROWL_VERSION)-src.tar.gz:
$(call download_pkg,$(GROWL_URL),growl)
.sum-growl: growl-$(GROWL_VERSION).tar.bz2
.sum-growl: GrowlSDK-$(GROWL_VERSION)-src.tar.gz
growl: growl-$(GROWL_VERSION).tar.bz2 .sum-growl
growl: GrowlSDK-$(GROWL_VERSION)-src.tar.gz .sum-growl
$(UNPACK)
mv Growl-1.2.2-src growl-1.2.2
$(APPLY) $(SRC)/growl/growl-xcode5.patch
$(APPLY) $(SRC)/growl/fix-function-check.patch
$(APPLY) $(SRC)/growl/security-nothanks.patch
$(APPLY) $(SRC)/growl/growl-log-delegate.patch
sed -i.orig -e s/"REVISION \$$REV"/"REVISION 0x\$$REV"/g growl-1.2.2/generateHgRevision.sh
$(MOVE)
.growl: growl
cd $< && xcodebuild $(XCODE_FLAGS) -target Growl.framework -configuration Release
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" && cp -Rf build/Release/Growl.framework "$(PREFIX)/Frameworks"
touch $@
--- 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];
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment