CVS commit: pkgsrc/misc/libreoffice

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Mar 10 16:07:54 UTC 2021

Modified Files:
        pkgsrc/misc/libreoffice: Makefile distinfo
Added Files:
        pkgsrc/misc/libreoffice/patches: patch-vcl_unx_generic_app_geninst.cxx

Log Message:
libreoffice: Fix OS detection

>From jun@ via PR pkg/56048, thank you.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.110 -r1.111 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx

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.253 pkgsrc/misc/libreoffice/Makefile:1.254
--- pkgsrc/misc/libreoffice/Makefile:1.253      Sat Mar  6 04:19:35 2021
+++ pkgsrc/misc/libreoffice/Makefile    Wed Mar 10 16:07:53 2021
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.253 2021/03/06 04:19:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.254 2021/03/10 16:07:53 ryoon Exp $
 
 VERREL=                7.1.1
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.110 pkgsrc/misc/libreoffice/distinfo:1.111
--- pkgsrc/misc/libreoffice/distinfo:1.110      Sat Mar  6 04:19:35 2021
+++ pkgsrc/misc/libreoffice/distinfo    Wed Mar 10 16:07:53 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.110 2021/03/06 04:19:35 ryoon Exp $
+$NetBSD: distinfo,v 1.111 2021/03/10 16:07:53 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -249,6 +249,7 @@ SHA1 (patch-slideshow_source_engine_box2
 SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
 SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1
 SHA1 (patch-sw_source_core_bastyp_calc.cxx) = 2d7f52fcce8a865d1e8bf1bece85cf9f68ed2fcd
+SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = 1dcb26467c41476e08f0e10cac5ef2821fa4632b
 SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
 SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 56ac06159e0805edc1685d271b632f1af438be86
 SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 151ccef192a8491bca5d39f2a02d938b3e4fad67

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx:1.1
--- /dev/null   Wed Mar 10 16:07:54 2021
+++ pkgsrc/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx       Wed Mar 10 16:07:53 2021
@@ -0,0 +1,29 @@
+$NetBSD: patch-vcl_unx_generic_app_geninst.cxx,v 1.1 2021/03/10 16:07:53 ryoon Exp $
+
+Set "OS Environment" on NetBSD,same as FreeBSD.
+
+To Fix:
+Help -> About LibreOffice
+ Environment: OS: unknown
+
+
+--- vcl/unx/generic/app/geninst.cxx.org        2021-02-25 12:19:22.000000000 +0000
++++ vcl/unx/generic/app/geninst.cxx
+@@ -22,7 +22,7 @@
+ #if defined(LINUX)
+ #  include <stdio.h>
+ #endif
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #  include <sys/utsname.h>
+ #endif
+ 
+@@ -73,7 +73,7 @@ OUString SalGenericInstance::getOSVersio
+         fclose( pVersion );
+     }
+     return aKernelVer;
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+     struct utsname stName;
+     if ( uname( &stName ) != 0 )
+         return aKernelVer;