CVS commit: pkgsrc/misc/libreoffice

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Aug  6 10:41:42 UTC 2023

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
        pkgsrc/misc/libreoffice/patches:
            patch-external_pdfium_Library__pdfium.mk
            patch-external_skia_Library__skia.mk

Log Message:
libreoffice: Fix stale patches. The libreoffice build system no longer sets
DLOPEN_LIBS.


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/libreoffice/patches/patch-external_skia_Library__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/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.142 pkgsrc/misc/libreoffice/distinfo:1.143
--- pkgsrc/misc/libreoffice/distinfo:1.142      Thu Jul 20 19:28:12 2023
+++ pkgsrc/misc/libreoffice/distinfo    Sun Aug  6 10:41:42 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.142 2023/07/20 19:28:12 ryoon Exp $
+$NetBSD: distinfo,v 1.143 2023/08/06 10:41:42 nia Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -176,11 +176,11 @@ SHA1 (patch-configure.ac) = 39a632323452
 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
-SHA1 (patch-external_pdfium_Library__pdfium.mk) = f7c6d5da07cd3d7b2ee327a0df0581e7fe441621
+SHA1 (patch-external_pdfium_Library__pdfium.mk) = 8dc7315e8a09234cbb3994443ac8f0b14e549770
 SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = 223c12d350fd2ed6e779079d9cc4e776d8108c84
 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_Library__skia.mk) = 86d8519f5d5e0a5e4778e38ebbcde948db1332b2
 SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = d575ac3be7c2882721f1a104be814dcb6c1d3fe5
 SHA1 (patch-external_skia_netbsd.patch.0) = 7852da3030ce31cd089cba99c7949eda57ffaf8f
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = d60f5b5089c4358f4081648466662753393e4990

Index: pkgsrc/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk:1.3 pkgsrc/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk:1.4
--- pkgsrc/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk:1.3        Sun Aug 22 02:41:50 2021
+++ pkgsrc/misc/libreoffice/patches/patch-external_pdfium_Library__pdfium.mk    Sun Aug  6 10:41:42 2023
@@ -1,22 +1,22 @@
-$NetBSD: patch-external_pdfium_Library__pdfium.mk,v 1.3 2021/08/22 02:41:50 ryoon Exp $
+$NetBSD: patch-external_pdfium_Library__pdfium.mk,v 1.4 2023/08/06 10:41:42 nia Exp $
 
-* Do not conflict with external freetype2 on NetBSD etc.
+We also want to link against librt on Solaris and BSD.
 
---- external/pdfium/Library_pdfium.mk.orig     2021-08-16 19:56:28.000000000 +0000
+--- external/pdfium/Library_pdfium.mk.orig     2023-07-12 17:23:19.000000000 +0000
 +++ external/pdfium/Library_pdfium.mk
-@@ -566,9 +566,9 @@ $(eval $(call gb_Library_use_externals,p
-     icuuc \
- ))
- 
--ifneq (,$(filter LINUX ANDROID,$(OS)))
-+ifeq ($(OS), $(filter LINUX %BSD SOLARIS ANDROID, $(OS)))
+@@ -587,6 +587,11 @@ $(eval $(call gb_Library_use_externals,p
+ ifneq (,$(filter LINUX ANDROID,$(OS)))
  $(eval $(call gb_Library_add_libs,pdfium,\
--    -ldl \
-+    $(DLOPEN_LIBS) \
+     -ldl \
++))
++endif
++
++ifeq ($(OS), $(filter LINUX %BSD SOLARIS ANDROID, $(OS)))
++$(eval $(call gb_Library_add_libs,pdfium,\
      -lrt \
  ))
  
-@@ -685,7 +685,7 @@ $(eval $(call gb_Library_add_generated_e
+@@ -719,7 +724,7 @@ $(eval $(call gb_Library_add_generated_e
  ))
  endif
  

Index: pkgsrc/misc/libreoffice/patches/patch-external_skia_Library__skia.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-external_skia_Library__skia.mk:1.1 pkgsrc/misc/libreoffice/patches/patch-external_skia_Library__skia.mk:1.2
--- pkgsrc/misc/libreoffice/patches/patch-external_skia_Library__skia.mk:1.1    Tue Aug 11 16:07:39 2020
+++ pkgsrc/misc/libreoffice/patches/patch-external_skia_Library__skia.mk        Sun Aug  6 10:41:42 2023
@@ -1,17 +1,25 @@
-$NetBSD: patch-external_skia_Library__skia.mk,v 1.1 2020/08/11 16:07:39 ryoon Exp $
+$NetBSD: patch-external_skia_Library__skia.mk,v 1.2 2023/08/06 10:41:42 nia Exp $
 
---- external/skia/Library_skia.mk.orig 2020-07-29 19:29:17.000000000 +0000
+We want to link against libm and libX11 on every Unix, but libdl only on
+Linux.
+
+--- external/skia/Library_skia.mk.orig 2023-07-12 17:23:19.000000000 +0000
 +++ external/skia/Library_skia.mk
-@@ -66,10 +66,10 @@ $(eval $(call gb_Library_use_externals,s
+@@ -96,10 +96,15 @@ $(eval $(call gb_Library_use_externals,s
      libpng \
  ))
  
 -ifeq ($(OS),LINUX)
-+ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
++ifeq ($(OS), $(filter LINUX, $(OS)))
  $(eval $(call gb_Library_add_libs,skia,\
-     -lm \
--    -ldl \
-+    $(DLOPEN_LIBS) \
+-    -lm \
+     -ldl \
++))
++endif
++
++ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
++$(eval $(call gb_Library_add_libs,skia,\
++    -lm \
      -lX11-xcb \
      -lX11 \
  ))