Skip to content

Commit

Permalink
Merge pull request #493 from galkahana/galk.pdfwriter_4_6_7_upgrade
Browse files Browse the repository at this point in the history 
feat: upgrading to pdfwriter 4.6.7
  • Loading branch information
@galkahana
galkahana authored Sep 21, 2024
2 parents a198eaa + 71b99e9 commit e86bb28
Show file tree
Hide file tree
Showing 903 changed files with 185,567 additions and 201,388 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,9 @@ jobs:
matrix:
os: [ubuntu-20.04, macos-14, windows-2019]
node: [13.14.0, 14.0.0, 15.7.0, 16.13.1, 17.6.0, 18.8.0, 19.0.0, 20.0.0]
architecture: [x64, ia32, arm64]
architecture: [x64, arm64]
include:
- python_version: "3.10"
- architecture: ia32
architecture_node: x86
target_architecture: ia32
- architecture: x64
architecture_node: x64
target_architecture: x64
Expand All @@ -54,10 +51,6 @@ jobs:
architecture: arm64
- os: windows-2019
architecture: arm64
- os: macos-14
architecture: ia32
- os: ubuntu-20.04
architecture: ia32
- os: macos-14
node: 13.14.0
architecture: arm64
Expand Down
104 changes: 58 additions & 46 deletions src/deps/FreeType/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,88 +1,100 @@
cmake_minimum_required (VERSION 2.6)
project(FreeType)

set(FREETYPE_INCLUDE_DIRS ${FreeType_SOURCE_DIR}/include PARENT_SCOPE)
set(FREETYPE_LDFLAGS FreeType PARENT_SCOPE)

add_definitions(-DFT2_BUILD_LIBRARY=1)
include_directories (${FreeType_SOURCE_DIR}/include)
include_directories (${FreeType_SOURCE_DIR}/include/freetype)
include_directories (${FreeType_SOURCE_DIR}/include/freetype/config)
include_directories (${FreeType_SOURCE_DIR}/include/src)
include_directories (${FreeType_SOURCE_DIR}/include/freetype/internal)
include_directories (${FreeType_SOURCE_DIR}/include/freetype/internal/services)

