mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 15:08:57 +02:00
154312f651
* Mark 1.10~a as broken since there are still a few issues:
- libmupdf.so is not being built.
- libmupdfthird.a is being built but is empty.
- unlike 1.8, 1.10~a cannot be built on x88_gcc2 primary
arch because a dependency on harfbuzz was added. That
said, it might be possible to remove that dependency.
* Updated patches from 1.8 to 1.10~a.
* Added patches to fix includes for hb.h and hb-ft.h and to
skip unneeded workaround in source/fitz/load-jpx.c
* Merged/replaced old patch with one from @korli.
* Add dependency on libharfbuzz and libglib_2.0 too, as it is
required by harfbuzz.
53 lines
1.2 KiB
Plaintext
53 lines
1.2 KiB
Plaintext
From 1523c988bf2755d2db8358b04010a3f62c684211 Mon Sep 17 00:00:00 2001
|
|
From: fbrosson <fbrosson@localhost>
|
|
Date: Mon, 28 Nov 2016 13:37:54 +0000
|
|
Subject: Fix includes for hb.h and hb-ft.h.
|
|
|
|
|
|
diff --git a/source/fitz/font.c b/source/fitz/font.c
|
|
index 4e30579..f784739 100644
|
|
--- a/source/fitz/font.c
|
|
+++ b/source/fitz/font.c
|
|
@@ -3,8 +3,8 @@
|
|
#include "font-imp.h"
|
|
|
|
#include <ft2build.h>
|
|
-#include "hb.h"
|
|
-#include "hb-ft.h"
|
|
+#include <harfbuzz/hb.h>
|
|
+#include <harfbuzz/hb-ft.h>
|
|
|
|
#include FT_FREETYPE_H
|
|
#include FT_ADVANCES_H
|
|
diff --git a/source/fitz/harfbuzz.c b/source/fitz/harfbuzz.c
|
|
index e2b4e83..84bcf48 100644
|
|
--- a/source/fitz/harfbuzz.c
|
|
+++ b/source/fitz/harfbuzz.c
|
|
@@ -5,7 +5,7 @@
|
|
|
|
#include "mupdf/fitz.h"
|
|
|
|
-#include "hb.h"
|
|
+#include <harfbuzz/hb.h>
|
|
|
|
/* Harfbuzz has some major design flaws.
|
|
*
|
|
diff --git a/source/html/html-layout.c b/source/html/html-layout.c
|
|
index 95f2a76..31b1d1f 100644
|
|
--- a/source/html/html-layout.c
|
|
+++ b/source/html/html-layout.c
|
|
@@ -1,8 +1,8 @@
|
|
#include "mupdf/html.h"
|
|
#include "mupdf/svg.h"
|
|
|
|
-#include "hb.h"
|
|
-#include "hb-ft.h"
|
|
+#include <harfbuzz/hb.h>
|
|
+#include <harfbuzz/hb-ft.h>
|
|
#include <ft2build.h>
|
|
|
|
#undef DEBUG_HARFBUZZ
|
|
--
|
|
2.11.0
|
|
|