libreoffice: Update to 7.0.4.2

Changelog:
7.0.4.2
Bugs fixed compared to 7.0.4 RC1

 1. tdf#123621 FILEOPEN | DOCX, Rectangle with text moves in LO
 2. tdf#134754 Crash on macOS 10.13 opening local HSQLDB-based odb file in Base
    on LibreOffice 7 rc1
 3. tdf#135479 LO Complains about missing JDK when accessing any Java
    functionality, despite recognizing JDK on macOS under Preferences
 4. tdf#136272 Corrupted calc file: invalid number format condition [<=
    1.79769313486232E+308 ]
 5. tdf#137745 LO Base Firebird: crash, when deleting tables and changed
    relationship isn't changed in database file
 6. tdf#138130 Crash in: swlo.dll
 7. tdf#138466 Crash when creating different scenarios ( steps in comment 4 )
 8. tdf#138549 CRASH: Undoing comment hovering (steps in comment 11)
 9. tdf#138612 LibreOffice not splitting table cells automatically for docx
    files

7.0.4.1
Bugs fixed compared to 7.0.3 RC1

 1. ofz#26619 detect if SwFrameFormat deleted during import
 2. ofz#26676 null deref
 3. ofz#26708 direct-leak
 4. ofz#26753 avoid infinite regress
 5. ofz#26943 detect if FormatOfJustInsertedApo was deleted [Caol??n McNamara]
 6. ofz#27756 null deref
 7. rhbz#1891326 GNOME software cannot find the correct language pack required
    by LibreOffice
 8. rhbz#1893846 [abrt] libreoffice-core: (anonymous
    namespace)::signalHandlerFunction(): soffice.bin killed by SIGABRT
 9. rhbz#1900428 LibreOffice 7.0.3.1 crashed on invalid row index used in
    StarBasic macro
10. tdf#35986 Parts of EMF file not visible/stretched to an enormous extent
11. tdf#91762 Inserting table has incorrect row heights
12. tdf#92315 Writer incorrectly renders EMF file representing molecule with
    text in it
13. tdf#98868 FILESAVE: crash if try save ODT file with track changes compared
14. tdf#103987 FILESAVE: DOCX Duplicated custom properties after roundtrip
15. tdf#104378 Chinese conversion problem
16. tdf#106613 UI: Sidebar navigator in Impress/Draw not updated immediately
    when page/slide is renamed
17. tdf#113163 FILEOPEN PPTX: EMF+ A color change to transparent on the image
    is missing on import (PPT OK)
18. tdf#114956 Calc - comment field does not increase dynamically during input
19. tdf#116214 Custom properties: value type is changed from Number to Text
20. tdf#116335 EMF is opened with large empty space around it
21. tdf#116622 Inserted EMF image is not cropped correctly
22. tdf#117643 Word search does not work in LibreOffice Writer if search term
    contains an apostrophe
23. tdf#121553 Editing: Firebird: Table editor erroneously prompts to change
    CLOB field to a BLOB field during alter table
24. tdf#121886 Firebird: Datatype Image(BLOB) is not working properly with Form
    or Report image controls.
25. tdf#126700 Untitled document remains open when have a default template
26. tdf#127047 Font Sizes Greater than 255 are Printed with Size 255
27. tdf#127086 PPT: FILESAVE: Crop image is gone after RT
28. tdf#127471 Copied calc diagram in gdi format looks ok under linux, but the
    fonts looks weird under windows.
29. tdf#127680 New Print dialog: impossible to only print even/odd pages from a
    range/selection
30. tdf#128135 UI GTK3: dialog Pivot Table Layout / properties is too high:
    section Source and Destination cannot be fully used
31. tdf#128213 FILESAVE PPTX roundtrip with z-rotated text produces additional
    shape rotation
32. tdf#128877 FILEOPEN DOCX: Image Location lost on Import
33. tdf#130314 Writer busy-locks in layouting CJK fonts (was: hangs while
    converting to pdf) - see comment #9 / #8
34. tdf#130596 FIREBIRD (internal): Parameter doesn't work with COALESCE and
    numeric fieldtypes
35. tdf#130629 Crash in Writer when inserting shape again after undoing a
    previous insertion
36. tdf#131510 Old Replacement in german language
37. tdf#131679 Crash cutting a chart
38. tdf#131970 LO Create hyperlink ?? Jump to the correct field by keyboard
    with TAB?
