Ticket #47313: no-sparkle.patch

configure.ac

@@ -3731 +3731 @@
 
   VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge])
 
-  if test ! -d ${CONTRIB_DIR}/Sparkle.framework
-  then
-    AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}])
-  fi
-  VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
-  VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
-
   if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
   then
     AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])

extras/package/macosx/Resources/English.lproj/MainMenu.xib

@@ -2052 +2052 @@
                         <object class="NSCustomObject" id="651263286">
                                 <string key="NSClassName">VLCMainMenu</string>
                         </object>
-                        <object class="NSCustomObject" id="1040926652">
-                                <string key="NSClassName">SUUpdater</string>
-                        </object>
                         <object class="NSCustomView" id="560875128">
                                 <nil key="NSNextResponder"/>
                                 <int key="NSvFlags">268</int>
@@ -2754 +2751 @@
                                         <int key="connectionID">5592</int>
                                 </object>
                                 <object class="IBConnectionRecord">
-                                        <object class="IBActionConnection" key="connection">
-                                                <string key="label">checkForUpdates:</string>
-                                                <reference key="source" ref="1040926652"/>
-                                                <reference key="destination" ref="354414928"/>
-                                        </object>
-                                        <int key="connectionID">4371</int>
-                                </object>
-                                <object class="IBConnectionRecord">
                                         <object class="IBOutletConnection" key="connection">
                                                 <string key="label">o_dmi_mute</string>
                                                 <reference key="source" ref="651263286"/>
@@ -5381 +5370 @@
                                                 <string key="objectName">Application</string>
                                         </object>
                                         <object class="IBObjectRecord">
-                                                <int key="objectID">4370</int>
-                                                <reference key="object" ref="1040926652"/>
-                                                <reference key="parent" ref="0"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
                                                 <int key="objectID">4397</int>
                                                 <reference key="object" ref="629699013"/>
                                                 <array class="NSMutableArray" key="children">

extras/package/macosx/Resources/English.lproj/Preferences.xib

@@ -4689 +4689 @@
                                 <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
                                 <bool key="NSWindowIsRestorable">YES</bool>
                         </object>
-                        <object class="NSCustomObject" id="761483302">
-                                <string key="NSClassName">SUUpdater</string>
-                        </object>
                         <object class="NSWindowTemplate" id="898680423">
                                 <int key="NSWindowStyleMask">15</int>
                                 <int key="NSWindowBacking">2</int>
@@ -7561 +7558 @@
                                         <int key="connectionID">2681</int>
                                 </object>
                                 <object class="IBConnectionRecord">
-                                        <object class="IBBindingConnection" key="connection">
-                                                <string key="label">value: automaticallyChecksForUpdates</string>
-                                                <reference key="source" ref="243384014"/>
-                                                <reference key="destination" ref="761483302"/>
-                                                <object class="NSNibBindingConnector" key="connector">
-                                                        <reference key="NSSource" ref="243384014"/>
-                                                        <reference key="NSDestination" ref="761483302"/>
-                                                        <string key="NSLabel">value: automaticallyChecksForUpdates</string>
-                                                        <string key="NSBinding">value</string>
-                                                        <string key="NSKeyPath">automaticallyChecksForUpdates</string>
-                                                        <int key="NSNibBindingConnectorVersion">2</int>
-                                                </object>
-                                        </object>
-                                        <int key="connectionID">3559</int>
-                                </object>
-                                <object class="IBConnectionRecord">
                                         <object class="IBOutletConnection" key="connection">
                                                 <string key="label">nextKeyView</string>
                                                 <reference key="source" ref="588417130"/>
@@ -9292 +9273 @@
                                                 <reference key="parent" ref="492678965"/>
                                         </object>
                                         <object class="IBObjectRecord">
-                                                <int key="objectID">3555</int>
-                                                <reference key="object" ref="761483302"/>
-                                                <reference key="parent" ref="0"/>
-                                                <string key="objectName">Sparkle Updater</string>
-                                        </object>
-                                        <object class="IBObjectRecord">
                                                 <int key="objectID">3556</int>
                                                 <reference key="object" ref="243384014"/>
                                                 <array class="NSMutableArray" key="children">

modules/gui/macosx/intf.m

@@ -67 +67 @@
 #import "VideoEffects.h"
 #import "AudioEffects.h"
 
-#import <Sparkle/Sparkle.h>                 /* we're the update delegate */
-
 #import "iTunes.h"
 #import "Spotify.h"
 
@@ -788 +788 @@
     // This cannot be called directly here, as the main loop is not running yet so it would have no effect.
     // So lets enqueue it into the loop for later execution.
     [o_mainwindow performSelector:@selector(makeKeyAndOrderFront:) withObject:nil afterDelay:0];
-
-    [[SUUpdater sharedUpdater] setDelegate:self];
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
@@ -932 +928 @@
 }
 
 #pragma mark -
-#pragma mark Sparkle delegate
-/* received directly before the update gets installed, so let's shut down a bit */
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
-{
-    [NSApp activateIgnoringOtherApps:YES];
-    [o_remote stopListening: self];
-    [[VLCCoreInteraction sharedInstance] stop];
-}
-
-/* don't be enthusiastic about an update if we currently play a video */
-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle
-{
-    if ([self activeVideoPlayback])
-        return NO;
-
-    return YES;
-}
-
-#pragma mark -
 #pragma mark Media Key support
 
 -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event

modules/gui/macosx/simple_prefs.m

@@ -38 +38 @@
 #import "AppleRemote.h"
 #import "CoreInteraction.h"
 
-#import <Sparkle/Sparkle.h>                        //for o_intf_last_update_lbl
-
 static const char *const ppsz_language[] =
 {
     "auto",
@@ -366 +364 @@
     [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
     [o_intf_art_ckb setTitle: _NS("Allow metadata network access")];
     [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
-    [o_intf_last_update_lbl setStringValue: @""];
     [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
     [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
     [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
@@ -578 +575 @@
     [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
 
     [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
-    if ([[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL)
-        [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
-    else
-        [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
     psz_tmp = config_GetPsz(p_intf, "control");
     if (psz_tmp) {
         [o_intf_enableGrowl_ckb setState: (NSInteger)strstr(psz_tmp, "growl")];