CVS commit: pkgsrc/misc/libreoffice

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Nov 15 13:26:02 UTC 2019

Modified Files:
        pkgsrc/misc/libreoffice: Makefile distinfo
        pkgsrc/misc/libreoffice/patches: patch-external_pdfium_pkgsrc.patch.1

Log Message:
Try to build internal PDFium with X11_TYPE=modular's FreeType 2.10.0


To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.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/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.212 pkgsrc/misc/libreoffice/Makefile:1.213
--- pkgsrc/misc/libreoffice/Makefile:1.212      Sat Nov  9 20:01:14 2019
+++ pkgsrc/misc/libreoffice/Makefile    Fri Nov 15 13:26:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.212 2019/11/09 20:01:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.213 2019/11/15 13:26:02 ryoon Exp $
 
 VERREL=                6.3.3
 VERRC=         2
@@ -33,6 +33,13 @@ GCC_REQD+=   7
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(USE_BUILTIN.freetype2:M[Yy][Ee][Ss]) && \
+       !empty(BUILTIN_VERSION.freetype2:M2.10.0)
+CFLAGS+=                       -D_FT_CONST=
+.else
+CFLAGS+=                       -D_FT_CONST=const
+.endif
+
 .if !empty(MACHINE_PLATFORM:MNetBSD*)
 pre-build:
        cd ${WRKSRC} && ${BUILD_MAKE_CMD} Executable_gengal && ${TOOLS_PLATFORM.paxctl} +m instdir/program/gengal.bin

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.89 pkgsrc/misc/libreoffice/distinfo:1.90
--- pkgsrc/misc/libreoffice/distinfo:1.89       Tue Nov  5 17:20:22 2019
+++ pkgsrc/misc/libreoffice/distinfo    Fri Nov 15 13:26:02 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.89 2019/11/05 17:20:22 ryoon Exp $
+$NetBSD: distinfo,v 1.90 2019/11/15 13:26:02 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -228,7 +228,7 @@ 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_UnpackedTarball__pdfium.mk) = e82cdef5c7636ca3340589cf1e258cc4555c8346
-SHA1 (patch-external_pdfium_pkgsrc.patch.1) = a6cc25ff3e8b584c9f79024e2cdbd1315c308ec1
+SHA1 (patch-external_pdfium_pkgsrc.patch.1) = 717498751eaec46dce39e50c4a41b13f6d423885
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 48e68ff43b971996f81985ee79d71f7b83cce428
 SHA1 (patch-i18npool_source_breakiterator_breakiterator_unicode.cxx) = 0a784bced0874b3ef7cc3b6ff19a865e0d64ce49
 SHA1 (patch-i18npool_source_collator_collator_unicode.cxx) = 853367cf9a4be70c5d0de44a82e6fadc70e40ea6

Index: pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
diff -u pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1:1.2 pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1:1.3
--- pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1:1.2    Tue Nov  5 17:20:22 2019
+++ pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1        Fri Nov 15 13:26:02 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.2 2019/11/05 17:20:22 ryoon Exp $
+$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.3 2019/11/15 13:26:02 ryoon Exp $
 
 * Support NetBSD
 * Do no conflict with FreeType 2.10.1 from pkgsrc
@@ -25,7 +25,7 @@ $NetBSD: patch-external_pdfium_pkgsrc.pa
 +   FT_EXPORT_DEF( FT_UInt )
 +   FT_Get_Name_Index( FT_Face     face,
 +-                     FT_String*  glyph_name )
-++                     const FT_String*  glyph_name )
+++                     _FT_CONST FT_String*  glyph_name )
 +   {
 +     FT_UInt  result = 0;
 + 
@@ -36,7 +36,7 @@ $NetBSD: patch-external_pdfium_pkgsrc.pa
 +   FT_EXPORT( FT_UInt )
 +   FT_Get_Name_Index( FT_Face     face,
 +-                     FT_String*  glyph_name );
-++                     const FT_String*  glyph_name );
+++                     _FT_CONST FT_String*  glyph_name );
 + 
 + 
 +   /**************************************************************************