39. tdf#132137 Styles: Default Style is too generic
40. tdf#132536 Memory usage increases after every file-reload
41. tdf#133630 CRASH: Chart: Changing properties in different objects
42. tdf#133771 When saving an encrypted document, unchecking 'Save with
    password' has no effect, encryption is kept
43. tdf#133950 UI EDITING Drawing a shape, the cursor is not precise (GTK3)
44. tdf#134161 CPU at 100% after opening a particular spreadsheet
45. tdf#134298 Picture overlappes page with content, so it is not readible
    anymore
46. tdf#135082 Print selection doesn't print selection but whole page
47. tdf#135108 Err:540 when adding an external reference in a loaded document
    that so far had no linked externals
48. tdf#135202 LO 6.4.6.1 and 7.0.1 fail with error 1045 when accessing MySQL
    database using native connector
49. tdf#135893 Image pasted twice when copy/pasting a caption frame with image
    after DOCX export
50. tdf#136336 LO Writer does not display footnote text on mouse hover for GTK
51. tdf#136453 Duplication of content after undo (spurious)
52. tdf#136555 StartCenter is inconsistent with dark theme(s)
53. tdf#136611 Crash: Change Corner Style on sidebar with selecting Data
    Series.
54. tdf#136962 Navigator content view flash (gen backend)
55. tdf#137085 RTF table is shifted left
56. tdf#137159 Harmonize UI in Options-LibreOffice-View when works a Skia black
    list
57. tdf#137181 Basic macro: CRASH when running a macro in Impress
58. tdf#137215 Hang after switching windows with cell selector open in Validity
    dialog
59. tdf#137329 White borders in Slide Show mode (F5) in Impress with SKIA
60. tdf#137397 Faulty Height value in Position and Size content panel in
    Properties deck in the sidebar in Calc 61. tdf#137403 Keys list box fills in customization keyboard tab page when
    focus is in Function list box and a key is pressed (Gtk3 only)
62. tdf#137520 Colibre: Some icons with text (like B, I, U, etc) are too big
    that make them unbalance with the rest of the icons
63. tdf#137532 EDITING: Font formatting lost after undo/redo
64. tdf#137556 Crash if I try to open the Print dialog in GTK3 3.18 only
65. tdf#137575 UI: Custom sorting state is lost when reopening the LibreOffice
    file picker dialog
66. tdf#137593 FILEOPEN DOCX Table paragraph gets unexpected spacing before if
    shape is anchored to it 67. tdf#137617 Incorrect operation Sheet -> Named Ranges and Expressions ->
    Create; with ExcelA1 and ExcelR1C1 syntax
68. tdf#137643 Can't select font, no font dropdown list, if open MSO .doc in
    GTK3 only (gen and Skia OK)
69. tdf#137652 XDL import: missing empty combobox items
70. tdf#137660 Missing focus indicator for flat buttons (like in the start
    center) in KDE
71. tdf#137662 When combo box (and List box) from Base is located in a data
    sheet, it has to be clicked twice in order to be able to enter text
72. tdf#137698 FILEOPEN DOCX: rectangle position images positioned wrong on
    file open
73. tdf#137726 Message dialog during pivot table insertion not displayed, LO
    hangs
74. tdf#137754 Crash when applying styles in a table within Impress
75. tdf#137786 Crash swlo!SwNodeIndex::~SwNodeIndex+0x18
76. tdf#137801 LO base with Firebird: WARNING, when adding a field to a table
    with an old field type BLOB
77. tdf#137804 Qt5 printing (from Writer) crashes LibreOffice
78. tdf#137871 CRASH: applying different styles to different cells in table
    (GTK3)
79. tdf#137880 Installer picture has weird black lines
80. tdf#137897 FILESAVE: export xltx with encryption to ods doesn't accept "no
    password" as OK-able option
81. tdf#137898 Page count is not reset to 1 in the print preview dialog
82. tdf#137908 Exceptions for auto correct disappear lost after restart
83. tdf#137949 IMPORT OOXML: Table row height is wrong.
84. tdf#137980 EDITING Moving shape with arrow keys makes it grow
85. tdf#137982 CRASH: closing table preview. mail merge
86. tdf#137993 Crash after closing one window and pressing enter in the other
    window with search bar focused (GTK3)
