Ticket #25431: patch-no-sparkle.diff

File patch-no-sparkle.diff, 8.8 KB (added by raimue (Rainer Müller), 14 years ago)

  • modules/gui/macosx/intf.m

    old new  
    5656
    5757#import <AddressBook/AddressBook.h>         /* for crashlog send mechanism */
    5858#import <IOKit/hidsystem/ev_keymap.h>         /* for the media key support */
    59 #import <Sparkle/Sparkle.h>                 /* we're the update delegate */
    6059
    6160/*****************************************************************************
    6261 * Local prototypes.
    … …  
    900899}
    901900
    902901#pragma mark -
    903 #pragma mark Sparkle delegate
    904 /* received directly before the update gets installed, so let's shut down a bit */
    905 - (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
    906 {
    907     [o_remote stopListening: self];
    908     var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP );
    909 
    910     /* Close the window directly, because we do know that there
    911      * won't be anymore video. It's currently waiting a bit. */
    912     [[[o_controls voutView] window] orderOut:self];
    913 }
    914 
    915 #pragma mark -
    916902#pragma mark Toolbar delegate
    917903
    918904/* Our item identifiers */

  • configure.ac

    old new  
    40514051  VLC_ADD_LDFLAGS([macosx minimal_macosx],            [-Wl,-framework,CoreServices])
    40524052  VLC_ADD_LDFLAGS([macosx minimal_macosx],            [-Wl,-framework,AGL])
    40534053  VLC_ADD_LDFLAGS([macosx],                           [-Wl,-framework,IOKit])
    4054   VLC_ADD_LDFLAGS([macosx],                           [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
    4055   VLC_ADD_OBJCFLAGS([macosx],                         [-F${CONTRIB_DIR}/Sparkle])
    40564054  dnl For bug report
    40574055  VLC_ADD_LDFLAGS([macosx],                           [-Wl,-framework,AddressBook])
    40584056  VLC_ADD_LDFLAGS([macosx],                           [-Wl,-framework,WebKit])

  • modules/gui/macosx/simple_prefs.m

    old new  
    2929#import "misc.h"
    3030#import "intf.h"
    3131#import "AppleRemote.h"
    32 #import <Sparkle/Sparkle.h>                        //for o_intf_last_update_lbl
    3332
    3433static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
    3534static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
    … …  
    462461        [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
    463462    [self setupButton: o_intf_mediakeys_bg_ckb forBoolValue: "macosx-mediakeys-background"];
    464463    [o_intf_mediakeys_bg_ckb setEnabled: [o_intf_mediakeys_ckb state]];
    465     if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL )
    466         [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
    467     else
    468         [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
     464    [o_intf_last_update_lbl setStringValue: _NS("Please use MacPorts to check for updates.")];
    469465
    470466    /******************
    471467     * audio settings *

  • Makefile.am

    old new  
    447447        for i in AUTHORS COPYING THANKS; do \
    448448          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
    449449        done
    450         mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
    451         cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
    452450        mkdir -p $(top_builddir)/tmp/modules/audio_output
    453451        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
    454452        for i in \
    … …  
    600598        for i in AUTHORS COPYING THANKS; do \
    601599          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
    602600        done
    603         mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
    604         cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
    605601        mkdir -p $(top_builddir)/tmp/modules/audio_output
    606602        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
    607603        for i in \

  • extras/package/macosx/vlc.xcodeproj/project.pbxproj

    old new  
    133133                CC402F420E00ABBB006A4BA4 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */; };
    134134                CC402F430E00ABBB006A4BA4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC1941240B9C1F8400635F6B /* QTKit.framework */; };
    135135                CC402F440E00ABBB006A4BA4 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC962E2C0CC7992800A56695 /* WebKit.framework */; };
    136                 CC426FD11020D44F00A32659 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC426FD01020D44F00A32659 /* Sparkle.framework */; };
    137                 CC426FD71020D47100A32659 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC426FD01020D44F00A32659 /* Sparkle.framework */; };
    138136                CC62B8D00FC5787D0077BB8C /* aiff.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC62B8C50FC5787D0077BB8C /* aiff.icns */; };
    139137                CC62B8D10FC5787D0077BB8C /* audio.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC62B8C60FC5787D0077BB8C /* audio.icns */; };
    140138                CC62B8D20FC5787D0077BB8C /* flv.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC62B8C70FC5787D0077BB8C /* flv.icns */; };
    … …  
    183181                        dstPath = "";
    184182                        dstSubfolderSpec = 10;
    185183                        files = (
    186                                 CC426FD71020D47100A32659 /* Sparkle.framework in Copy Frameworks */,
    187184                        );
    188185                        name = "Copy Frameworks";
    189186                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    299296                CC33C2500D2578F5008C4683 /* fullscreen_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_graphite.png; path = Resources/fullscreen_graphite.png; sourceTree = "<group>"; };
    300297                CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
    301298                CC402F4B0E00ABBB006A4BA4 /* VLC.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VLC.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
    302                 CC426FD01020D44F00A32659 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../../contrib/Sparkle/Sparkle.framework; sourceTree = SOURCE_ROOT; };
    303299                CC4A33210F8CB017000FC4A7 /* coredialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = coredialogs.m; path = ../../../modules/gui/macosx/coredialogs.m; sourceTree = SOURCE_ROOT; };
    304300                CC4A33220F8CB017000FC4A7 /* coredialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coredialogs.h; path = ../../../modules/gui/macosx/coredialogs.h; sourceTree = SOURCE_ROOT; };
    305301                CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded_blue.png; path = Resources/add_embedded_blue.png; sourceTree = "<group>"; };
    … …  
    444440                                CC402F430E00ABBB006A4BA4 /* QTKit.framework in Frameworks */,
    445441                                CC402F440E00ABBB006A4BA4 /* WebKit.framework in Frameworks */,
    446442                                CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */,
    447                                 CC426FD11020D44F00A32659 /* Sparkle.framework in Frameworks */,
    448443                        );
    449444                        runOnlyForDeploymentPostprocessing = 0;
    450445                };
    … …  
    554549                1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = {
    555550                        isa = PBXGroup;
    556551                        children = (
    557                                 CC426FD01020D44F00A32659 /* Sparkle.framework */,
    558552                                CCBE999E0F922C51000705F8 /* CoreServices.framework */,
    559553                                CC962E2C0CC7992800A56695 /* WebKit.framework */,
    560554                                CC1941240B9C1F8400635F6B /* QTKit.framework */,
    … …  
    11991193                                        "$(inherited)",
    12001194                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
    12011195                                );
    1202                                 FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../contrib/Sparkle\"";
     1196                                FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "";
    12031197                                GCC_DYNAMIC_NO_PIC = NO;
    12041198                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
    12051199                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    … …  
    12331227                                        "$(inherited)",
    12341228                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
    12351229                                );
    1236                                 FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../contrib/Sparkle\"";
     1230                                FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "";
    12371231                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
    12381232                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
    12391233                                HEADER_SEARCH_PATHS = "";
    … …  
    12631257                                        "$(inherited)",
    12641258                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
    12651259                                );
    1266                                 FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../contrib/Sparkle\"";
     1260                                FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "";
    12671261                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
    12681262                                HEADER_SEARCH_PATHS = "";
    12691263                                INFOPLIST_FILE = Info.plist;