CVS commit: pkgsrc/misc/libreoffice

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Mar 10 20:57:38 UTC 2023

Modified Files:
        pkgsrc/misc/libreoffice: Makefile distinfo
        pkgsrc/misc/libreoffice/patches: patch-configure.ac
            patch-external_skia_UnpackedTarball__skia.mk

Log Message:
libreoffice: Update to 7.5.1.2

Changelog:
7.5.1.2:
Bugs fixed compared to 7.5.1 RC1:

 1. tdf#123139 Reading XLSX format ignores horizontal alignment (generated with
    Apache POI Java library) [Eike Rathke]
 2. tdf#132714 Crash when icon deleting table-row used for diagram generation.
    [L??szl?? N??meth]
 3. tdf#139934 FILEOPEN: Date is shown as an integer [Eike Rathke]
 4. tdf#150380 Calc crash when clicking on the title of the Border Color
    toolbar popdown [Noel Grandin]
 5. tdf#153229 [RFE] Please provide a user preference to disable inheriting the
    system UI theme [Caol??n McNamara]
 6. tdf#153244 Insert - Caption - Options - Separator does not work (resets to
    previous values) [Szymon K??os]
 7. tdf#153566 Windows Dark mode: toolbar context menus have light-on-light
    header [Caol??n McNamara]
 8. tdf#153622 Crash in: SvListView::SelectListEntry(SvTreeListEntry *,bool)
    [Caol??n McNamara]
 9. tdf#153724 A macro which is executed in older versions but not in newer
    versions. [Mike Kaganski]

7.5.2.1:
Bugs fixed compared to 7.5.0 RC3:

 1. ofz#55499 output buffer has to at least be the same size as input buffer
    [Caol??n McNamara]
 2. ofz#55751 check that level is valid [Caol??n McNamara]
 3. ofz#555520 check level is < MAX_OUTLINE_LEVEL [Caol??n McNamara]
 4. tdf#45147 right-to-left words appear in the wrong order in the CSV import
    dialog [Andreas Heinisch]
 5. tdf#45854 ODF database mime-type confusion [Michael Stahl]
 6. tdf#114973 Ctrl+A and Select All don't work when paragraph at the start or
    end of document body is hidden [Michael Stahl]
 7. tdf#130782 docx alt text for charts not shown if document has been edited
    in Word [Michael Stahl]
 8. tdf#131386 Hidden linebreaks are ignored on creating pdf from rtf document
    [Michael Stahl]
 9. tdf#135938 Highlighted cross-reference is not displayed in dialog "Name"
    entry [Andreas Heinisch]
10. tdf#141684 Groupedbar Compact changes when cursor is in table [Xisco Fauli]
11. tdf#147122 Different behavior in basic LO 6.x and 7.2.4.1 (calc) [Andreas
    Heinisch]
12. tdf#147342 [macOS] UI Scale not working on non HighDPI external display
    when using Skia and a laptop with Retina display (HighDPI) [Patrick Luby]
13. tdf#147740 Lower icons disappear in groupedbar compact user interface
    [Szymon K??os]
14. tdf#148000 FILEOPEN PPTX: curved text doesn't line break properly and
    becomes too wide [Attila Sz?cs]
15. tdf#148085 About dialog hyperlinks look bad (invisible / have no contrast)
    in dark mode on Windows [Caol??n McNamara]
16. tdf#148360 FILEOPEN: Incorrect indent of first line [Justin Luth]
17. tdf#148952 Filesave DOCX: Alt Text field of image is lost on open in LO and
    in MSO [Michael Stahl]
18. tdf#149412 Incorrect/unexpected click+drag behavior in animations list
    (gtk3) [Caol??n McNamara]
19. tdf#150197 number lost (after assigning numbering to style) when exporting
    to DOCX [Justin Luth]
20. tdf#150806 FILESAVE: Image duplicates / aspect ratio changes after ODT save
    (track changes involved) [Miklos Vajna]
21. tdf#151627 Skia rendering (both Vulkan and raster) artifacts in the sd
    slidesorter, crashes with Vulkan [Julien Nabet]
