CVS commit: pkgsrc/misc/libreoffice

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Thu Dec 13 16:34:10 UTC 2018

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
        pkgsrc/misc/libreoffice/patches:
            patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
Added Files:
        pkgsrc/misc/libreoffice/patches: patch-external_harfbuzz_src-hb.patch

Log Message:
Copy harfbuzz patch to avoid playing _POSIX_C_SOURCE games on NetBSD - causes issues with some pkgsrc gcc versions


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_src-hb.patch

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.67 pkgsrc/misc/libreoffice/distinfo:1.68
--- pkgsrc/misc/libreoffice/distinfo:1.67       Tue Dec 11 12:59:49 2018
+++ pkgsrc/misc/libreoffice/distinfo    Thu Dec 13 16:34:10 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2018/12/11 12:59:49 ryoon Exp $
+$NetBSD: distinfo,v 1.68 2018/12/13 16:34:10 abs Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -220,7 +220,8 @@ SHA1 (patch-configure.ac) = 7e7d4b8bc306
 SHA1 (patch-desktop_scripts_soffice.sh) = 8017e34da0da404d106397288da02fae4aef4bfc
 SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5
 SHA1 (patch-download.lst) = 7d41c8537549deb263ddbf05255eb6550d522e93
-SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 29da683484946a7bd6e1cec2a48a020513dc42dc
+SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = af89529f6a9c022b73e1321ac5b04ea526fbfe5b
+SHA1 (patch-external_harfbuzz_src-hb.patch) = cb2a6b75c5a9deb8497e5c3d672c46750ffda1e7
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = ed0c6861fd9a61eeac05e235dd505b6bed166a3a
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
 SHA1 (patch-external_mysql-connector-cpp_config.h) = 3c577315fdd6fc3774f7c193696a4d2335d3d038

Index: pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk:1.4 pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk:1.5
--- pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk:1.4    Sat Aug 18 00:11:32 2018
+++ pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk        Thu Dec 13 16:34:10 2018
@@ -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 \

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_src-hb.patch
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_src-hb.patch:1.1
--- /dev/null   Thu Dec 13 16:34:10 2018
+++ pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_src-hb.patch        Thu Dec 13 16:34:10 2018
@@ -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
++