CVS commit: pkgsrc/misc/libreoffice

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Oct 16 11:57:44 UTC 2022

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

Log Message:
libreoffice: fix a check portability warning


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    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.132 pkgsrc/misc/libreoffice/distinfo:1.133
--- pkgsrc/misc/libreoffice/distinfo:1.132      Sat Sep 17 23:56:03 2022
+++ pkgsrc/misc/libreoffice/distinfo    Sun Oct 16 11:57:44 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.132 2022/09/17 23:56:03 ryoon Exp $
+$NetBSD: distinfo,v 1.133 2022/10/16 11:57:44 tnn Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -184,7 +184,7 @@ SHA1 (patch-external_skia_Library__skia.
 SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 7c0a0ccfe67b5e45340be07d476032a39cbd38e5
 SHA1 (patch-external_skia_netbsd.patch.0) = 7852da3030ce31cd089cba99c7949eda57ffaf8f
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 138a0f278ad7ba7f6ae4657007f0c2fbe111be71
-SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = 3595ea18e6231d09665268cb716df61456c444d6
+SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = bdac61080480210dee6e356b7e39eab9a3bba7cf
 SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
 SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
 SHA1 (patch-sc_source_core_tool_math.cxx) = 94ea14291d87ab7ad43a8f277738685e2743cb4a

Index: pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh
diff -u pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh:1.3 
pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh:1.4
--- pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh:1.3       Sun Jul 17 10:58:12 2022
+++ pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh   Sun Oct 16 11:57:44 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh,v 1.3 2022/07/17 10:58:12 tnn Exp $
+$NetBSD: patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh,v 1.4 2022/10/16 11:57:44 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.orig     2022-09-09 18:45:51.000000000 +0000
 +++ instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
-@@ -18,8 +18,8 @@
+@@ -18,12 +18,12 @@
  #
  
  cat > /dev/null
@@ -15,3 +15,8 @@ shell portability
    echo "libfreetype.a(libfreetype.so.6${mark64})"
  else
    echo "libfreetype.so.6${mark64}"
+-  if [[ "${XINERAMA_LINK}" == "dynamic" ]]; then
++  if [[ "${XINERAMA_LINK}" = "dynamic" ]]; then
+     echo "libXinerama.so.1${mark64}"
+   fi
+ fi