22. tdf#151682 Calc: Editing area in Formula bar appears cropped [Samuel
    Mehrbrodt]
23. tdf#152073 Glitch rendering line numbers in Basic IDE editor (kf5 only)
    [Michael Weghorn]
24. tdf#152404 Crash in Writer when using Japanese Hiragana input method and
    shortcut Ctrl+Alt+C to insert a new comment while there is uncommitted text
    [Caol??n McNamara]
25. tdf#152486 macOS: Dark Mode: Release notes button unreadable [Caol??n
    McNamara]
26. tdf#152493 FILESAVE WebDAV upload (updating an existing remote file) fails
    with LO 7.4 (i.e. with libcurl), and no workaround any more (-with-webdav=
    neon) [L??szl?? N??meth]
27. tdf#152541 Thin, gray vertical line (field) before all headings after
    inserting Table of Contents [L??szl?? N??meth]
28. tdf#152559 Skia - LibreOffice Draw crashed when I zoom in the view of a
    diagram [Julien Nabet]
29. tdf#152637 macOS: dark mode: calc: Format Cells: example text black on dark
    background [Caol??n McNamara]
30. tdf#152642 Headings in DeepL and LanguageTool settings pages jump around as
    you flick through them due to them not following the HIG [Caol??n McNamara]
31. tdf#152669 Some ruled lines in the table are not set in cases other than
    "Left-to-Right(Horizontal)". [Miklos Vajna]
32. tdf#152703 Skia - resizing StartCenter window with mouse leaves black
    undrawn areas until mouse button released [Patrick Luby]
33. tdf#152722 NatNum12 number format (spell out): add/delete decimal places is
    loosing format [Laurent Balland]
34. tdf#152726 Pasting Selection to Sheet as BMP Image, Text of Button is
    getting bigger. [Noel Grandin]
35. tdf#152738 LO75RC1: Automatic spell-check not underlining misspelled words;
    dialog doesn't use paragraph's language [L??szl?? N??meth]
36. tdf#152774 MATCH and HLOOKUP/VLOOKUP return incorrect result when searching
    for a string in a mixed numeric/string matrix [Winfried Donkers]
37. tdf#152872 Layout: Hidden paragraph end separates paragraphs in print mode
    [Michael Stahl]
38. tdf#152884 FILEOPEN DOCX character transparency is not set in case of theme
    colors [Regina Henschel]
39. tdf#152921 Sidebar deck is shown as "selected active" when closing with
    grey cross [Jim Raykowski]
40. tdf#152952 FILEOPEN RTF Hyperlinks text is hyphenated [Michael Stahl]
41. tdf#152961 UI frozen on opening ODT, stuck on legacy.tools lngprophelp.cxx
    warning [Miklos Vajna]
42. tdf#152964 Crash on undo deletion of table with track changes enabled [L??
    szl?? N??meth]
43. tdf#152989 XLSX: After editing the embedded object, the rectangle size is
    incorrect [T??nde T??th]
44. tdf#152991 PPTX: In Impress after editing the embedded object, the
    rectangle size is incorrect [T??nde T??th]
45. tdf#152994 Daily Screenshot Build failure [Caol??n McNamara]
46. tdf#153000 FILEOPEN DOCX file types MSO_SPT=25 to 31 are wrongly rendered
    [Julien Nabet]
47. tdf#153006 Report Builder: Format for inserting Date and Time changed to
    "week of the year" and "timestamp" (Linux) [Noel Grandin]
48. tdf#153036 FILEOPEN PPTX resized connector broken [Attila Sz?cs]
49. tdf#153039 (LO 7.4) Multiple bugs while submitting XML from XForms document
    [Michael Stahl]
50. tdf#153045 FILEOPEN: DOCX: incorrect height of row in table [Miklos Vajna]
51. tdf#153046 FILEOPEN: RTF: Text is aligned incorrectly [Miklos Vajna]
52. tdf#153047 PDF Export: default text in content control is gone [Miklos
    Vajna]
