CVS commit: pkgsrc/misc/libreoffice

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Feb  7 03:52:28 UTC 2020

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
        pkgsrc/misc/libreoffice/patches:
            patch-external_pdfium_UnpackedTarball__pdfium.mk
Added Files:
        pkgsrc/misc/libreoffice/patches: patch-external_pdfium_pkgsrc2.patch.1

Log Message:
libreoffice: fix conditional for HAVE_POSIX_MEMALIGN in pdfium


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc2.patch.1

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.92 pkgsrc/misc/libreoffice/distinfo:1.93
--- pkgsrc/misc/libreoffice/distinfo:1.92       Wed Feb  5 14:10:35 2020
+++ pkgsrc/misc/libreoffice/distinfo    Fri Feb  7 03:52:27 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.92 2020/02/05 14:10:35 ryoon Exp $
+$NetBSD: distinfo,v 1.93 2020/02/07 03:52:27 tnn Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -236,8 +236,9 @@ SHA1 (patch-external_harfbuzz_UnpackedTa
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 01798842e3f573f627be31660195edbac802df89
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
 SHA1 (patch-external_pdfium_Library__pdfium.mk) = 0f0707fcfeafb3d36bc1f139f2cc189f1736915a
-SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = e82cdef5c7636ca3340589cf1e258cc4555c8346
+SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = d96837062eef2792c1a6866426e4ab49f0a150e9
 SHA1 (patch-external_pdfium_pkgsrc.patch.1) = aa482cafa8931f62fe3e9ff5af3e812279256da9
+SHA1 (patch-external_pdfium_pkgsrc2.patch.1) = 0a804bcdf8f35cf298c5768954a6e57b2e40fd98
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 48e68ff43b971996f81985ee79d71f7b83cce428
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 014d48574a379f92f2d0afe3c91d2c2956708dd8
 SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e

Index: pkgsrc/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk:1.1 pkgsrc/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk:1.2
--- pkgsrc/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk:1.1        Fri Oct 18 10:13:40 2019
+++ pkgsrc/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk    Fri Feb  7 03:52:28 2020
@@ -1,14 +1,15 @@
-$NetBSD: patch-external_pdfium_UnpackedTarball__pdfium.mk,v 1.1 2019/10/18 10:13:40 ryoon Exp $
+$NetBSD: patch-external_pdfium_UnpackedTarball__pdfium.mk,v 1.2 2020/02/07 03:52:28 tnn Exp $
 
 * Support pkgsrc and NetBSD
 
---- external/pdfium/UnpackedTarball_pdfium.mk.orig     2019-09-18 14:12:06.000000000 +0000
+--- external/pdfium/UnpackedTarball_pdfium.mk.orig     2020-01-22 23:14:16.000000000 +0000
 +++ external/pdfium/UnpackedTarball_pdfium.mk
-@@ -14,6 +14,7 @@ pdfium_patches += ubsan.patch
+@@ -14,6 +14,8 @@ pdfium_patches += ubsan.patch
  pdfium_patches += build.patch.1
  # Avoids Windows 8 build dependency.
  pdfium_patches += windows7.patch.1
 +pdfium_patches += pkgsrc.patch.1
++pdfium_patches += pkgsrc2.patch.1
  
  $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
  

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc2.patch.1
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc2.patch.1:1.1
--- /dev/null   Fri Feb  7 03:52:28 2020
+++ pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc2.patch.1       Fri Feb  7 03:52:28 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-external_pdfium_pkgsrc2.patch.1,v 1.1 2020/02/07 03:52:28 tnn Exp $
+
+fix posix_memalign(3) ifdef
+
+--- external/pdfium/pkgsrc2.patch.1.orig       2020-02-06 19:27:36.602757438 +0000
++++ external/pdfium/pkgsrc2.patch.1
+@@ -0,0 +1,11 @@
++--- pdfium/third_party/libopenjpeg20/opj_malloc.h.orig        2019-11-07 01:11:27.000000000 +0000
+++++ pdfium/third_party/libopenjpeg20/opj_malloc.h
++@@ -98,7 +98,7 @@ Allocate memory aligned to a 16 byte bou
++ #else /* Not _WIN32 */
++   #if defined(__sun)
++     #define HAVE_MEMALIGN
++-  #elif defined(__FreeBSD__)
+++  #elif defined(__FreeBSD__) || defined(__NetBSD__)
++     #define HAVE_POSIX_MEMALIGN
++   /* Linux x86_64 and OSX always align allocations to 16 bytes */
++   #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)