87. tdf#138000 RFE: Add menu icon to Writer's Format > Text > Single Underline
88. tdf#138011 EDITING: row in table doesn't grow while editing
89. tdf#138022 LibreOffice exits/crashes when minimizing start center after
    closing a document (SKIA)
90. tdf#138039 sw: frame in table cell layouted incorrectly
91. tdf#138108 LO base with Firebird: crash during FORMS design, when entering
    Groups and exiting (gtk3 only?)
92. tdf#138113 Base: SQL Syntax Colouring Issue Problem Operators "/", "-"
93. tdf#138131 UI: List Box form: List entries option is enabled by default
    (gen)
94. tdf#138148 IMPORT OOXML: Graphic bullet size is different.
95. tdf#138156 Border widget does not allow to keep settings
96. tdf#138183 Failed to copy and paste in calc
97. tdf#138187 URL opened twice when clicking UNO hyperlink control
98. tdf#138210 RTF document with a text frame can't open in LibreOffice
99. tdf#138219 Libreoffice 7.0.x => Skia Vulkan - Intel HD Graphics 520
    problems ( windows 7 SP1 )
100. tdf#138240 ODBC: Crash when trying to connect to Edit ?? Database ??
    Properties (gtk3)
101. tdf#138253 Crash swlo!SwNodeIndex::~SwNodeIndex+0x18 (gen)
102. tdf#138271 FORMS: Some values are not saved (gen)
103. tdf#138350 Wrong colors used in icon-themes/colibre/svx/res/frmsel*.png
104. tdf#138428 CRASH: Undoing paste after editing comment
105. tdf#138430 Bullets and Numbering toolbar dropdown list and dialog miss
    scroll bar

7 files changed, 69 insertions, 99 deletions

diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile
index a8ecc7c5f93..3d884e4a317 100644
--- a/misc/libreoffice/Makefile
+++ b/misc/libreoffice/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.249 2021/01/01 08:24:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.250 2021/01/01 13:17:44 ryoon Exp $
 
-VERREL=		7.0.3
-VERRC=		1
+VERREL=		7.0.4
+VERRC=		2
 VER=		${VERREL}.${VERRC}
 DISTNAME=	libreoffice-${VER}
-PKGREVISION=	6
 CATEGORIES=	misc
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=	.tar.xz
@@ -115,7 +114,7 @@ MORE_DISTFILES= \
 	lxml-4.1.1.tgz \
 	Amiri-0.111.zip \
 	ReemKufi-0.7.zip \
-	pdfium-4137.tar.bz2 \
+	pdfium-4306.tar.bz2 \
 	dtoa-20180411.tgz \
 	skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz
 
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo
index 480387dfab2..b869546401d 100644
--- a/misc/libreoffice/distinfo
+++ b/misc/libreoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.107 2020/11/24 14:33:22 ryoon Exp $
+$NetBSD: distinfo,v 1.108 2021/01/01 13:17:44 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -176,22 +176,22 @@ SHA1 (libreoffice/libre-hebrew-1.0.tar.gz) = 88bc96881b7f5dc161ef8994cb499f13f6f
 RMD160 (libreoffice/libre-hebrew-1.0.tar.gz) = e44c35266105eb06023bd75d16f8f297c63e886d
 SHA512 (libreoffice/libre-hebrew-1.0.tar.gz) = 609c8ef29a1eab9b027ea04abf14949e9a204cf826fb0a792dadd8a83fc49ac9610a0b3a2bd4b8988e615688c63d0ec08a89436134980b2a9667e8966a75a795
 Size (libreoffice/libre-hebrew-1.0.tar.gz) = 531276 bytes