53. tdf#153078 Whole section of Groupedbar Compact UI disappear [Xisco Fauli]
54. tdf#153082 FILEOPEN DOCX List separator not considered with TOC using
    custom styles [Michael Stahl]
55. tdf#153083 FILEOPEN DOCX Localized style name not merged in TOC settings,
    unlike in Navigator style list [Michael Stahl]
56. tdf#153088 Dark Mode: Calc: Format Cells > Font + Font Effects sample text
    should be white [Caol??n McNamara]
57. tdf#153090 FILEOPEN DOCX TOF incorrect when based on para style instead of
    category [Michael Stahl]
58. tdf#153091 Pasting from nedit (on Linux) not working. [Caol??n McNamara]
59. tdf#153092 text is missing inside and right side of image on docx on page 2
    [Caol??n McNamara]
60. tdf#153094 FILESAVE: DOC: Wrong height in table after RT in MSO [Mike
    Kaganski]
61. tdf#153096 Manage Changes dialog columns broken for cell content changes
    [Eike Rathke]
62. tdf#153104 List numbering restarts at 1 in Word after a specific DOCX
    roundtrip [Mike Kaganski]
63. tdf#153128 Tiny first line in a DOCX is imported with large height [Mike
    Kaganski]
64. tdf#153136 Lines with spaces have wrong height in DOCX [Mike Kaganski]
65. tdf#153185 The linked ole object disappears after export [T??nde T??th]
66. tdf#153203 FILESAVE DOCX Chart objects accessible description not saved
    [Michael Stahl]
67. tdf#153220 CRASH: Clicking on Border and background after undoing header
    insertion [Caol??n McNamara]
68. tdf#153235 Layout is broken after a macro until update/save-and-reload
    [Mike Kaganski]
69. tdf#153258 FILEOPEN DOCX VML some WordArt is not detected as Fontwork and
    thus shrinks to nominal text size [Regina Henschel]
70. tdf#153260 FILESAVE DOCX VML write trim=t for Fontwork shapes [Regina
    Henschel]
71. tdf#153272 Writer Macro Find with certain Search Attributes performs
    Replacement. [Julien Nabet]
72. tdf#153273 Scroll bar not in dark mode when system dark mode enabled [Caol
    ??n McNamara]
73. tdf#153287 Dark mode: Combo box and Edit box look and feel inconsistent on
    Windows [Caol??n McNamara]
74. tdf#153304 Changing as-char object properties via UNO API behaves wrong
    [Mike Kaganski]
75. tdf#153319 Crash in: SwFrame::GetPhyPageNum() const or
    SwFrame::ImplFindPageFrame() shortly after opening ODT [Caol??n McNamara]
76. tdf#153321 Notebook Bar (MUFFIN) separator color inconsistent in dark mode
    [Caol??n McNamara]
77. tdf#153341 Copied HTML text which uses the alpha channel is pasted either
    without it (when rgb(r g b / a) notation is used) or without any color
    (when rgba(r, g, b, a) notation is used) [Julien Nabet]
78. tdf#153353 When switching between freedesktop light and dark mode, Calc's
    formula bar text entry has leftover colors from the previous theme [Caol??n
    McNamara]
79. tdf#153376 Too Much Line Spacing for Font KJV1611 [Khaled Hosny]
80. tdf#153423 Formatting: AutoCorrect numbered lists incorrectly starts list
    with 10 [Justin Luth]
81. tdf#153434 crash clicking on "tools -> macro -> manage macro -> basic ->
    new" [Caol??n McNamara]
82. tdf#153436 Arabic spell checking is not available with macOS Spell Checker
    [Khaled Hosny]
83. tdf#153438 LiberaOffice Draw Portable: "Replace" button is not active in
    Tools->Color Replacer [Caol??n McNamara]


