1 files changed, 28 insertions, 0 deletions
diff --git a/x11/qt4-libs/patches/patch-cb b/x11/qt4-libs/patches/patch-cb
new file mode 100644
index 00000000000..66240795029
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-cb
@@ -0,0 +1,28 @@
+$NetBSD: patch-cb,v 1.3 2011/01/12 07:07:07 adam Exp $
+
+--- src/gui/kernel/qapplication_mac.mm.orig	2010-12-30 14:07:53.000000000 +0000
++++ src/gui/kernel/qapplication_mac.mm
+@@ -1244,6 +1244,7 @@ void qt_init(QApplicationPrivate *priv, 
+ #ifdef QT_MAC_USE_COCOA
+     NSApplication *cocoaApp = [QNSApplication sharedApplication];
+     QMacCocoaAutoReleasePool pool;
++    NSNib *qtNib;
+     NSObject *oldDelegate = [cocoaApp delegate];
+     QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate];
+     Q_ASSERT(newDelegate);
+@@ -1254,12 +1255,14 @@ void qt_init(QApplicationPrivate *priv, 
+         [cocoaApp setDelegate:newDelegate];
+ 
+         QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader = [[QT_MANGLE_NAMESPACE(QCocoaMenuLoader) alloc] init];
+-        if ([NSBundle loadNibNamed:@"qt_menu" owner:qtMenuLoader] == false) {
++        qtNib = [[NSNib alloc] initWithContentsOfURL:[NSURL fileURLWithPath:@"@QTPREFIX@/qt_menu.nib"]];
++        if ([qtNib instantiateNibWithOwner:qtMenuLoader topLevelObjects:nil] == false) {
+             qFatal("Qt internal error: qt_menu.nib could not be loaded. The .nib file"
+                    " should be placed in QtGui.framework/Versions/Current/Resources/ "
+                    " or in the resources directory of your application bundle.");
+         }
+ 
++        [qtNib release];
+         [cocoaApp setMenu:[qtMenuLoader menu]];
+         [newDelegate setMenuLoader:qtMenuLoader];
+         [qtMenuLoader release];