[vlc-commits] contrib/growl: Add growl patch that comments out logging

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Fri Oct 16 18:42:23 2015 +0200| [1799ea8f8f43660715958652988980c4ca8d1c58] | committer: Felix Paul Kühne

contrib/growl: Add growl patch that comments out logging

The patch comments out logging which causes a warning log message
when setting the growl bridge delegate to nil. This is a problem,
as we need to set it to nil, so that the growl bridge will release
our delegate. Else it will never be released and dealloc will
not get called.

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1799ea8f8f43660715958652988980c4ca8d1c58
---

 contrib/src/growl/growl-log-delegate.patch |   14 ++++++++++++++
 contrib/src/growl/rules.mak                |    1 +
 2 files changed, 15 insertions(+)

diff --git a/contrib/src/growl/growl-log-delegate.patch b/contrib/src/growl/growl-log-delegate.patch
new file mode 100644
index 0000000..869e8db
--- /dev/null
+++ b/contrib/src/growl/growl-log-delegate.patch
@@ -0,0 +1,14 @@
+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 @@
+ 	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/rules.mak b/contrib/src/growl/rules.mak
index ddc0159..3e6dabb 100644
--- a/contrib/src/growl/rules.mak
+++ b/contrib/src/growl/rules.mak
@@ -16,6 +16,7 @@ growl: growl-$(GROWL_VERSION).tar.bz2 .sum-growl
 	$(UNPACK)
 	mv Growl-1.2.2-src growl-1.2.2
 	$(APPLY) $(SRC)/growl/growl-xcode5.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)