CVS commit: pkgsrc/misc/libreoffice

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Jul 17 10:58:12 UTC 2022

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
Added Files:
        pkgsrc/misc/libreoffice/patches:
            patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh

Log Message:
libreoffice: put back patch that should not have been removed


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh

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.129 pkgsrc/misc/libreoffice/distinfo:1.130
--- pkgsrc/misc/libreoffice/distinfo:1.129      Tue May 17 13:37:10 2022
+++ pkgsrc/misc/libreoffice/distinfo    Sun Jul 17 10:58:12 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.129 2022/05/17 13:37:10 ryoon Exp $
+$NetBSD: distinfo,v 1.130 2022/07/17 10:58:12 tnn Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -190,6 +190,7 @@ SHA1 (patch-external_skia_Library__skia.
 SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 75d379ec8f11f45ea98e81e1b9124edf6d7e2f2b
 SHA1 (patch-external_skia_netbsd.patch.0) = 0667db4002f8026108f3a4b0adbfeffd08a3369c
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 014d48574a379f92f2d0afe3c91d2c2956708dd8
+SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = 3595ea18e6231d09665268cb716df61456c444d6
 SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
 SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
 SHA1 (patch-sc_source_core_tool_math.cxx) = 94ea14291d87ab7ad43a8f277738685e2743cb4a

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh:1.3
--- /dev/null   Sun Jul 17 10:58:12 2022
+++ pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh   Sun Jul 17 10:58:12 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh,v 1.3 2022/07/17 10:58:12 tnn Exp $
+
+shell portability
+
+--- instsetoo_native/inc_openoffice/unix/find-requires-x11.sh.orig     2022-04-27 11:23:38.000000000 +0000
++++ instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+@@ -18,8 +18,8 @@
+ #
+ 
+ cat > /dev/null
+-[[ "${PLATFORMID}" == "linux_x86_64" || "${PLATFORMID}" == "linux_aarch64" ]] && mark64="()(64bit)"
+-if [[ "${OS}" == "AIX" ]]; then
++[ "${PLATFORMID}" = "linux_x86_64" -o "${PLATFORMID}" = "linux_aarch64" ] && mark64="()(64bit)"
++if [ "${OS}" = "AIX" ]; then
+   echo "libfreetype.a(libfreetype.so.6${mark64})"
+ else
+   echo "libfreetype.so.6${mark64}"