diff options
| author | Khaled Hosny <khaled@aliftype.com> | 2023-02-21 17:04:02 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-02-22 09:02:40 +0000 |
| commit | a881850d5828dba3a19f2d53c995e9610d6d87b1 (patch) | |
| tree | f401f0ee50657a89ca3ebd01a1b047ce889cbf79 /external/harfbuzz | |
| parent | 1aa37ca99112c0760552600d7774ba7224581c5b (diff) | |
vcl: Avoid the need to patch HarfBuzz
Reverts parts of d552b4a549d614a03aa9328e017dec27bd3ff41e and
97e2e73e87479a742b798f362eda4baafb89497c.
Instead of patching HarfBuzz, lets make use of the already mmap’ed file
we use with FreeType.
Change-Id: Ia81222118162a30cadb8c988bc477ad3ce36166d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147410
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/harfbuzz')
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 3 | ||||
| -rw-r--r-- | external/harfbuzz/harfbuzz-fd-hack.patch.0 | 24 |
2 files changed, 0 insertions, 27 deletions
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 37c5946a5ce4..9bc9e326b426 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -16,9 +16,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,harfbuzz)) $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0)) $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ - $(if $(filter LINUX,$(OS)), \ - external/harfbuzz/harfbuzz-fd-hack.patch.0 \ - ) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/harfbuzz-fd-hack.patch.0 b/external/harfbuzz/harfbuzz-fd-hack.patch.0 deleted file mode 100644 index 1cc5820fd49c..000000000000 --- a/external/harfbuzz/harfbuzz-fd-hack.patch.0 +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: Diff -*- ---- src/hb-blob.cc -+++ src/hb-blob.cc -@@ -737,7 +737,19 @@ - char *data = (char *) hb_malloc (allocated); - if (unlikely (!data)) return nullptr; - -- FILE *fp = fopen (file_name, "rb"); -+ FILE *fp; -+ int nFD; -+ int n; -+ if (sscanf (file_name, "/:FD:/%d%n", &nFD, &n) == 1 && file_name[n] == '\0') -+ { -+ lseek (nFD, 0, SEEK_SET); -+ fp = fdopen (dup (nFD), "rb"); -+ } -+ else -+ { -+ fp = fopen (file_name, "rb"); -+ } -+ - if (unlikely (!fp)) goto fread_fail_without_close; - - while (!feof (fp)) |