Temporary fix for issue caused by libs-base change

This commit is contained in:
Gregory John Casamento 2022-04-30 02:27:38 -04:00
parent e0012349f6
commit 751d94aa2c
3 changed files with 7 additions and 4 deletions

2
.gitignore vendored
View file

@ -18,6 +18,8 @@ Tests/gui/*/GNUmakefile
Tools/speech/GSSpeechServer.app
Tools/speech_recognizer/GSSpeechRecognitionServer.app
*~
*.nssound
*.nsmovie
# Created by https://www.gitignore.io/api/xcode
# Edit at https://www.gitignore.io/?templates=xcode

View file

@ -26,11 +26,13 @@
#define _NSFontAssetRequest_h_GNUSTEP_GUI_INCLUDE
#import <Foundation/NSObject.h>
#import <Foundation/NSProgress.h>
#import <Foundation/NSError.h>
DEFINE_BLOCK_TYPE(GSFontAssetCompletionHandler, BOOL, NSError*);
@class NSProgress;
// @protocol NSProgressReporting;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_13, GS_API_LATEST)
#if defined(__cplusplus)
@ -42,7 +44,7 @@ enum {
};
typedef NSUInteger NSFontAssetRequestOptions;
@interface NSFontAssetRequest : NSObject <NSProgressReporting>
@interface NSFontAssetRequest : NSObject // <NSProgressReporting>
- (instancetype) initWithFontDescriptors: (NSArray *)fontDescriptors
options: (NSFontAssetRequestOptions)options;
@ -62,4 +64,3 @@ typedef NSUInteger NSFontAssetRequestOptions;
#endif /* GS_API_MACOSX */
#endif /* _NSFontAssetRequest_h_GNUSTEP_GUI_INCLUDE */

View file

@ -39,7 +39,7 @@
- (NSProgress *) progress
{
return [NSProgress progressWithTotalUnitCount: 0.0];
return nil; // [NSProgress progressWithTotalUnitCount: 0.0];
}
- (void)downloadFontAssetsWithCompletionHandler: (GSFontAssetCompletionHandler)completionHandler