diff options
| author | abs <abs@pkgsrc.org> | 2018-12-13 16:34:10 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2018-12-13 16:34:10 +0000 |
| commit | fe5c38d17034b4b0d6bafc1e8fd186ab48442acc (patch) | |
| tree | 595246df46783a31fa7998e739e84be8a14d339b /misc/libreoffice/patches | |
| parent | 0572e4c969ed5eaed23077aa8810d40ed30ee7b1 (diff) | |
| download | pkgsrc-fe5c38d17034b4b0d6bafc1e8fd186ab48442acc.tar.gz | |
Copy harfbuzz patch to avoid playing _POSIX_C_SOURCE games on NetBSD - causes issues with some pkgsrc gcc versions
Diffstat (limited to 'misc/libreoffice/patches')
| -rw-r--r-- | misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk | 16 | ||||
| -rw-r--r-- | misc/libreoffice/patches/patch-external_harfbuzz_src-hb.patch | 20 |
2 files changed, 27 insertions, 9 deletions
diff --git a/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk b/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk index fd149fd4199..419f9b5d24e 100644 --- a/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk +++ b/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk @@ -1,16 +1,14 @@ -$NetBSD: patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk,v 1.4 2018/08/18 00:11:32 ryoon Exp $ +$NetBSD: patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk,v 1.5 2018/12/13 16:34:10 abs Exp $ ---- external/harfbuzz/UnpackedTarball_harfbuzz.mk.orig 2018-08-02 19:54:54.000000000 +0000 +--- external/harfbuzz/UnpackedTarball_harfbuzz.mk.orig 2018-10-29 19:55:29.000000000 +0000 +++ external/harfbuzz/UnpackedTarball_harfbuzz.mk -@@ -15,11 +15,6 @@ $(eval $(call gb_UnpackedTarball_update_ - +@@ -16,8 +16,7 @@ $(eval $(call gb_UnpackedTarball_update_ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0)) --$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ + $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ - external/harfbuzz/clang-cl.patch \ - external/harfbuzz/ubsan.patch \ --)) -- ++ external/harfbuzz/src-hb.patch \ + )) + ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE) - $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ - external/harfbuzz/harfbuzz-rtti.patch \ diff --git a/misc/libreoffice/patches/patch-external_harfbuzz_src-hb.patch b/misc/libreoffice/patches/patch-external_harfbuzz_src-hb.patch new file mode 100644 index 00000000000..302394e3964 --- /dev/null +++ b/misc/libreoffice/patches/patch-external_harfbuzz_src-hb.patch @@ -0,0 +1,20 @@ +$NetBSD: patch-external_harfbuzz_src-hb.patch,v 1.1 2018/12/13 16:34:10 abs Exp $ + +Do not play _POSIX_C_SOURCE games on NetBSD - causes issues with some pkgsrc gcc versions + +--- external/harfbuzz/src-hb.patch.orig 2018-11-25 20:23:26.560427478 +0000 ++++ external/harfbuzz/src-hb.patch +@@ -0,0 +1,13 @@ ++Do not play _POSIX_C_SOURCE games on NetBSD - causes issues with some pkgsrc gcc versions ++ ++--- src/hb.hh.orig 2018-11-04 01:41:46.000000000 +0000 +++++ src/hb.hh ++@@ -35,7 +35,7 @@ ++ #include "config.h" ++ #endif ++ ++-#ifndef _POSIX_C_SOURCE +++#if !defined(_POSIX_C_SOURCE) && !defined(__NetBSD__) ++ #define _POSIX_C_SOURCE 200809L ++ #endif ++ |