add_library (FreeType_OBJLIB OBJECT
#sources
add_library(FreeType
# sources
src/autofit/autofit.c
src/base/ftbase.c
src/base/ftbbox.c
src/base/ftbdf.c
src/base/ftbitmap.c
src/base/ftcid.c
src/base/ftfstype.c
src/base/ftgasp.c
src/base/ftglyph.c
src/base/ftgxval.c
src/base/ftlcdfil.c
src/base/ftinit.c
src/base/ftmm.c
src/base/ftotval.c
src/base/ftpatent.c
src/base/ftpfr.c
src/base/ftstroke.c
src/base/ftsynth.c
src/base/fttype1.c
src/base/ftwinfnt.c
src/base/ftxf86.c
#src/otvalid/otvalid.c
src/bdf/bdf.c
src/bzip2/ftbzip2.c
src/cache/ftcache.c
src/cff/cff.c
src/cid/type1cid.c
src/gzip/ftgzip.c
src/lzw/ftlzw.c
src/pcf/pcf.c
src/pfr/pfr.c
src/psaux/psaux.c
src/pshinter/pshinter.c
src/psnames/psmodule.c
#src/psnames/psnames.c
src/psnames/psnames.c
src/raster/raster.c
src/sdf/sdf.c
src/sfnt/sfnt.c
src/smooth/smooth.c
src/svg/svg.c
src/truetype/truetype.c
src/type1/type1.c
src/type42/type42.c
src/cid/type1cid.c
src/winfonts/winfnt.c
src/autofit/autofit.c
src/bdf/bdf.c
src/cff/cff.c
src/base/ftbase.c
src/base/ftbitmap.c
src/cache/ftcache.c
src/base/ftcid.c
src/base/ftdebug.c
src/base/ftfstype.c
src/base/ftgasp.c
src/base/ftglyph.c
src/gzip/ftgzip.c
src/base/ftinit.c
src/lzw/ftlzw.c
src/base/ftstroke.c

# additional sources (in original determined by system)
src/base/ftsystem.c
src/smooth/smooth.c
src/base/ftdebug.c

#headers
include/freetype/config/ftconfig.h
include/freetype/config/ftheader.h
include/freetype/config/ftmodule.h
include/freetype/config/ftoption.h
include/freetype/config/ftstdlib.h
include/ft2build.h
include/ft2build.h
)

add_library(PDFHummus::FreeType ALIAS FreeType)

target_include_directories(FreeType
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include/FreeType/include>
)

set(FreeType_OBJECTS $<TARGET_OBJECTS:FreeType_OBJLIB>)
set(FreeType_OBJECTS $<TARGET_OBJECTS:FreeType_OBJLIB> PARENT_SCOPE)
if (WIN32 AND BUILD_SHARED_LIBS)
target_compile_definitions(
FreeType PRIVATE DLL_EXPORT)
endif ()

if(IS_XCODE)
add_library(FreeType ${FreeType_OBJECTS} src/smooth/smooth.c)
else(IS_XCODE)
add_library(FreeType ${FreeType_OBJECTS})
endif(IS_XCODE)
# set to use FT_CONFIG_OPTION_SYSTEM_ZLIB...or in other words...another zlib
target_compile_definitions(FreeType PUBLIC FT2_BUILD_LIBRARY=1 FT_CONFIG_OPTION_SYSTEM_ZLIB=1)
if(USING_UNBUNDLED_ZLIB)
target_link_libraries(FreeType ZLIB::ZLIB)
else(USING_UNBUNDLED_ZLIB)
target_link_libraries(FreeType PDFHummus::Zlib)
endif(USING_UNBUNDLED_ZLIB)


target_include_directories(FreeType
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/include/freetype
${CMAKE_CURRENT_SOURCE_DIR}/include/freetype/config
${CMAKE_CURRENT_SOURCE_DIR}/include/src
${CMAKE_CURRENT_SOURCE_DIR}/include/freetype/internal
${CMAKE_CURRENT_SOURCE_DIR}/include/freetype/internal/services
)

install(TARGETS FreeType
EXPORT PDFHummusTargets
RUNTIME DESTINATION bin COMPONENT dependencies
ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dependencies
LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT dependencies
)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include
DESTINATION include/FreeType
COMPONENT dependencies
FILES_MATCHING
PATTERN "*.h"
)
)
87 changes: 45 additions & 42 deletions src/deps/FreeType/binding.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,60 @@
'target_name': 'freetype',
'type': 'static_library',
'defines': [
'FT2_BUILD_LIBRARY=1'
'FT2_BUILD_LIBRARY=1',
'FT_CONFIG_OPTION_SYSTEM_ZLIB=1'
],
'include_dirs': [
'./include',
'./include',
'./include/freetype',
'./include/freetype/config',
'./include/src',
'./include/freetype/internal',
'./include/freetype/internal/services'
],
'sources': [
'./src/base/ftbbox.c',
'./src/base/ftgxval.c',
'./src/base/ftlcdfil.c',
'./src/base/ftmm.c',
'./src/base/ftotval.c',
'./src/base/ftpatent.c',
'./src/base/ftpfr.c',
'./src/base/ftsynth.c',
'./src/base/fttype1.c',
'./src/base/ftwinfnt.c',
'./src/base/ftxf86.c',
'./src/pcf/pcf.c',
'./src/pfr/pfr.c',
'./src/psaux/psaux.c',
'./src/pshinter/pshinter.c',
'./src/psnames/psmodule.c',
'./src/raster/raster.c',
'./src/sfnt/sfnt.c',
'./src/truetype/truetype.c',
'./src/type1/type1.c',
'./src/type42/type42.c',
'./src/cid/type1cid.c',
'./src/winfonts/winfnt.c',
'./src/autofit/autofit.c',
'./src/bdf/bdf.c',
'./src/cff/cff.c',
'./src/base/ftbase.c',
'./src/base/ftbitmap.c',
'./src/cache/ftcache.c',
'./src/base/ftcid.c',
'./src/base/ftdebug.c',
'./src/base/ftfstype.c',
'./src/base/ftgasp.c',
'./src/base/ftglyph.c',
'./src/gzip/ftgzip.c',
'./src/base/ftinit.c',
'./src/lzw/ftlzw.c',
'./src/base/ftstroke.c',
'./src/base/ftsystem.c',
'./src/smooth/smooth.c',
'./src/autofit/autofit.c',
'./src/base/ftbase.c',
'./src/base/ftbbox.c',
'./src/base/ftbdf.c',
'./src/base/ftbitmap.c',
'./src/base/ftcid.c',
'./src/base/ftfstype.c',
'./src/base/ftgasp.c',
'./src/base/ftglyph.c',
'./src/base/ftgxval.c',
'./src/base/ftinit.c',
'./src/base/ftmm.c',
'./src/base/ftotval.c',
'./src/base/ftpatent.c',
'./src/base/ftpfr.c',
'./src/base/ftstroke.c',
'./src/base/ftsynth.c',
'./src/base/fttype1.c',
'./src/base/ftwinfnt.c',
'./src/bdf/bdf.c',
'./src/bzip2/ftbzip2.c',
'./src/cache/ftcache.c',
'./src/cff/cff.c',
'./src/cid/type1cid.c',
'./src/gzip/ftgzip.c',
'./src/lzw/ftlzw.c',
'./src/pcf/pcf.c',
'./src/pfr/pfr.c',
'./src/psaux/psaux.c',
'./src/pshinter/pshinter.c',
'./src/psnames/psnames.c',
'./src/raster/raster.c',
'./src/sdf/sdf.c',
'./src/sfnt/sfnt.c',
'./src/smooth/smooth.c',
'./src/svg/svg.c',
'./src/truetype/truetype.c',
'./src/type1/type1.c',
'./src/type42/type42.c',
'./src/winfonts/winfnt.c',
'./src/base/ftsystem.c',
'./src/base/ftdebug.c',
'./include/freetype/config/ftconfig.h',
'./include/freetype/config/ftheader.h',
'./include/freetype/config/ftmodule.h',
Expand Down
110 changes: 0 additions & 110 deletions src/deps/FreeType/builds/amiga/README
View file

This file was deleted.

Loading

0 comments on commit e86bb28

Please sign in to comment.