Ticket #34805: patch-sparkle.diff

src/osx_helpers.h

@@ -33 +33 @@
 extern "C" {
 #endif
 
+#ifdef USE_SPARKLE
 // Sparkle helpers
 void Sparkle_Initialize();
 void Sparkle_AddMenuItem(const char *title);
 void Sparkle_Cleanup();
+#endif // USE_SPARKLE
 
 // Spell checking
 int SpellChecker_SetLang(const char *lang);

src/osx_helpers.m

@@ -33 +33 @@
 #import <AppKit/NSButton.h>
 #import <AppKit/NSSpellChecker.h>
 
+#ifdef USE_SPARKLE
 #import <Sparkle/Sparkle.h>
 
 // --------------------------------------------------------------------------------
@@ -75 +76 @@
     [[NSUserDefaults standardUserDefaults] synchronize];
     [pool release];
 }
-
+#endif // USE_SPARKLE
 
 // --------------------------------------------------------------------------------
 // Spell checking

macosx/make-bundle

@@ -85 +85 @@
     cp $i $bundle/Contents/Resources/locale/$lang/LC_MESSAGES/poedit.mo
 done
 
-if [ -n "$WX_ROOT" ] ; then
-    (cd $WX_ROOT/share ; tar -c locale) | \
-        (cd $bundle/Contents/Resources ; tar -x)
-else
-    echo "WARNING: not copying wxWidgets message catalogs, point WX_ROOT" >&2
-    echo "         environment variable to a directory with installed wx" >&2
-fi
+# TODO: there is no <lang>/LC_MESSAGES/wxstd.mo in wxWidgets-devel
+#
+#if [ -n "$WX_ROOT" ] ; then
+#    (cd $WX_ROOT/share ; tar -c locale) | \
+#        (cd $bundle/Contents/Resources ; tar -x)
+#else
+#    echo "WARNING: not copying wxWidgets message catalogs, point WX_ROOT" >&2
+#    echo "         environment variable to a directory with installed wx" >&2
+#fi
 
 # 3rd party frameworks:
+if [ "x$SPARKLE_FRAMEWORK" != "xno" ] ; then
 if [ -n "$SPARKLE_FRAMEWORK" ] ; then
     mkdir -p $bundle/Contents/Frameworks
     cp -R $SPARKLE_FRAMEWORK $bundle/Contents/Frameworks
@@ -101 +104 @@
     echo "WARNING: not copying Sparkle framework, point SPARKLE_FRAMEWORK" >&2
     echo "         environment variable to it" >&2
 fi
+fi
 
 echo "Installed message catalogs:"
 find $bundle/Contents/Resources/locale -type f