To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.139 -r1.140 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.25 -r1.26 pkgsrc/misc/libreoffice/patches/patch-configure.ac
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk

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.300 pkgsrc/misc/libreoffice/Makefile:1.301
--- pkgsrc/misc/libreoffice/Makefile:1.300      Sun Mar  5 18:22:41 2023
+++ pkgsrc/misc/libreoffice/Makefile    Fri Mar 10 20:57:38 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.300 2023/03/05 18:22:41 tnn Exp $
+# $NetBSD: Makefile,v 1.301 2023/03/10 20:57:38 ryoon Exp $
 
-VERREL=                7.5.0
-VERRC=         3
+VERREL=                7.5.1
+VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
 CATEGORIES=    misc
@@ -33,7 +33,7 @@ SUBST_CLASSES+=                       configure-paths
 SUBST_STAGE.configure-paths=   pre-configure
 SUBST_MESSAGE.configure-paths= Fixing paths in configure.ac
 SUBST_FILES.configure-paths+=  configure.ac
-SUBST_SED.configure-paths+=    -e 's,-I/usr/include/dragonbox-1.0.0,-I${BUILDLINK_PREFIX.dragonbox}/include/dragonbox-1.1.3,'
+SUBST_SED.configure-paths+=    -e 's,-I/usr/include/dragonbox-1.1.3,-I${BUILDLINK_PREFIX.dragonbox}/include/dragonbox-1.1.3,'
 SUBST_SED.configure-paths+=    -e 's,-I/usr/include/gpgme++,-I${BUILDLINK_PREFIX.gpgme}/include/gpgme++,'
 #SUBST_SED.zxing+=             -e 's,ZXING_CFLAGS=-I/usr/include/ZXing,ZXING_CFLAGS=-I${BUILDLINK_PREFIX.zxing-cpp}/include/ZXing,'
 

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.139 pkgsrc/misc/libreoffice/distinfo:1.140
--- pkgsrc/misc/libreoffice/distinfo:1.139      Mon Mar  6 13:00:01 2023
+++ pkgsrc/misc/libreoffice/distinfo    Fri Mar 10 20:57:38 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.139 2023/03/06 13:00:01 tnn Exp $
+$NetBSD: distinfo,v 1.140 2023/03/10 20:57:38 ryoon Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -126,18 +126,18 @@ Size (libreoffice/liberation-narrow-font
 BLAKE2s (libreoffice/libre-hebrew-1.0.tar.gz) = 0cf1aade1aa45f923b05b4c0c2378ad8fe954b6b56913ef8b263403696853679
 SHA512 (libreoffice/libre-hebrew-1.0.tar.gz) = 609c8ef29a1eab9b027ea04abf14949e9a204cf826fb0a792dadd8a83fc49ac9610a0b3a2bd4b8988e615688c63d0ec08a89436134980b2a9667e8966a75a795
 Size (libreoffice/libre-hebrew-1.0.tar.gz) = 531276 bytes
-BLAKE2s (libreoffice/libreoffice-7.5.0.3.tar.xz) = 2201898367a3513513ab65cce0738f48173f3dd584ae71859a298834c49fc047
-SHA512 (libreoffice/libreoffice-7.5.0.3.tar.xz) = 3bc3cf697218d20f4de9e8cf8a6d2e41a79c3d6e10503bfbd0add36be89cb4ef69fce95af931f9140b367a2154ec0aeee0b80e826da38673febca1a7bf36d183
-Size (libreoffice/libreoffice-7.5.0.3.tar.xz) = 266035636 bytes
-BLAKE2s (libreoffice/libreoffice-dictionaries-7.5.0.3.tar.xz) = 940613bea5a901e574648b3a47813fd41c93765bd2e11e0baa1f3a9c9b201ef0
-SHA512 (libreoffice/libreoffice-dictionaries-7.5.0.3.tar.xz) = 853dd41b0c007dee00e6dba0b4a248867ddca5c4e90096f38598ea1b693c760ecd553688b9d81548da10a911ad4cf7aca3e51cc31f1f9d0401adf0b5677cdecf
-Size (libreoffice/libreoffice-dictionaries-7.5.0.3.tar.xz) = 51804288 bytes
-BLAKE2s (libreoffice/libreoffice-help-7.5.0.3.tar.xz) = 11d5f3068cca93b9a18efe2525ada153a7bc4a8af7b1a9850437d2ecc24d1304
-SHA512 (libreoffice/libreoffice-help-7.5.0.3.tar.xz) = aff952def5bf5ddb060a3e588ca0704c605492c9aa4889124fc85495cb6ef44ed0ae265bdd3cb64598431d8901b1c84e316062f333ab511e36eec65df4f9d9f8
-Size (libreoffice/libreoffice-help-7.5.0.3.tar.xz) = 166236976 bytes
-BLAKE2s (libreoffice/libreoffice-translations-7.5.0.3.tar.xz) = bc921f8d10922bd32d6746dfe617d35cfc4156088599c6d4ed73a55b72342787
-SHA512 (libreoffice/libreoffice-translations-7.5.0.3.tar.xz) = 865daef852d967563b7bfdca0b28cc9c614b6599aefe4420f280eac59cf412b7ef95b97822c4eda3b32ee8a43e95a8df63f22aa7e32e2727fdb1f00639df1f05
-Size (libreoffice/libreoffice-translations-7.5.0.3.tar.xz) = 203978276 bytes
+BLAKE2s (libreoffice/libreoffice-7.5.1.2.tar.xz) = 94f806008574718d3ae0a78015ab5739fa2cd2dfda670db9cc1d7d5e5e814e66
+SHA512 (libreoffice/libreoffice-7.5.1.2.tar.xz) = 7fadf392186c8eb5801395d89c78fdac4fb47756e1a71cd758d232686a457353b2e5e7a96e0854b7cdcfbb3da8cb78155c6d3c1e50ea701341dae1e811e7806f
+Size (libreoffice/libreoffice-7.5.1.2.tar.xz) = 266318492 bytes
+BLAKE2s (libreoffice/libreoffice-dictionaries-7.5.1.2.tar.xz) = 775257b5f19c6c30eee1f5d918aa664f74fea39a67348b76e32d074aaff26990
+SHA512 (libreoffice/libreoffice-dictionaries-7.5.1.2.tar.xz) = f1a7dec9552b18647ad6daf1dfad1c9f75711c31a04ca90237d35b351492d321ac194e62ebbc0f365ebada53f03dbc69e3471129de569e70f1f09bad3ae9ca12
+Size (libreoffice/libreoffice-dictionaries-7.5.1.2.tar.xz) = 51805464 bytes
+BLAKE2s (libreoffice/libreoffice-help-7.5.1.2.tar.xz) = b66c41fd7241368661b883bcd90579353e1409162ef477cf2fa1c4f0190814f1
+SHA512 (libreoffice/libreoffice-help-7.5.1.2.tar.xz) = b866f4814e1fed0c976f3f5c577563939ec2127d1846403bb0e8a30734ac174f3b427ec393f2e49273b497b7c827dfcbae611c08d151bc45bb3547f3f2327499
+Size (libreoffice/libreoffice-help-7.5.1.2.tar.xz) = 166236184 bytes
+BLAKE2s (libreoffice/libreoffice-translations-7.5.1.2.tar.xz) = 8cf1339693c904822459f0ee02817f39bc8dfdfc4eb54b0c34724fccb796fc16
+SHA512 (libreoffice/libreoffice-translations-7.5.1.2.tar.xz) = c61e6bd2e608eb17eb86a2afdb666895f8c40775dded3564c10e17208ef3b0e5fb483dfce6d45b1b61b88e7cbe88bbdf843cafe01df9480dfef97d86bee158eb
+Size (libreoffice/libreoffice-translations-7.5.1.2.tar.xz) = 204229728 bytes
 BLAKE2s (libreoffice/lxml-4.1.1.tgz) = 8ab1ddfc30f21c433da04723d9092cd4e938cd5a5380310e8089e959a690d294
 SHA512 (libreoffice/lxml-4.1.1.tgz) = 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
 Size (libreoffice/lxml-4.1.1.tgz) = 2380804 bytes
@@ -172,7 +172,7 @@ SHA1 (patch-Makefile.in) = c16214631f0e4
 SHA1 (patch-autogen.sh) = 0fed5f88342112bed0f573d426cc2c3d05ed45c7
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 2eed9efc4a145687f409ba87806147dac2210c68
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc
-SHA1 (patch-configure.ac) = 80670f61ad0cd81c866e547fa177562003b8eab7
+SHA1 (patch-configure.ac) = 39a63232345290d6fcab76d98df7e22a121a2384
 SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = c8a82ce0c3d293108daa41f81d9cee376ca50a82
@@ -181,7 +181,7 @@ SHA1 (patch-external_pdfium_UnpackedTarb
 SHA1 (patch-external_pdfium_pkgsrc.patch.1) = f6cc11970f4999d653f5609c7cdf83946a01bf46
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 545a10100e439b996e3f235a8a5dff682fd48879
 SHA1 (patch-external_skia_Library__skia.mk) = bf97a0724bd8cb5e249b63e60e85e2e7217cfdad
-SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 84e48d4b2feff0c6497d184a86af19b446dfddf5
+SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = d575ac3be7c2882721f1a104be814dcb6c1d3fe5
 SHA1 (patch-external_skia_netbsd.patch.0) = 7852da3030ce31cd089cba99c7949eda57ffaf8f
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = d60f5b5089c4358f4081648466662753393e4990
 SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = 64cbdbe2eef4fd0a5b6d81d4b31a1d39b72041c1

Index: pkgsrc/misc/libreoffice/patches/patch-configure.ac
diff -u pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.25 pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.26
--- pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.25     Mon Mar  6 13:00:01 2023
+++ pkgsrc/misc/libreoffice/patches/patch-configure.ac  Fri Mar 10 20:57:38 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.25 2023/03/06 13:00:01 tnn Exp $
+$NetBSD: patch-configure.ac,v 1.26 2023/03/10 20:57:38 ryoon Exp $
 
 * Add NetBSD/aarch64 support.
 * Disable freetype2 and fontconfig from pkgsrc explicitly.
@@ -33,20 +33,6 @@ $NetBSD: patch-configure.ac,v 1.25 2023/
  fi
  libo_CHECK_SYSTEM_MODULE([freetype],[FREETYPE],[freetype2 >= 9.9.3],,system,TRUE)
  
-@@ -10850,11 +10855,11 @@ dnl HarfBuzz
- dnl ===================================================================
- 
- GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"
--GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
-+GRAPHITE_LIBS_internal="${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"
- libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
- 
- HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
--HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"
-+HARFBUZZ_LIBS_internal="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"
- libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
- 
- if test "$COM" = "MSC"; then # override the above
 @@ -13467,8 +13472,8 @@ if test "$_os" = "Linux" -o "$_os" = "Fr
          AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
              [AC_MSG_ERROR(Xinerama header not found.)], [])

Index: pkgsrc/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk:1.8 pkgsrc/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk:1.9
--- pkgsrc/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk:1.8    Mon Feb 13 14:59:36 2023
+++ pkgsrc/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk        Fri Mar 10 20:57:38 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-external_skia_UnpackedTarball__skia.mk,v 1.8 2023/02/13 14:59:36 ryoon Exp $
+$NetBSD: patch-external_skia_UnpackedTarball__skia.mk,v 1.9 2023/03/10 20:57:38 ryoon Exp $
 
---- external/skia/UnpackedTarball_skia.mk.orig 2023-01-25 14:26:33.000000000 +0000
+--- external/skia/UnpackedTarball_skia.mk.orig 2023-02-22 19:52:27.000000000 +0000
 +++ external/skia/UnpackedTarball_skia.mk
-@@ -40,6 +40,7 @@ skia_patches := \
-     tdf148624.patch.1 \
+@@ -41,6 +41,7 @@ skia_patches := \
      constexpr-template.patch.0 \
      missing-include.patch.0 \
+     tdf147342.patch.0 \
 +    netbsd.patch.0 \
  
  $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))