-SHA1 (libreoffice/libreoffice-7.0.3.1.tar.xz) = 9217c9accacd8739c227d1d799c4f44c10e0b37a
-RMD160 (libreoffice/libreoffice-7.0.3.1.tar.xz) = 76ca05ed15a0c0d2d0525d9d4f12c4750407df53
-SHA512 (libreoffice/libreoffice-7.0.3.1.tar.xz) = 1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36
-Size (libreoffice/libreoffice-7.0.3.1.tar.xz) = 240706432 bytes
-SHA1 (libreoffice/libreoffice-dictionaries-7.0.3.1.tar.xz) = 0999a28f958cdd9002876dddfc227a4921c7bb81
-RMD160 (libreoffice/libreoffice-dictionaries-7.0.3.1.tar.xz) = ee972abaf0eaca752afde4ba2cfcb39486c3433c
-SHA512 (libreoffice/libreoffice-dictionaries-7.0.3.1.tar.xz) = 211cf70260d82c76897608a6b35fad4889f889931fbbc02c47aa2c75b5579c1a6bc5083165a12061b497920306cfe9bb4d7c9fffdf1943e84892460f2a4ea87c
-Size (libreoffice/libreoffice-dictionaries-7.0.3.1.tar.xz) = 47312072 bytes
-SHA1 (libreoffice/libreoffice-help-7.0.3.1.tar.xz) = 68f8159f5baf411cafef5ac8187daa6a744fba0e
-RMD160 (libreoffice/libreoffice-help-7.0.3.1.tar.xz) = 24c3cf9bf0d4acfab8689ea5422da001f940b419
-SHA512 (libreoffice/libreoffice-help-7.0.3.1.tar.xz) = 1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78
-Size (libreoffice/libreoffice-help-7.0.3.1.tar.xz) = 110855688 bytes
-SHA1 (libreoffice/libreoffice-translations-7.0.3.1.tar.xz) = c627c222b726cfcaae105ad8ee6beeb2890ad8ca
-RMD160 (libreoffice/libreoffice-translations-7.0.3.1.tar.xz) = e5d6b9aacebed1a630b9db845f6c47f1bbb07e1b
-SHA512 (libreoffice/libreoffice-translations-7.0.3.1.tar.xz) = ad9e081a233f9dc53028b4ac913d503bd88ba4c0a3e8325008b6c64cf845dc1724e77ad04d37b5c4b594548f2429cd9a554cdcbbdf454d1797d1c41271a52192
-Size (libreoffice/libreoffice-translations-7.0.3.1.tar.xz) = 175131584 bytes
+SHA1 (libreoffice/libreoffice-7.0.4.2.tar.xz) = 8ffff9e324ec3b72ef521cfaea9600b783d0c53c
+RMD160 (libreoffice/libreoffice-7.0.4.2.tar.xz) = 5ee3744147329e33d9ec2033fc316c5f4cc1a4c6
+SHA512 (libreoffice/libreoffice-7.0.4.2.tar.xz) = cc65497b8d27f0e48ebfc5fa66b09d45948febe9454149300b447d9a6aafecd4be728403c3095c058852b9dc53570841d612bc196979f25595f6b8981f706d4b
+Size (libreoffice/libreoffice-7.0.4.2.tar.xz) = 236477520 bytes
+SHA1 (libreoffice/libreoffice-dictionaries-7.0.4.2.tar.xz) = 2d8b63f78fcd7b5d0b255e24f65861869fecfb0d
+RMD160 (libreoffice/libreoffice-dictionaries-7.0.4.2.tar.xz) = 2598b985c247bacb1c4e8ead70995f18d9c02403
+SHA512 (libreoffice/libreoffice-dictionaries-7.0.4.2.tar.xz) = bbf527355b3badba07397547bb8049671e36e868313e2314898a8a4c5ae451a2c7bcd5afa0d90ed5c5e0274f839bd064ba1172b56f6e8e59dcbdd6a716921e36
+Size (libreoffice/libreoffice-dictionaries-7.0.4.2.tar.xz) = 45989668 bytes
+SHA1 (libreoffice/libreoffice-help-7.0.4.2.tar.xz) = 51237748489bf1720486782306214410e607476f
+RMD160 (libreoffice/libreoffice-help-7.0.4.2.tar.xz) = f7dae22ef3fe086ade4ca8202ffe1e697b13ff8c
+SHA512 (libreoffice/libreoffice-help-7.0.4.2.tar.xz) = ba346fa8ee015479d799d9d0b2a315cb901071b5fba2c4d7eba2eeba41dd4cac72210d12542704220c8cbb82d6a7b37a9285c1933fe2407e8e149510df4d58fe
+Size (libreoffice/libreoffice-help-7.0.4.2.tar.xz) = 110758084 bytes
+SHA1 (libreoffice/libreoffice-translations-7.0.4.2.tar.xz) = 19c0a1a59e6a607ff36e7055c582e31679636fe1
+RMD160 (libreoffice/libreoffice-translations-7.0.4.2.tar.xz) = f2eaf72271563089aa2ea90420641ca56241001f
+SHA512 (libreoffice/libreoffice-translations-7.0.4.2.tar.xz) = a1da20b4e4ae4952ca619871fc74c5693202e1f909f16ca1321a46dbc9abf979239c989bc56799c3e0c1f0930e8a41bd9aca2212bf5435e733951bdef8a5315c
+Size (libreoffice/libreoffice-translations-7.0.4.2.tar.xz) = 175341984 bytes
 SHA1 (libreoffice/lxml-4.1.1.tgz) = 154279bc5939d7099697887ea15c5ca921abeaeb
 RMD160 (libreoffice/lxml-4.1.1.tgz) = 9d093324e4dd188f9885f2e4d3c19988e709dbbc
 SHA512 (libreoffice/lxml-4.1.1.tgz) = 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
