[pkgsrc/pkgsrc-2018Q2]: pkgsrc/misc/libreoffice Pullup ticket #5803 - request...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1db2a2373d9
branches:  pkgsrc-2018Q2
changeset: 408423:a1db2a2373d9
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Aug 18 10:21:45 2018 +0000

description:
Pullup ticket #5803 - requested by bouyer
misc/libreoffice: build fix

Revisions pulled up:
- misc/libreoffice/distinfo                                     1.59
- misc/libreoffice/patches/patch-external_mysql-connector-cpp_config.h 1.1

---
   Module Name: pkgsrc
   Committed By:        bouyer
   Date:                Fri Jul 20 09:36:19 UTC 2018

   Added Files:
        pkgsrc/misc/libreoffice/patches:
            patch-external_mysql-connector-cpp_config.h

   Log Message:
   Define HAVE_INTTYPES_H for __NetBSD__ too.
   Fixes build on NetBSD/i386 8.0 at last

---
   Module Name: pkgsrc
   Committed By:        bouyer
   Date:                Fri Jul 20 09:36:57 UTC 2018

   Modified Files:
        pkgsrc/misc/libreoffice: distinfo

   Log Message:
   Update distinfo for new patch-external_mysql-connector-cpp_config.h

diffstat:

 misc/libreoffice/distinfo                                            |   3 +-
 misc/libreoffice/patches/patch-external_mysql-connector-cpp_config.h |  15 ++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 7ea115b52702 -r a1db2a2373d9 misc/libreoffice/distinfo
--- a/misc/libreoffice/distinfo Sat Aug 18 09:10:59 2018 +0000
+++ b/misc/libreoffice/distinfo Sat Aug 18 10:21:45 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2018/06/25 21:51:37 wiz Exp $
+$NetBSD: distinfo,v 1.58.2.1 2018/08/18 10:21:45 bsiegert Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -216,6 +216,7 @@
 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 60e2ef2081b59b23bd5cc7a7262880513ac03eee
 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
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce
 SHA1 (patch-external_postgresql_UnpackedTarball__postgresql.mk) = d0b94e20d9e1aa89adac0f4a91c7b684850c78bc
 SHA1 (patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch) = de2b5d8e657e9721867f9c72a402cc30fd093218
diff -r 7ea115b52702 -r a1db2a2373d9 misc/libreoffice/patches/patch-external_mysql-connector-cpp_config.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libreoffice/patches/patch-external_mysql-connector-cpp_config.h      Sat Aug 18 10:21:45 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-external_mysql-connector-cpp_config.h,v 1.1.2.2 2018/08/18 10:21:45 bsiegert Exp $
+
+--- external/mysql-connector-cpp/config.h.orig 2018-07-19 19:35:30.087775890 +0200
++++ external/mysql-connector-cpp/config.h      2018-07-19 19:37:26.808008694 +0200
+@@ -13,6 +13,10 @@
+ #endif
+ #endif
+ 
++#if defined(__NetBSD__)
++    #define HAVE_INTTYPES_H
++#endif
++
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif