Tue Nov 5 17:20:22 2019 UTC ()
Update a comment for PDFium's internal freetype


(ryoon)
diff -r1.88 -r1.89 pkgsrc/misc/libreoffice/distinfo
diff -r1.1 -r1.2 pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
cvs diff -r1.88 -r1.89 pkgsrc/misc/libreoffice/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/distinfo 2019/11/02 13:12:35 1.88
+++ pkgsrc/misc/libreoffice/distinfo 2019/11/05 17:20:22 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.88 2019/11/02 13:12:35 ryoon Exp $ 1$NetBSD: distinfo,v 1.89 2019/11/05 17:20:22 ryoon Exp $
2 2
3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b 4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes 6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
7SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a 7SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a
8RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb 8RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb
9SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f 9SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f
10Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes 10Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes
11SHA1 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = bdc4350b771c6c23e8a40b2413595d1055cff2ab 11SHA1 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = bdc4350b771c6c23e8a40b2413595d1055cff2ab
12RMD160 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 4d9bcd7680c173333ddbe3fd3b386acc483322c1 12RMD160 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 4d9bcd7680c173333ddbe3fd3b386acc483322c1
13SHA512 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = f5628efe484b6220d0bf8177aa826c28e7a36f0bcca2019e057c20f5915d579057f931377ec686dbfeebef05fcf6453472be77a21ef282bd9d8d0eaf62549a49 13SHA512 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = f5628efe484b6220d0bf8177aa826c28e7a36f0bcca2019e057c20f5915d579057f931377ec686dbfeebef05fcf6453472be77a21ef282bd9d8d0eaf62549a49
14Size (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 5522795 bytes 14Size (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 5522795 bytes
@@ -218,27 +218,27 @@ SHA512 (libreoffice/xmlsec1-1.2.28.tar.g @@ -218,27 +218,27 @@ SHA512 (libreoffice/xmlsec1-1.2.28.tar.g
218Size (libreoffice/xmlsec1-1.2.28.tar.gz) = 1995599 bytes 218Size (libreoffice/xmlsec1-1.2.28.tar.gz) = 1995599 bytes
219SHA1 (patch-Makefile.in) = c16214631f0e40af4b366c790c7b84e0e11a892e 219SHA1 (patch-Makefile.in) = c16214631f0e40af4b366c790c7b84e0e11a892e
220SHA1 (patch-autogen.sh) = eedd0091745cf6a32ee9b33227502baaa661270e 220SHA1 (patch-autogen.sh) = eedd0091745cf6a32ee9b33227502baaa661270e
221SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 2eed9efc4a145687f409ba87806147dac2210c68 221SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 2eed9efc4a145687f409ba87806147dac2210c68
222SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc 222SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc
223SHA1 (patch-configure.ac) = 16ee821b40cc9fc272da42324f3922ffbdb3d0a5 223SHA1 (patch-configure.ac) = 16ee821b40cc9fc272da42324f3922ffbdb3d0a5
224SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c 224SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
225SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5 225SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5
226SHA1 (patch-download.lst) = a2daa977fee0024176ebe7e180e92931a15fe8c6 226SHA1 (patch-download.lst) = a2daa977fee0024176ebe7e180e92931a15fe8c6
227SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 90e46a519fe587c5ac0022f84e5d94cf9e15c232 227SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 90e46a519fe587c5ac0022f84e5d94cf9e15c232
228SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 01798842e3f573f627be31660195edbac802df89 228SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 01798842e3f573f627be31660195edbac802df89
229SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d 229SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
230SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = e82cdef5c7636ca3340589cf1e258cc4555c8346 230SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = e82cdef5c7636ca3340589cf1e258cc4555c8346
231SHA1 (patch-external_pdfium_pkgsrc.patch.1) = e40ad0abec8095a1598982e6ddf7752c9aa8d60f 231SHA1 (patch-external_pdfium_pkgsrc.patch.1) = a6cc25ff3e8b584c9f79024e2cdbd1315c308ec1
232SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 48e68ff43b971996f81985ee79d71f7b83cce428 232SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 48e68ff43b971996f81985ee79d71f7b83cce428
233SHA1 (patch-i18npool_source_breakiterator_breakiterator_unicode.cxx) = 0a784bced0874b3ef7cc3b6ff19a865e0d64ce49 233SHA1 (patch-i18npool_source_breakiterator_breakiterator_unicode.cxx) = 0a784bced0874b3ef7cc3b6ff19a865e0d64ce49
234SHA1 (patch-i18npool_source_collator_collator_unicode.cxx) = 853367cf9a4be70c5d0de44a82e6fadc70e40ea6 234SHA1 (patch-i18npool_source_collator_collator_unicode.cxx) = 853367cf9a4be70c5d0de44a82e6fadc70e40ea6
235SHA1 (patch-i18npool_source_collator_gencoll_rule.cxx) = d4599017226a6bbf6b03f099bc499d6b9c99916f 235SHA1 (patch-i18npool_source_collator_gencoll_rule.cxx) = d4599017226a6bbf6b03f099bc499d6b9c99916f
236SHA1 (patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx) = 6019a57f8dbf849a503935a3208449b99451488c 236SHA1 (patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx) = 6019a57f8dbf849a503935a3208449b99451488c
237SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 106186c9e199cd6fc68742b8f85d35c721826f5e 237SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 106186c9e199cd6fc68742b8f85d35c721826f5e
238SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b 238SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
239SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e 239SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
240SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd 240SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
241SHA1 (patch-sc_source_core_tool_math.cxx) = dd665c6bbe3c18fca0b5fbf847a6ec1ff50d0bb9 241SHA1 (patch-sc_source_core_tool_math.cxx) = dd665c6bbe3c18fca0b5fbf847a6ec1ff50d0bb9
242SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d 242SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
243SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc 243SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
244SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1 244SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1
cvs diff -r1.1 -r1.2 pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 2019/10/18 10:13:40 1.1
+++ pkgsrc/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 2019/11/05 17:20:22 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.1 2019/10/18 10:13:40 ryoon Exp $ 1$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.2 2019/11/05 17:20:22 ryoon Exp $
2 2
3* Support NetBSD 3* Support NetBSD
4* Do no conflict with FreeType 2.10 from pkgsrc 4* Do no conflict with FreeType 2.10.1 from pkgsrc
5* Add pkgsrc font path 5* Add pkgsrc font path
6 6
7--- external/pdfium/pkgsrc.patch.1.orig 2019-10-18 00:59:38.822575812 +0000 7--- external/pdfium/pkgsrc.patch.1.orig 2019-10-18 00:59:38.822575812 +0000
8+++ external/pdfium/pkgsrc.patch.1 8+++ external/pdfium/pkgsrc.patch.1
9@@ -0,0 +1,54 @@ 9@@ -0,0 +1,54 @@
10+--- pdfium/core/fxcrt/cfx_fileaccess_posix.h.orig 2019-05-10 17:07:53.000000000 +0000 10+--- pdfium/core/fxcrt/cfx_fileaccess_posix.h.orig 2019-05-10 17:07:53.000000000 +0000
11++++ pdfium/core/fxcrt/cfx_fileaccess_posix.h 11++++ pdfium/core/fxcrt/cfx_fileaccess_posix.h
12+@@ -12,7 +12,7 @@ 12+@@ -12,7 +12,7 @@
13+ #include "core/fxcrt/fx_system.h" 13+ #include "core/fxcrt/fx_system.h"
14+  14+
15+ #if _FX_PLATFORM_ != _FX_PLATFORM_LINUX_ && !defined(OS_MACOSX) && \ 15+ #if _FX_PLATFORM_ != _FX_PLATFORM_LINUX_ && !defined(OS_MACOSX) && \
16+- !defined(OS_ANDROID) 16+- !defined(OS_ANDROID)
17++ !defined(OS_ANDROID) && !defined(OS_NETBSD) 17++ !defined(OS_ANDROID) && !defined(OS_NETBSD)