@@ -200,10 +200,10 @@ SHA1 (libreoffice/noto-fonts-20171024.tar.gz) = e775f61b4ed544198e9497b27b346062
 RMD160 (libreoffice/noto-fonts-20171024.tar.gz) = 02f8d0e2615032daf36dc375d00a2b4575d858a3
 SHA512 (libreoffice/noto-fonts-20171024.tar.gz) = 3888c5f19d85f9ae25413a064a27f01b87e09ba07b40f721b20e563bad3289a5c435686744dc3b52980625a24f82fa0b4b38046b4db971afc50a0cb3a757c179
 Size (libreoffice/noto-fonts-20171024.tar.gz) = 6646182 bytes
-SHA1 (libreoffice/pdfium-4137.tar.bz2) = 93d7c2bb37c20fe0ad0b8371810479f88c7a82b0
-RMD160 (libreoffice/pdfium-4137.tar.bz2) = 836d50b934e43b57fe4bf82c13aa6127b3834770
-SHA512 (libreoffice/pdfium-4137.tar.bz2) = 28f9eed98272d93ddf3467c8a7ceddf624238fdf172453a1bd43840c9dfa0af58bde329b982ebbd7403759a2f492b40c4af446a43095c40cc15990d4e1ab53d1
-Size (libreoffice/pdfium-4137.tar.bz2) = 7198680 bytes
+SHA1 (libreoffice/pdfium-4306.tar.bz2) = 54d08dff0044285fbdc82763f920987badee4a94
+RMD160 (libreoffice/pdfium-4306.tar.bz2) = 463b008ebecdc3a2755324adfc645a7cf1daa34f
+SHA512 (libreoffice/pdfium-4306.tar.bz2) = 3f0adc03d1a105bba18e8d2384f698214c98c6b5c2602eb0cbc7d74fd3f7afe6c51fd8ff751fc5054d5671ce8b5b8205c4d2a1f044d5ebadac4d4a3b92701e10
+Size (libreoffice/pdfium-4306.tar.bz2) = 7220464 bytes
 SHA1 (libreoffice/postgresql-9.2.24.tar.bz2) = 63d6966ccdbab6aae1f9754fdb8e341ada1ef653
 RMD160 (libreoffice/postgresql-9.2.24.tar.bz2) = 2fc1b9c37cfefd5fae5bd02f974484c5fc680c08
 SHA512 (libreoffice/postgresql-9.2.24.tar.bz2) = a6f043e5ef5e12e23c1c43b26a5ecafce62f3a86f38b5b85e7cb0cb7aa376d40e460a526baf67ae40de40525e4744fb5e48650ee5e007db4ce9742fcf548bd56
@@ -234,15 +234,13 @@ SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6d
 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 1c6e8355c473ddb16d25cb4b0ccd367326b1e9eb
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
-SHA1 (patch-external_pdfium_Library__pdfium.mk) = 0f0707fcfeafb3d36bc1f139f2cc189f1736915a
-SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = 9d16c6b2b5c5754461c84b4a99a8f1b765a1d865
-SHA1 (patch-external_pdfium_pkgsrc.patch.1) = c16ddbc03beefdee8212af34cba44c3a0965f077
-SHA1 (patch-external_pdfium_pkgsrc2.patch.1) = 0a804bcdf8f35cf298c5768954a6e57b2e40fd98
+SHA1 (patch-external_pdfium_Library__pdfium.mk) = ff3893c0f800fc2a2a9cd78bf47ebcc5348a6fee
+SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = f26fe8d93111735ff615a92419f87c3ec90df2aa
+SHA1 (patch-external_pdfium_pkgsrc.patch.1) = d2602a5a30cb941ec96227cd50e99dd91b6e3d8e
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 86a0cb3a7db719da992665a02b2b64655fda229d
 SHA1 (patch-external_skia_Library__skia.mk) = bf97a0724bd8cb5e249b63e60e85e2e7217cfdad
 SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = ac6bad52e9ba77375c8a9e009620a55661a45fcd
 SHA1 (patch-external_skia_netbsd.patch.0) = 115f0db3358c8ec816fc5eb2fe725c2c620d6c96
