Add some CoreText stub definitions by jlucfarias · Pull Request #40 · darlinghq/darling-cocotron

jlucfarias · 2024-09-21T19:37:03Z

I've tried to add all constants of CTFont (unfortunatelfy I do not have time to add constants and stubs for other files) but I've keeped constants unused at this time commented to be uncommented later.

One suggestion is to move all frameworks from here (and other darling projects) to darling repo (or a darling specific repo for frameworks) to keep only one place with all frameworks. IMHO this is a more maintainable action to get darling project more active.
A lot of definitions can be get from the abandoned project darling-coregraphics and I used for reference for this changes.

Fixes darling#797
Fixes darling#798
Fixes darling#1527

CuriousTommy

There are some changes I need you to fix first before I can merge this.

On a side note, is there a particular reason why you want to keep most of the new changes commented out? I think it would be better if we left them un-commented.

CoreText/CTFont.m

CoreText/CTFontDescriptor.m

CoreText/constants.c

CoreText/CTFont.m

jlucfarias · 2024-09-24T13:39:50Z

@CuriousTommy I think I fixed all requested changes: reverted the formatting changes, uncomment constants and moved from constants.c to the new file.
My reasons for keep commented was that it is not used right now to issues I'm trying to fix, but I wanted to add these constants to be available to anyone that want to contribute with the project in the future

CuriousTommy

Sorry for taking so long to review your new changes. Been feeling burned out lately...

CoreText/CTFont.m

CoreText/CTFontCollection.m

CoreText/CTFont.m

CoreText/include/CoreText/CTFont.h

CuriousTommy · 2024-10-29T05:03:19Z

@jlucfarias Did you get a chance to build and run your changes? I'm getting some errors:

