diff --git a/lib/native/mac/libsparkle_init.dylib b/lib/native/mac/libsparkle_init.dylib index 7c0a29a87..88a8da1f2 100755 Binary files a/lib/native/mac/libsparkle_init.dylib and b/lib/native/mac/libsparkle_init.dylib differ diff --git a/src/native/build.xml b/src/native/build.xml index da5af971c..3a4aa7022 100644 --- a/src/native/build.xml +++ b/src/native/build.xml @@ -742,12 +742,17 @@ - + + diff --git a/src/native/macosx/sparkle/Makefile b/src/native/macosx/sparkle/Makefile index 34e5210cc..f5bf72c26 100644 --- a/src/native/macosx/sparkle/Makefile +++ b/src/native/macosx/sparkle/Makefile @@ -1,11 +1,12 @@ # Author: Romain KUNTZ # Requires the Sparkle.framework installed in /Library/Frameworks # The Framework is available at http://sparkle.andymatuschak.org/ +# export MACOSX_DEPLOYMENT_TARGET=10.5 -CC=gcc -arch x86_64 -arch i386 -arch ppc +CC=gcc -arch x86_64 -arch i386 -arch ppc -mmacosx-version-min=10.5 TARGET=libsparkle_init.dylib JNI_INCLUDE_PATH=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ -CFLAGS=-I$(JNI_INCLUDE_PATH) +CFLAGS=-I$(JNI_INCLUDE_PATH) -I/System/Library/Frameworks/Sparkle.framework/Versions/A/Headers/ LIBS=-framework AppKit -framework Foundation -framework Sparkle OBJS=net_java_sip_communicator_impl_sparkle_SparkleActivator.o @@ -19,5 +20,5 @@ install:$(TARGET) libsparkle_init.dylib:$(OBJS) $(CC) -dynamiclib -o $(TARGET) $(LIBS) $(CFLAGS) $< - install_name_tool -change "@loader_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle" "@executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle" libsparkle_init.dylib + install_name_tool -change "@loader_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle" "@executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle" libsparkle_init.dylib diff --git a/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.m b/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.m index 294bc6ba8..4bebc44ce 100644 --- a/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.m +++ b/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.m @@ -73,8 +73,8 @@ Java_net_java_sip_communicator_impl_sparkle_SparkleActivator_initSparkle else { const char* menuTitleChars = - (*env)->GetStringUTFChars(env, menuItemTitle, 0); - menuTitle = [NSString stringWithCString: menuTitleChars length: strlen(menuTitleChars)]; + (const char *)(*env)->GetStringUTFChars(env, menuItemTitle, 0); + menuTitle = [NSString stringWithUTF8String: menuTitleChars]; } NSMenu* menu = [[NSApplication sharedApplication] mainMenu];