Ticket #46748: no-sparkle.patch

File no-sparkle.patch, 8.0 KB (added by RJVB (René Bertin), 10 years ago)
  • configure.ac

    diff --git configure.ac configure.ac
    index fd31f16..af37c4c 100644
    then 
    36853685
    36863686  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])
    36873687
    3688   if test ! -d ${CONTRIB_DIR}/Sparkle.framework
    3689   then
    3690     AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}])
    3691   fi
    3692   VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
    3693   VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
    3694 
    36953688  if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
    36963689  then
    36973690    AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
  • extras/package/macosx/Resources/English.lproj/Preferences.xib

    diff --git extras/package/macosx/Resources/English.lproj/Preferences.xib extras/package/macosx/Resources/English.lproj/Preferences.xib
    index a932b0e..5f58bbd 100644
    AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> 
    46824682        <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
    46834683        <bool key="NSWindowIsRestorable">YES</bool>
    46844684      </object>
    4685       <object class="NSCustomObject" id="761483302">
    4686         <string key="NSClassName">SUUpdater</string>
    4687       </object>
    46884685      <object class="NSWindowTemplate" id="898680423">
    46894686        <int key="NSWindowStyleMask">15</int>
    46904687        <int key="NSWindowBacking">2</int>
    AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> 
    68336830          <int key="connectionID">3554</int>
    68346831        </object>
    68356832        <object class="IBConnectionRecord">
    6836           <object class="IBBindingConnection" key="connection">
    6837             <string key="label">value: automaticallyChecksForUpdates</string>
    6838             <reference key="source" ref="243384014"/>
    6839             <reference key="destination" ref="761483302"/>
    6840             <object class="NSNibBindingConnector" key="connector">
    6841               <reference key="NSSource" ref="243384014"/>
    6842               <reference key="NSDestination" ref="761483302"/>
    6843               <string key="NSLabel">value: automaticallyChecksForUpdates</string>
    6844               <string key="NSBinding">value</string>
    6845               <string key="NSKeyPath">automaticallyChecksForUpdates</string>
    6846               <int key="NSNibBindingConnectorVersion">2</int>
    6847             </object>
    6848           </object>
    6849           <int key="connectionID">3559</int>
    6850         </object>
    6851         <object class="IBConnectionRecord">
    68526833          <object class="IBOutletConnection" key="connection">
    68536834            <string key="label">o_intf_update_ckb</string>
    68546835            <reference key="source" ref="150917409"/>
    AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> 
    95609541            <reference key="parent" ref="492678965"/>
    95619542          </object>
    95629543          <object class="IBObjectRecord">
    9563             <int key="objectID">3555</int>
    9564             <reference key="object" ref="761483302"/>
    9565             <reference key="parent" ref="0"/>
    9566             <string key="objectName">Sparkle Updater</string>
    9567           </object>
    9568           <object class="IBObjectRecord">
    95699544            <int key="objectID">3556</int>
    95709545            <reference key="object" ref="243384014"/>
    95719546            <object class="NSMutableArray" key="children">
  • extras/package/macosx/Resources/English.lproj/MainMenu.xib

    diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
    index 9c133df..8a2f5bd 100644
    LCAuLi4</string> 
    44184418        <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
    44194419        <bool key="NSWindowIsRestorable">YES</bool>
    44204420      </object>
    4421       <object class="NSCustomObject" id="1040926652">
    4422         <string key="NSClassName">SUUpdater</string>
    4423       </object>
    44244421      <object class="NSCustomView" id="560875128">
    44254422        <nil key="NSNextResponder"/>
    44264423        <int key="NSvFlags">268</int>
    LCAuLi4</string> 
    59075904          <int key="connectionID">4256</int>
    59085905        </object>
    59095906        <object class="IBConnectionRecord">
    5910           <object class="IBActionConnection" key="connection">
    5911             <string key="label">checkForUpdates:</string>
    5912             <reference key="source" ref="1040926652"/>
    5913             <reference key="destination" ref="354414928"/>
    5914           </object>
    5915           <int key="connectionID">4371</int>
    5916         </object>
    5917         <object class="IBConnectionRecord">
    59185907          <object class="IBOutletConnection" key="connection">
    59195908            <string key="label">o_outline_view</string>
    59205909            <reference key="source" ref="998338913"/>
    LCAuLi4</string> 
    99899978            <string key="objectName">Application</string>
    99909979          </object>
    99919980          <object class="IBObjectRecord">
    9992             <int key="objectID">4370</int>
    9993             <reference key="object" ref="1040926652"/>
    9994             <reference key="parent" ref="0"/>
    9995           </object>
    9996           <object class="IBObjectRecord">
    99979981            <int key="objectID">4397</int>
    99989982            <reference key="object" ref="629699013"/>
    99999983            <object class="NSMutableArray" key="children">
  • modules/gui/macosx/intf.m

    diff --git modules/gui/macosx/intf.m modules/gui/macosx/intf.m
    index c5fced6..da7d001 100644
     
    6969#import "AudioEffects.h"
    7070
    7171#import <AddressBook/AddressBook.h>         /* for crashlog send mechanism */
    72 #import <Sparkle/Sparkle.h>                 /* we're the update delegate */
    7372
    7473#import "iTunes.h"
    7574
    static VLCMain *_o_sharedMainInstance = nil; 
    916915}
    917916
    918917#pragma mark -
    919 #pragma mark Sparkle delegate
    920 /* received directly before the update gets installed, so let's shut down a bit */
    921 - (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
    922 {
    923     [NSApp activateIgnoringOtherApps:YES];
    924     [o_remote stopListening: self];
    925     [[VLCCoreInteraction sharedInstance] stop];
    926 }
    927 
    928 #pragma mark -
    929918#pragma mark Media Key support
    930919
    931920-(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
  • modules/gui/macosx/simple_prefs.m

    diff --git modules/gui/macosx/simple_prefs.m modules/gui/macosx/simple_prefs.m
    index a91fe3a..4407d25 100644
     
    3838#import "AppleRemote.h"
    3939#import "CoreInteraction.h"
    4040
    41 #import <Sparkle/Sparkle.h>                        //for o_intf_last_update_lbl
    42 
    4341static const char *const ppsz_language[] =
    4442{
    4543    "auto",
    create_toolbar_item(NSString * o_itemIde 
    365363    [o_intf_appleremote_sysvol_ckb setTitle: _NS("Control system volume with the Apple Remote")];
    366364    [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
    367365    [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
    368     [o_intf_last_update_lbl setStringValue: @""];
    369366    [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
    370367    [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
    371368    [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
    static inline char * __config_GetLabel(v 
    585582    [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
    586583
    587584    [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
    588     if ([[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL)
    589         [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
    590     else
    591         [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
    592585    psz_tmp = config_GetPsz(p_intf, "control");
    593586    if (psz_tmp) {
    594587        [o_intf_enableGrowl_ckb setState: (NSInteger)strstr(psz_tmp, "growl")];