/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:189:14: error: redefinition of 'CTFontTableOptions'
  189 | typedef enum CTFontTableOptions : uint32_t {
      |              ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:124:30: note: previous definition is here
  124 | typedef CF_OPTIONS(uint32_t, CTFontTableOptions) {
      |                              ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:190:5: error: redefinition of enumerator 'kCTFontTableOptionNoOptions'
  190 |     kCTFontTableOptionNoOptions = 0,
      |     ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:125:5: note: previous definition is here
  125 |     kCTFontTableOptionNoOptions        = 0,
      |     ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:191:5: error: redefinition of enumerator 'kCTFontTableOptionExcludeSynthetic'
  191 |     kCTFontTableOptionExcludeSynthetic = (1 << 0) // Deprecated
      |     ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:126:5: note: previous definition is here
  126 |     kCTFontTableOptionExcludeSynthetic = 1,
      |     ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:192:3: error: typedef redefinition with different types ('enum (unnamed enum at /home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:189:14)' vs 'enum CTFontTableOptions')
  192 | } CTFontTableOptions;
      |   ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:124:30: note: previous definition is here
  124 | typedef CF_OPTIONS(uint32_t, CTFontTableOptions) {
      |                              ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:219:125: error: unknown type name 'CTFontSymbolicTraits'
  219 | CORETEXT_EXPORT CTFontRef CTFontCreateCopyWithSymbolicTraits(CTFontRef font, CGFloat size, const CGAffineTransform *matrix, CTFontSymbolicTraits symTraitValue, CTFontSymbolicTraits symTraitMask);
      |                                                                                                                             ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:219:161: error: unknown type name 'CTFontSymbolicTraits'
  219 | CORETEXT_EXPORT CTFontRef CTFontCreateCopyWithSymbolicTraits(CTFontRef font, CGFloat size, const CGAffineTransform *matrix, CTFontSymbolicTraits symTraitValue, CTFontSymbolicTraits symTraitMask);
      |                                                                                                                                                                 ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:228:17: error: unknown type name 'CTFontSymbolicTraits'
  228 | CORETEXT_EXPORT CTFontSymbolicTraits CTFontGetSymbolicTraits(CTFontRef font);
      |                 ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:260:72: error: unknown type name 'CTFontOrientation'
  260 | CORETEXT_EXPORT CGRect CTFontGetBoundingRectsForGlyphs(CTFontRef font, CTFontOrientation orientation, const CGGlyph *glyphs, CGRect *boundingRects, CFIndex count);
      |                                                                        ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:261:67: error: unknown type name 'CTFontOrientation'
  261 | CORETEXT_EXPORT double CTFontGetAdvancesForGlyphs(CTFontRef font, CTFontOrientation orientation,
      |                                                                   ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:282:17: error: unknown type name 'ATSFontRef'; did you mean 'CTFontRef'?
  282 | CORETEXT_EXPORT ATSFontRef CTFontGetPlatformFont(CTFontRef font, CTFontDescriptorRef  _Nullable *attributes); // Deprecated
      |                 ^~~~~~~~~~
      |                 CTFontRef
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:27:44: note: 'CTFontRef' declared here
   27 | typedef struct CF_BRIDGED_TYPE(id) KTFont *CTFontRef;
      |                                            ^
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:283:56: error: unknown type name 'ATSFontRef'; did you mean 'CTFontRef'?
  283 | CORETEXT_EXPORT CTFontRef CTFontCreateWithPlatformFont(ATSFontRef platformFont, CGFloat size, const CGAffineTransform *matrix, CTFontDescriptorRef attributes); // Deprecated
      |                                                        ^~~~~~~~~~
      |                                                        CTFontRef
/home/thomasa/Downloads/darling2/framework-include/CoreText/CTFont.h:27:44: note: 'CTFontRef' declared here
   27 | typedef struct CF_BRIDGED_TYPE(id) KTFont *CTFontRef;
      |                                            ^
3 warnings and 11 errors generated.

jlucfarias · 2024-12-08T23:37:52Z

@CuriousTommy sorry for the late response. I couldn't build at the moment I sent my changes, but now I builded and fixed all errors related to Coretext changes. Please, try again

CuriousTommy

There might be some additional fixes you might need to do, but here is what I found.

CoreText/CTFont.m

CoreText/CTFontDescriptor.m

CoreText/include/CoreText/CTFont.h

CoreText/CTFont.m

CuriousTommy

Just a few more fixes needed:

https://github.com/darlinghq/darling-cocotron/blob/master/CoreGraphics/include/CoreGraphics/CGContext.h#L22

/home/[user]/Downloads/darling2/framework-include/CoreGraphics/CGContext.h:23:32: error: typedef redefinition with different types ('struct CF_BRIDGED_TYPE' vs 'id')
   23 | typedef struct CF_BRIDGED_TYPE(id) O2Context *CGContextRef;
      |                                ^

https://github.com/darlinghq/darling-cocotron/blob/master/CoreText/stubs.c#L3-L6

[ 45%] Linking C shared library CoreText
ld: warning: OS dylibs should not add rpaths (linker option: -rpath) (Xcode build setting: LD_RUNPATH_SEARCH_PATHS)
duplicate symbol '_CTFontCreateWithFontDescriptor' in:
    CMakeFiles/CoreText.dir/CTFont.m.o
    CMakeFiles/CoreText.dir/stubs.c.o
ld: 1 duplicate symbol for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)

CoreText/include/CoreText/CTFontTraits.h

CoreText/CTFont.m

CoreText/CTFontDescriptor.m

CuriousTommy · 2025-04-28T02:05:25Z

That's to be expected, there are some fixes that jlucfarias needs to do before I can merge this.

Lazerbeak12345 · 2025-04-28T02:11:05Z

yep! That's fine. I was just hoping to give it a spin, see if I notice anything, if it works etc.

Lazerbeak12345 · 2025-05-02T02:12:18Z

If I apply this patch to this branch, the branch compiles successfully, and my test program prints this near the end of it's logs (it crashes because of stubs, instead of missing symbols, so this is desired).

diff --git a/CoreGraphics/include/CoreGraphics/CGContext.h b/CoreGraphics/include/CoreGraphics/CGContext.h
index 12a110e5..973670ba 100644
--- a/CoreGraphics/include/CoreGraphics/CGContext.h
+++ b/CoreGraphics/include/CoreGraphics/CGContext.h
@@ -18,6 +18,7 @@ AN ACTION OF CONTRACT,TORT OR OTHERWISE,ARISING FROM,OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */

 #import <CoreGraphics/CoreGraphicsExport.h>
+#import <CoreFoundation/CFBase.h>

 typedef struct CF_BRIDGED_TYPE(id) O2Context *CGContextRef;

Here's the (successful) stubs in-use, logged from the software:

STUB CTFontCollectionRef CTFontCollectionCreateFromAvailableFonts(CFDictionaryRef)
STUB CFArrayRef CTFontCollectionCreateMatchingFontDescriptors(CTFontCollectionRef)

This patch is needed because the dependency was removed from CoreText/include/CoreText/CTFontDescriptor.h, and is next needed in CoreGraphics/include/CoreGraphics/CGContext.h. (this is the cause of the error that CuriousTommy noticed earlier)

Thanks so much for working on this!

jlucfarias · 2025-05-03T21:54:11Z

Sorry for the late response. Many thanks, @Lazerbeak12345. I was unable to search the solution for the error that CuriousTommy noticed and your patch worked like a charm. I've posted and made you as co-author of the commit because the change was your, not mine. @CuriousTommy, please review again

CuriousTommy · 2025-05-10T04:30:11Z

I was able to build without any build failures occurring. My only final request is that your combine your commits. After that, I'll merge it in.

Co-authored-by: Lazerbeak12345 <A02313752@aggies.usu.edu>

jlucfarias · 2025-05-10T13:03:47Z

@CuriousTommy done

All issues resolved!

CuriousTommy · 2025-05-10T17:47:08Z

Thank you for your contribution!

darlinghq/darling-cocotron#40 | Add some CoreText stub definitions

darlinghq/darling-cocotron#40 | Add some CoreText stub definitions darlinghq/darling-cocotron#42 | Fix NSWindowTemplate logic not applying to both keyed and unkeyed decoding

darlinghq/darling-cocotron#40 | Add some CoreText stub definitions darlinghq/darling-cocotron#42 | Fix NSWindowTemplate logic not applying to both keyed and unkeyed decoding darlinghq/darling-cocotron#43 | fix(CoreText): missing kCTFontOpenTypeFeature Key and Value

darlinghq/darling-cocotron#40 | Add some CoreText stub definitions darlinghq/darling-cocotron#42 | Fix NSWindowTemplate logic not applying to both keyed and unkeyed decoding darlinghq/darling-cocotron#43 | fix(CoreText): missing kCTFontOpenTypeFeature Key and Value darlinghq/darling-cocotron#44 | several missing symbols

CuriousTommy requested changes Sep 22, 2024

View reviewed changes

CuriousTommy requested changes Oct 26, 2024

View reviewed changes

jlucfarias changed the title ~~Add some CoreText stub definitions but keep most commented~~ Add some CoreText stub definitions Dec 10, 2024

CuriousTommy requested changes Dec 15, 2024

View reviewed changes

CuriousTommy previously requested changes Dec 30, 2024

View reviewed changes

CoreText/include/CoreText/CTFontTraits.h Outdated Show resolved Hide resolved

CoreText/CTFont.m Outdated Show resolved Hide resolved

CoreText/CTFontDescriptor.m Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

Add some CoreText stub definitions

29338b1

Co-authored-by: Lazerbeak12345 <A02313752@aggies.usu.edu>

jlucfarias force-pushed the add-missing-coretext-definitions branch from 66d0865 to 29338b1 Compare May 10, 2025 12:57

CuriousTommy merged commit f4564d8 into darlinghq:master May 10, 2025

jlucfarias deleted the add-missing-coretext-definitions branch May 10, 2025 18:42

CuriousTommy added a commit to darlinghq/darling that referenced this pull request May 11, 2025

Update Submodule

c9c4391

darlinghq/darling-cocotron#40 | Add some CoreText stub definitions

CuriousTommy mentioned this pull request May 11, 2025

Update Submodules darlinghq/darling#1586

Merged

Lazerbeak12345 mentioned this pull request May 11, 2025

Missing _kCTFontOpenTypeFeatureTag symbol darlinghq/darling#1588

Closed

Comments

Conversation

jlucfarias commented Sep 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CuriousTommy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jlucfarias commented Sep 24, 2024

Uh oh!

CuriousTommy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CuriousTommy commented Oct 29, 2024

Uh oh!

jlucfarias commented Dec 8, 2024

Uh oh!

CuriousTommy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CuriousTommy left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment was marked as resolved.

CuriousTommy commented Apr 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Lazerbeak12345 commented Apr 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Lazerbeak12345 commented May 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jlucfarias commented May 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CuriousTommy commented May 10, 2025

Uh oh!

jlucfarias commented May 10, 2025

Uh oh!

CuriousTommy commented May 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jlucfarias commented Sep 21, 2024 •

edited

Loading

CuriousTommy left a comment •

edited

Loading

CuriousTommy commented Apr 28, 2025 •

edited

Loading

Lazerbeak12345 commented Apr 28, 2025 •

edited

Loading

Lazerbeak12345 commented May 2, 2025 •

edited

Loading

jlucfarias commented May 3, 2025 •

edited

Loading