-SHA1 (patch-i18npool_source_calendar_calendar__gregorian.cxx) = 5ea36d612bb0a54136c27c2ffaaa983746e3a502
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 014d48574a379f92f2d0afe3c91d2c2956708dd8
 SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = e871e2096c367e742dc5758fe60ae819846def29
 SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
diff --git a/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk b/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk
index 47e382a1c36..587bd2f5bd1 100644
--- a/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk
+++ b/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk
@@ -1,10 +1,10 @@
-$NetBSD: patch-external_pdfium_Library__pdfium.mk,v 1.1 2020/02/05 14:10:35 ryoon Exp $
+$NetBSD: patch-external_pdfium_Library__pdfium.mk,v 1.2 2021/01/01 13:17:44 ryoon Exp $
 
 * Do not conflict with external freetype2 on NetBSD etc.
 
---- external/pdfium/Library_pdfium.mk.orig	2020-01-22 23:14:16.000000000 +0000
+--- external/pdfium/Library_pdfium.mk.orig	2020-12-09 18:56:14.000000000 +0000
 +++ external/pdfium/Library_pdfium.mk
-@@ -567,9 +567,9 @@ $(eval $(call gb_Library_use_externals,p
+@@ -577,9 +577,9 @@ $(eval $(call gb_Library_use_externals,p
      icuuc \
  ))
  
@@ -16,3 +16,12 @@ $NetBSD: patch-external_pdfium_Library__pdfium.mk,v 1.1 2020/02/05 14:10:35 ryoo
      -lrt \
  ))
  
+@@ -682,7 +682,7 @@ $(eval $(call gb_Library_add_generated_e
+ ))
+ endif
+ 
+-ifeq ($(OS),LINUX)
++ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
+ # fxge
+ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
+     UnpackedTarball/pdfium/core/fxge/fx_ge_linux \
diff --git a/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk b/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk
index 863c9010c68..cbb3e2264ac 100644
--- a/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk
+++ b/misc/libreoffice/patches/patch-external_pdfium_UnpackedTarball__pdfium.mk
@@ -1,4 +1,4 @@
-$NetBSD: patch-external_pdfium_UnpackedTarball__pdfium.mk,v 1.3 2020/08/11 16:07:39 ryoon Exp $
+$NetBSD: patch-external_pdfium_UnpackedTarball__pdfium.mk,v 1.4 2021/01/01 13:17:44 ryoon Exp $
 
 * Support pkgsrc and NetBSD
 
@@ -9,7 +9,7 @@ $NetBSD: patch-external_pdfium_UnpackedTarball__pdfium.mk,v 1.3 2020/08/11 16:07
  pdfium_patches += windows7.patch.1
  pdfium_patches += c++20-comparison.patch
 +pdfium_patches += pkgsrc.patch.1
-+pdfium_patches += pkgsrc2.patch.1
++
  
  $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
  
diff --git a/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 b/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
index 269f432af28..95407fba1a7 100644
--- a/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
+++ b/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
@@ -1,41 +1,38 @@
-$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.5 2020/08/11 16:07:39 ryoon Exp $
+$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.6 2021/01/01 13:17:44 ryoon Exp $
 
 * Support NetBSD
 * Add pkgsrc font path
 
---- external/pdfium/pkgsrc.patch.1.orig	2020-08-10 05:34:43.437539481 +0000
+--- external/pdfium/pkgsrc.patch.1.orig	2020-12-18 15:40:32.141745268 +0000
 +++ external/pdfium/pkgsrc.patch.1
-@@ -0,0 +1,33 @@
-+--- pdfioum/core/fxcrt/cfx_fileaccess_posix.h.orig	2019-11-07 01:11:27.000000000 +0000
-++++ pdfium/core/fxcrt/cfx_fileaccess_posix.h
-+@@ -12,7 +12,7 @@
+@@ -0,0 +1,30 @@
++--- pdfium/core/fxcrt/cfx_datetime.cpp.orig	2020-10-26 18:26:04.000000000 +0000
+++++ pdfium/core/fxcrt/cfx_datetime.cpp
++@@ -10,7 +10,7 @@
 + #include "core/fxcrt/fx_system.h"
 + 
