Update pdf2htmlEX 0.18.8.rc2 patches

ViliusSutkus89 · Dec 14, 2023 · 8c58a48 · 8c58a48
1 parent ac39e20
commit 8c58a48
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/pdf2htmlEX/patches/0.18.8.rc2/cflags.patch b/pdf2htmlEX/patches/0.18.8.rc2/cflags.patch
@@ -1,8 +1,8 @@
 --- 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)
+@@ -40,15 +40,6 @@
  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")

diff --git a/pdf2htmlEX/patches/0.18.8.rc2/ffw.patch b/pdf2htmlEX/patches/0.18.8.rc2/ffw.patch
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -70,8 +70,10 @@
  void ffw_init(const char* progPath, int debug)
  {
      ffwSetAction("initialize");
@@ -12,4 +12,22 @@
 +    FindProgRoot(localProgPath);
      InitSimpleStuff();
      if ( default_encoding==NULL )
-        default_encoding=FindOrMakeEncoding("ISO8859-1");
+         default_encoding=FindOrMakeEncoding("ISO8859-1");
+@@ -290,7 +290,7 @@
+     ffwClearAction();
+ }
+
+-void ffw_reencode_raw(int32 * mapping, int mapping_len, int force)
++void ffw_reencode_raw(int32_t * mapping, int mapping_len, int force)
+ {
+     ffwSetAction("re-encode (raw1)");
+     Encoding * enc = calloc(1, sizeof(Encoding));
+@@ -574,7 +574,7 @@
+ void ffw_override_fstype(void)
+ {
+     ffwSetAction("override the fstype of");
+-    *(int16 *)(&cur_fv->sf->pfminfo.fstype) = 0;
++    *(int16_t *)(&cur_fv->sf->pfminfo.fstype) = 0;
+     cur_fv->sf->pfminfo.pfmset = true;
+     cur_fv->sf->changed = true;
+     ffwClearAction();
diff --git a/pdf2htmlEX/patches/0.18.8.rc2/make-a-library.patch b/pdf2htmlEX/patches/0.18.8.rc2/make-a-library.patch
@@ -1,6 +1,6 @@
 --- pdf2htmlEX/CMakeLists.txt	2023-11-15 02:31:58.159000000 +0200
 +++ pdf2htmlEX/CMakeLists.txt	2023-11-04 11:02:15.884000000 +0200
-@@ -50,37 +50,16 @@
+@@ -44,37 +44,16 @@
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual")
 
@@ -46,15 +46,15 @@
  configure_file (${CMAKE_SOURCE_DIR}/src/pdf2htmlEX-config.h.in ${CMAKE_SOURCE_DIR}/src/pdf2htmlEX-config.h)
  configure_file (${CMAKE_SOURCE_DIR}/pdf2htmlEX.1.in ${CMAKE_SOURCE_DIR}/pdf2htmlEX.1)
 
-@@ -90,7 +71,6 @@
+@@ -86,7 +65,6 @@
 
  set(PDF2HTMLEX_SRC ${PDF2HTMLEX_SRC}
      src/Param.h
 -    src/pdf2htmlEX.cc
      src/pdf2htmlEX-config.h
      src/HTMLRenderer/HTMLRenderer.h
      src/HTMLRenderer/draw.cc
-@@ -149,8 +129,11 @@
+@@ -147,8 +125,11 @@
      src/TmpFiles.cc
      )
 
@@ -68,7 +68,7 @@
 
  add_custom_target(pdf2htmlEX_resources ALL DEPENDS
      ${CMAKE_SOURCE_DIR}/share/base.min.css
-@@ -175,7 +158,14 @@
+@@ -173,7 +154,14 @@
          ${CMAKE_SOURCE_DIR}/share/fancy.css
      )
 

diff --git a/pdf2htmlEX/patches/0.18.8.rc2/missing-tests.patch b/pdf2htmlEX/patches/0.18.8.rc2/missing-tests.patch
@@ -1,6 +1,6 @@
 --- pdf2htmlEX/CMakeLists.txt	2020-08-19 23:43:25.000000000 +0300
 +++ pdf2htmlEX/CMakeLists.txt	2023-11-14 03:29:50.860000000 +0200
-@@ -280,8 +280,9 @@
+@@ -203,8 +203,9 @@
  file(MAKE_DIRECTORY ${PDF2HTMLEX_DATDIR})
  file(MAKE_DIRECTORY ${PDF2HTMLEX_PNGDIR})
  file(MAKE_DIRECTORY ${PDF2HTMLEX_OUTDIR})