Skip to content

Bump ft2 to build on macos #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: cabalization
Choose a base branch
from
Open

Bump ft2 to build on macos #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec49277
Update bundled ft2
dpwiz Jun 11, 2025
d2acf92
Fix macos build
dpwiz Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 1 addition & 4 deletions FreeType/Core/Base/Internal.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,8 @@ import FreeType.Circular.Types
import FreeType.Core.Base.Types
import FreeType.Core.Types.Types

#ifdef aarch64_HOST_ARCH
import Data.Word
#else
import Data.Int
#endif
import Foreign.Ptr

#include "ft2build.h"
Expand Down Expand Up @@ -150,7 +147,7 @@ foreign import ccall "FT_Open_Face"

foreign import ccall "FT_Attach_File"
ft_Attach_File'
:: FT_Face
:: FT_Face
-> Ptr #{type char} -- ^ face
-> IO FT_Error -- ^ filepathname

Expand Down
1 change: 1 addition & 0 deletions FreeType/Core/Layer/Types.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Foreign.Storable.Offset

#include "ft2build.h"
#include FT_FREETYPE_H
#include FT_COLOR_H

data FT_LayerIterator = FT_LayerIterator
{ liNum_layers :: FT_UInt
Expand Down
3 changes: 0 additions & 3 deletions FreeType/Error/Enumerations/Internal.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ module FreeType.Error.Enumerations.Internal

import FreeType.Core.Types.Types

#ifdef aarch64_HOST_ARCH
import Data.Word
#else
import Data.Int
#endif
import Foreign.Ptr

#include "ft2build.h"
Expand Down
3 changes: 0 additions & 3 deletions FreeType/Format/BDF/Internal.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ import FreeType.Core.Base.Types
import FreeType.Core.Types.Types
import FreeType.Format.BDF.Types

#ifdef aarch64_HOST_ARCH
import Data.Word
#else
import Data.Int
#endif
import Foreign.Ptr

#include "ft2build.h"
Expand Down
2 changes: 0 additions & 2 deletions FreeType/Format/BDF/Types.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ module FreeType.Format.BDF.Types where

import FreeType.Core.Types.Types

#ifndef aarch64_HOST_ARCH
import Data.Int
#endif
import Data.Word
import Foreign.Ptr
import Foreign.Storable
Expand Down
3 changes: 0 additions & 3 deletions FreeType/Format/CID/Internal.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ module FreeType.Format.CID.Internal
import FreeType.Core.Base
import FreeType.Core.Types.Types

#ifdef aarch64_HOST_ARCH
import Data.Word
#else
import Data.Int
#endif
import Foreign.Ptr

#include "ft2build.h"
Expand Down
3 changes: 0 additions & 3 deletions FreeType/Format/Font/Internal.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ module FreeType.Format.Font.Internal

import FreeType.Core.Base.Types

#ifdef aarch64_HOST_ARCH
import Data.Word
#else
import Data.Int
#endif
import Foreign.Ptr

#include "ft2build.h"
Expand Down
3 changes: 0 additions & 3 deletions FreeType/Support/Module/Internal.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@ import FreeType.Core.Types.Types
import FreeType.Support.Module.Types
import FreeType.Support.System.Types

#ifdef aarch64_HOST_ARCH
import Data.Word
#else
import Data.Int
#endif
import Foreign.Ptr

#include "ft2build.h"
Expand Down
3 changes: 0 additions & 3 deletions FreeType/Support/Module/Types.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@ import FreeType.Circular.Types ( FT_ModuleRec, FT_Module
import FreeType.Core.Types.Types
import FreeType.Support.Scanline.Types

#ifdef aarch64_HOST_ARCH
import Data.Word
#else
import Data.Int
#endif
import Foreign.Ptr
import Foreign.Storable
import Foreign.Storable.Offset
Expand Down
3 changes: 2 additions & 1 deletion freetype2-plus/src/ftbitmap-plus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include <freetype/internal/compiler-macros.h>
#include <freetype/internal/ftdebug.h>

#include FT_BITMAP_H

Expand Down
3 changes: 2 additions & 1 deletion freetype2-plus/src/ftcolor-plus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include <freetype/internal/compiler-macros.h>
#include <freetype/internal/ftdebug.h>

#include FT_COLOR_H

Expand Down
6 changes: 5 additions & 1 deletion freetype2.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Library
FreeType.Miscellaneous.Incremental.Types
FreeType.Miscellaneous.TrueType.Types

Build-depends: base >= 4.10 && < 4.17
Build-depends: base >= 4.10 && < 5
, storable-offset

Build-tools: hsc2hs
Expand All @@ -208,6 +208,8 @@ Library
freetype2/src/autofit
freetype2/src/pshinter
freetype2/src/raster
freetype2/src/sdf
freetype2/src/svg
freetype2/src/smooth
freetype2/src/cache
freetype2/src/gzip
Expand Down Expand Up @@ -254,7 +256,9 @@ Library
freetype2/src/winfonts/winfnt.c
freetype2/src/pcf/pcf.c
freetype2/src/bdf/bdf.c
freetype2/src/sdf/sdf.c
freetype2/src/sfnt/sfnt.c
freetype2/src/svg/svg.c
freetype2/src/autofit/autofit.c
freetype2/src/pshinter/pshinter.c
freetype2/src/raster/raster.c
Expand Down
Loading