-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add the unofficial pdf2htmlEX 0.18.8.rc2 release. Bump fontforge dep
- Loading branch information
1 parent
ac12eae
commit 77cd473
Showing
9 changed files
with
1,171 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --- pdf2htmlEX/CMakeLists.txt 2023-11-15 02:31:51.534000000 +0200 | ||
| +++ pdf2htmlEX/CMakeLists.txt 2023-11-15 02:31:58.159000000 +0200 | ||
| @@ -39,15 +39,6 @@ | ||
| pkg_search_module(FONTFORGE REQUIRED IMPORTED_TARGET libfontforge=20200314) | ||
| set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} PkgConfig::FONTFORGE) | ||
|
|
||
| -# debug build flags (overwrite default cmake debug flags) | ||
| -set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg") | ||
| -set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pg") | ||
| -set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-pg") | ||
| - | ||
| -# release build flags (overwrite default cmake release flags) | ||
| -set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") | ||
| -set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") | ||
| - | ||
| # generic flags | ||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| --- pdf2htmlEX/src/util/ffw.c 2023-12-14 07:45:44.994000000 +0200 | ||
| +++ pdf2htmlEX/src/util/ffw.c 2023-12-14 07:46:21.870000000 +0200 | ||
| @@ -70,7 +70,9 @@ | ||
| void ffw_init(const char* progPath, int debug) | ||
| { | ||
| ffwSetAction("initialize"); | ||
| - char *localProgPath = strdup(progPath); | ||
| - FindProgDir(localProgPath); | ||
| + char *localProgPath = NULL; | ||
| + if (progPath != NULL) | ||
| + localProgPath = strdup(progPath); | ||
| + FindProgRoot(localProgPath); | ||
| InitSimpleStuff(); | ||
| if ( default_encoding==NULL ) | ||
| default_encoding=FindOrMakeEncoding("ISO8859-1"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| --- pdf2htmlEX/CMakeLists.txt 2023-11-14 03:32:25.260000000 +0200 | ||
| +++ pdf2htmlEX/CMakeLists.txt 2023-11-15 02:28:10.440000000 +0200 | ||
| @@ -23,90 +23,22 @@ | ||
|
|
||
| find_package(PkgConfig) | ||
|
|
||
| - | ||
| -# SINCE we have a very intimate relationship with a particular version of | ||
| -# poppler... we explicitly describe the poppler include and library | ||
| -# paths. | ||
| -# | ||
| -include_directories( | ||
| - ../poppler/build/poppler | ||
| - ../poppler/build | ||
| - ../poppler/poppler | ||
| - ../poppler | ||
| -) | ||
| -# | ||
| -# The following order is critical as the glib functions use functions | ||
| -# located in the main poppler library | ||
| -# | ||
| -set(POPPLER_LIBRARIES ${POPPLER_LIBRARIES} | ||
| - ${CMAKE_SOURCE_DIR}/../poppler/build/glib/libpoppler-glib.a | ||
| - ${CMAKE_SOURCE_DIR}/../poppler/build/libpoppler.a | ||
| -) | ||
| - | ||
| +pkg_search_module(POPPLER-GLIB REQUIRED IMPORTED_TARGET poppler-glib=21.02.0) | ||
| +set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} PkgConfig::POPPLER-GLIB) | ||
|
|
||
| if(ENABLE_SVG) | ||
| - pkg_check_modules(CAIRO REQUIRED cairo>=1.10.0) | ||
| - message("-- Trying to locate cairo-svg...") | ||
| - find_path(CAIRO_SVG_INCLUDE_PATH cairo-svg.h PATHS ${CAIRO_INCLUDE_DIRS} NO_DEFAULT_PATH) | ||
| - if(CAIRO_SVG_INCLUDE_PATH) | ||
| - message("-- found cairo-svg...") | ||
| - include_directories(${CAIRO_INCLUDE_DIRS}) | ||
| - if(NOT DEFINED ENV{USING_BREW}) | ||
| - link_directories(${CAIRO_LIBRARY_DIRS}) | ||
| - set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${CAIRO_LIBRARIES}) | ||
| - endif() | ||
| - set(ENABLE_SVG 1) | ||
| - else() | ||
| - message(FATAL_ERROR "Error: no SVG support found in Cairo") | ||
| - endif() | ||
| - | ||
| - find_package(Freetype REQUIRED) | ||
| - include_directories(${FREETYPE_INCLUDE_DIRS}) | ||
| - link_directories(${FREETYPE_LIBRARY_DIRS}) | ||
| -# set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FREETYPE_LIBRARIES}) | ||
| -endif() | ||
| + pkg_search_module(CAIRO_SVG REQUIRED IMPORTED_TARGET cairo-svg) | ||
| + set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} PkgConfig::CAIRO_SVG) | ||
| + | ||
| + set(ENABLE_SVG 1) | ||
|
|
||
| -# SINCE we have a very intimate relationship with a particular version of | ||
| -# fontforge... we explicitly describe the fontforge include and library | ||
| -# paths. | ||
| -# | ||
| -include_directories( | ||
| - ../fontforge/fontforge | ||
| - ../fontforge | ||
| - ../fontforge/build/inc | ||
| - ../fontforge/inc | ||
| -) | ||
| -# | ||
| -include_directories(${FONTFORGE_INCLUDE_DIRS}) | ||
| -link_directories(${FONTFORGE_LIBRARY_DIRS}) | ||
| -set(FONTFORGE_LIBRARIES ${FONTFORGE_LIBRARIES} | ||
| - ${CMAKE_SOURCE_DIR}/../fontforge/build/lib/libfontforge.a | ||
| -) | ||
| - | ||
| -# If we are using Alpine Linux then we need to add -lintl | ||
| -# | ||
| -if (EXISTS /usr/lib/libintl.so ) | ||
| - set(LIB_INTL_LIBRARIES -lintl ) | ||
| -else () | ||
| - set(LIB_INTL_LIBRARIES "" ) | ||
| + pkg_search_module(FREETYPE REQUIRED IMPORTED_TARGET freetype2) | ||
| + set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} PkgConfig::FREETYPE) | ||
| endif() | ||
|
|
||
| -set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} | ||
| - ${POPPLER_LIBRARIES} | ||
| - ${FONTFORGE_LIBRARIES} | ||
| - ${LIB_INTL_LIBRARIES} | ||
| - ${CAIRO_LIBRARIES} | ||
| - -ljpeg | ||
| - -lpng | ||
| - -lfontconfig | ||
| - -lfreetype | ||
| - -lxml2 | ||
| - -lglib-2.0 | ||
| - -lgio-2.0 | ||
| - -pthread | ||
| - -lz | ||
| - -lm | ||
| -) | ||
| +pkg_search_module(FONTFORGE REQUIRED IMPORTED_TARGET libfontforge=20230101) | ||
| +set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} PkgConfig::FONTFORGE) | ||
| +include_directories(${FONTFORGE_INCLUDEDIR}/private) | ||
|
|
||
| # debug build flags (overwrite default cmake debug flags) | ||
| set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg") |
Oops, something went wrong.