-+ #if _FX_PLATFORM_ != _FX_PLATFORM_LINUX_ && !defined(OS_MACOSX) && \
-+-    !defined(OS_ANDROID)
-++    !defined(OS_ANDROID) && !defined(OS_NETBSD)
++ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
++-    defined(OS_APPLE) || defined(OS_ASMJS)
+++    defined(OS_APPLE) || defined(OS_ASMJS) || defined(OS_NETBSD)
++ #include <sys/time.h>
++ #include <time.h>
++ #endif
++--- pdfium/core/fxge/fx_ge_linux.cpp.orig	2020-10-26 18:26:04.000000000 +0000
+++++ pdfium/core/fxge/fx_ge_linux.cpp
++@@ -16,7 +16,7 @@
++ #include "core/fxge/systemfontinfo_iface.h"
++ #include "third_party/base/stl_util.h"
++ 
++-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS)
+++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) && !defined(OS_NETBSD)
 + #error "Included on the wrong platform"
 + #endif
 + 
-+   /**************************************************************************
-+--- pdfium/core/fxcrt/fx_system.h.orig	2019-11-07 01:11:27.000000000 +0000
-++++ pdfium/core/fxcrt/fx_system.h
-+@@ -26,7 +26,7 @@
-+ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
-+ #elif defined(_WIN64)
-+ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
-+-#elif defined(__linux__)
-++#elif defined(__linux__) || defined(__NetBSD__)
-+ #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_
-+ #elif defined(__APPLE__)
-+ #define _FX_PLATFORM_ _FX_PLATFORM_APPLE_
-+--- pdfium/core/fxge/fx_ge_linux.cpp.orig	2019-11-07 01:11:27.000000000 +0000
-++++ pdfium/core/fxge/fx_ge_linux.cpp
-+@@ -155,6 +155,7 @@ std::unique_ptr<SystemFontInfoIface> Sys
-+     pInfo->AddPath("/usr/share/X11/fonts/Type1");
-+     pInfo->AddPath("/usr/share/X11/fonts/TTF");
-+     pInfo->AddPath("/usr/local/share/fonts");
-++    pInfo->AddPath("@X11BASE@/share/fonts");
++@@ -169,6 +169,7 @@ class CLinuxPlatform : public CFX_GEModu
++       pInfo->AddPath("/usr/share/X11/fonts/Type1");
++       pInfo->AddPath("/usr/share/X11/fonts/TTF");
++       pInfo->AddPath("/usr/local/share/fonts");
+++      pInfo->AddPath("@X11BASE@/share/fonts");
++     }
++     return pInfo;
 +   }
-+   return std::move(pInfo);
-+ }
diff --git a/misc/libreoffice/patches/patch-external_pdfium_pkgsrc2.patch.1 b/misc/libreoffice/patches/patch-external_pdfium_pkgsrc2.patch.1
deleted file mode 100644
index 00fcb58f0f8..00000000000
--- a/misc/libreoffice/patches/patch-external_pdfium_pkgsrc2.patch.1
+++ /dev/null
@@ -1,18 +0,0 @@
-$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)
diff --git a/misc/libreoffice/patches/patch-i18npool_source_calendar_calendar__gregorian.cxx b/misc/libreoffice/patches/patch-i18npool_source_calendar_calendar__gregorian.cxx
deleted file mode 100644
index 857a56d658f..00000000000
--- a/misc/libreoffice/patches/patch-i18npool_source_calendar_calendar__gregorian.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-i18npool_source_calendar_calendar__gregorian.cxx,v 1.1 2020/11/05 09:23:43 ryoon Exp $
-
-* Fix build with textproc/icu-68.1.
-
---- i18npool/source/calendar/calendar_gregorian.cxx.orig	2020-10-21 20:09:11.000000000 +0000
-+++ i18npool/source/calendar/calendar_gregorian.cxx
-@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( do
-             "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR);
-     int32_t nZoneOffset, nDSTOffset;
-     UErrorCode status = U_ZERO_ERROR;
--    body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
-+    body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status );
-     if ( !U_SUCCESS(status) ) throw ERROR;
-     status = U_ZERO_ERROR;
-     body->setTime( fR - (nZoneOffset + nDSTOffset), status );