NetBSD Problem Report #56048

From www@netbsd.org  Tue Mar  9 10:57:15 2021
Return-Path: <www@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 021481A9217
	for <gnats-bugs@gnats.NetBSD.org>; Tue,  9 Mar 2021 10:57:15 +0000 (UTC)
Message-Id: <20210309105713.547211A923A@mollari.NetBSD.org>
Date: Tue,  9 Mar 2021 10:57:13 +0000 (UTC)
From: jun@soum.co.jp
Reply-To: jun@soum.co.jp
To: gnats-bugs@NetBSD.org
Subject: pkgsrc/misc/libreoffice: set "OS Environment" on NetBSD,same as FreeBSD.
X-Send-Pr-Version: www-1.0

>Number:         56048
>Category:       pkg
>Synopsis:       pkgsrc/misc/libreoffice: set "OS Environment" on NetBSD,same as FreeBSD.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    ryoon
>State:          closed
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Tue Mar 09 11:00:00 +0000 2021
>Closed-Date:    Tue Jul 27 03:32:31 +0000 2021
>Last-Modified:  Tue Jul 27 03:35:01 +0000 2021
>Originator:     Jun Ebihara
>Release:        pkgsrc Mar.9 2021
>Organization:
SOUM Corporation
>Environment:
NetBSD arm64 9.99.80 NetBSD 9.99.80 (GENERIC64) #0: Tue Feb 16 19:46:15 UTC 2021  mkrepro@mkrepro.NetBSD.org:/usr/src/sys/arch/evbarm/compile/GENERIC64 evbarm

>Description:
On libreoffice,add NetBSD version to "Environment".

Before:

Help -> About LibreOffice
 Environment: OS: unknown

https://twitter.com/ebijun/status/1368885643971948546

After:

 Environment: OS: NetBSD 9.99

https://twitter.com/ebijun/status/1369235423961092096
>How-To-Repeat:
On NetBSD:

1. make package-install on /usr/pkgsrc/misc/libreoffice
2. Open "Help" -> "About LibreOffice"
 Environment: OS: unknown
>Fix:
https://github.com/ebijun/NetBSD/blob/master/pkgsrc/libreoffice/patch-vcl_unx_generic_app_geninst.cxx

$NetBSD$

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;

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->ryoon
Responsible-Changed-By: wiz@NetBSD.org
Responsible-Changed-When: Tue, 09 Mar 2021 11:15:39 +0000
Responsible-Changed-Why:
Over to maintainer


From: "Ryo ONODERA" <ryoon@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/56048 CVS commit: pkgsrc/misc/libreoffice
Date: Wed, 10 Mar 2021 16:07:54 +0000

 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.

State-Changed-From-To: open->closed
State-Changed-By: ryoon@NetBSD.org
State-Changed-When: Wed, 10 Mar 2021 16:48:07 +0000
State-Changed-Why:
The patch is applied. Thank you.


From: Yasushi Oshima <oshima-ya@yagoto-urayama.jp>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/56048
Date: Sat, 22 May 2021 01:46:35 +0900 (JST)

 Dear,

 > Set "OS Environment" on NetBSD,same as FreeBSD.

 I don't think this change is suitable because the rules of release-name
 for NetBSD and FreeBSD are different and this #ifdef is made for FreeBSD.
 In fact, this change causes in NetBSD 9.2 and 9.2_STABLE to display:
 "OS: !!br0ken!!", this is wrong (will be the same for 8.x and future
 10.0 or lator). The reason for this is probably that this FreeBSD code
 is in an unexpected state with the case of NetBSD's release-name

 The code for FreeBSD seems to be trying to remove strings like
 "-RELEASE", "-CURRENT" and others, or, patch release numbers like "5.2.1".

 I suggest that it simply display utsname.release directly.

 For example:

 --- vcl/unx/generic/app/geninst.cxx.orig    2021-04-29 01:17:45.000000000 +0900
 +++ vcl/unx/generic/app/geninst.cxx 2021-05-22 00:50:12.160401669 +0900
 @@ -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,14 +73,18 @@
          fclose( pVersion );
      }
      return aKernelVer;
 -#elif defined(__FreeBSD__)
 +#elif defined(__FreeBSD__) || defined(__NetBSD__)
      struct utsname stName;
      if ( uname( &stName ) != 0 )
          return aKernelVer;

 +    aKernelVer = OUString::createFromAscii( stName.release );
 +#if defined(__NetBSD__)
 +    return OUString::createFromAscii( stName.sysname ) + " " +
 +        aKernelVer.copy( 0, aKernelVer.getLength() );
 +#else /* __FreeBSD__ */
      sal_Int32 nDots = 0;
      sal_Int32 nIndex = 0;
 -    aKernelVer = OUString::createFromAscii( stName.release );
      while ( nIndex++ < aKernelVer.getLength() )
      {
          const char c = stName.release[ nIndex ];
 @@ -89,6 +93,7 @@
      }
      return OUString::createFromAscii( stName.sysname ) + " " +
          aKernelVer.copy( 0, nIndex );
 +#endif
  #else
      return aKernelVer;
  #endif


 Thanks.

 --
 Yasushi Oshima

State-Changed-From-To: closed->open
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Mon, 19 Jul 2021 02:16:01 +0000
State-Changed-Why:
an objection to the patch was raised -- can you reexamine?


From: Jun Ebihara <jun@soum.co.jp>
To: gnats-bugs@netbsd.org, dholland@NetBSD.org
Cc: ryoon@netbsd.org, pkgsrc-bugs@netbsd.org, gnats-admin@netbsd.org
Subject: Re: pkg/56048 (pkgsrc/misc/libreoffice: set "OS Environment" on
 NetBSD,same as FreeBSD.)
Date: Mon, 19 Jul 2021 11:42:40 +0900 (JST)

 From: dholland@NetBSD.org
 Subject: Re: pkg/56048 (pkgsrc/misc/libreoffice: set "OS Environment" on NetBSD,same as FreeBSD.)
 Date: Mon, 19 Jul 2021 02:16:01 +0000 (UTC)

 > Synopsis: pkgsrc/misc/libreoffice: set "OS Environment" on NetBSD,same as FreeBSD.
 > 
 > State-Changed-From-To: closed->open
 > State-Changed-By: dholland@NetBSD.org
 > State-Changed-When: Mon, 19 Jul 2021 02:16:01 +0000
 > State-Changed-Why:
 > an objection to the patch was raised -- can you reexamine?

 It's my miss,and display utsname.release directry is good.
 Please apply Oshima-san's fix.
 --
 Jun Ebihara

From: "Ryo ONODERA" <ryoon@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/56048 CVS commit: pkgsrc/misc/libreoffice
Date: Mon, 26 Jul 2021 12:42:24 +0000

 Module Name:	pkgsrc
 Committed By:	ryoon
 Date:		Mon Jul 26 12:42:24 UTC 2021

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

 Log Message:
 libreoffice: Update to 7.1.5.2

 * Fix PR pkg/56048 with Yasushi Oshima's patch.

 Changelog:
 7.1.5.2
 Bugs fixed compared to 7.1.5 rc1:

  1. tdf#138432 EDITING: Regression in handling of the group separator in
     formula context [Eike Rathke]
  2. tdf#140431 FILESAVE XLSX Double file:// prefix when saving hyperlink
     pointing to file on network share to XLSX [T??nde T??th]
  3. tdf#140506 REGRESSION Setting to repeat heading in writer tables no longer
     works [Bjoern Michaelsen]
  4. tdf#140594 Screen reader does not announce new spinbox value when changing
     it with up/down key (Windows) [Michael Weghorn]
  5. tdf#143146 Crash by click on properties symbol for calc data in writer
     [Caol??n McNamara]
  6. tdf#143149 Crash in: vcl::Window::GetParentWithLOKNotifier() [Caol??n
     McNamara]
  7. tdf#143153 Editing Crash when grouping Text (Fit to Frame) and object [Caol
     ??n McNamara]
  8. tdf#143165 [EDITING] When I type "5-d" into cell, it is autoconverted into
     date 2021/07/05 [Eike Rathke]
  9. tdf#143245 Clicking anywhere in the Description area will trigger the Form
     creation window [Caol??n McNamara]
 10. tdf#143291 Selecting the None slide transition has no effect [Caol??n
     McNamara]

 7.1.5.1
 Bugs fixed compared to 7.1.4 RC2

  1. ofz#34221 avoid OOM [Caol??n McNamara]
  2. ofz#34297 indirect-leak [Caol??n McNamara]
  3. tdf#55007 [EMF] FILEOPEN: Close circle instead of arch (exported by Catia
     v5) [Bartosz Kosiorek]
  4. tdf#81757 Calculations order do not follow cell dependencies [Eike Rathke]
  5. tdf#96061 Text background/highlighting color doesn't reopen well in LO when
     exporting as PPTX (OK in MSO) [G??l?ah K?se]
  6. tdf#116501 Writer freezes when working with this particular ODT document
     [Michael Stahl]
  7. tdf#118637 EXPORT: XHTML: text missing after formula [Svante Schubert,
     Xisco Fauli]
  8. tdf#127013 The input fields for separators ("Function", "Array column",
     "Array row") allow to choose improper characters. [Eike Rathke]
  9. tdf#127028 Add DRAW templates to LibreOffice [Toma? Vajngerl]
 10. tdf#127145 [WMF] FILEOPEN File is rendered with thin stroke on rounded
     rectangles, but should be thick. [Bartosz Kosiorek]
 11. tdf#132752 DOCX import: invalid paragraph indentation [Vasily Melenchuk]
 12. tdf#134675 [EDITING] Whole column cannot be pasted to a column range over
     23 selected by shift-click [Eike Rathke]
 13. tdf#136766 UI: Zoom slider in toolbar of Calc's print preview has white
     background [Noel Grandin]
 14. tdf#137199 FILESAVE: DOCX to ODT Static text in numbered list is lost
     [Vasily Melenchuk]
 15. tdf#137314 FILEOPEN DOCX VML shapes with arbitrary rotation imported
     incorrectly [Regina Henschel]
 16. tdf#139447 Crash when dragging a query or table from "Data Sources
     Explorer" window to a calc sheet. [Caol??n McNamara]
 17. tdf#139658 FILEOPEN: some (multi component) chart labels are incomplete [T
     ??nde T??th]
 18. tdf#139915 FILEOPEN DOCX Two text boxes on two pages open on a single page
     [Miklos Vajna]
 19. tdf#140360 Provide option to turn off sidebar's minimum width [Heiko
     Tietze]
 20. tdf#140623 Fileopen DOCX: Text Orientation of X-Axis 0 instead of 45
     degrees [T??nde T??th]
 21. tdf#141311 Missing Decimal Places for Rotation in Sidebar [Katarina
     Behrens]
 22. tdf#141408 Updating Ukrainian spellchecker [Andras Timar]
 23. tdf#141769 Crash in: cppu::OInterfaceContainerHelper::disposeAndClear
     (com::sun::star::lang::EventObject const &) [Caol??n McNamara]
 24. tdf#142061 macOS: Calc UI: Display anomalies when resizing columns
     [Thorsten Wagner]
 25. tdf#142180 Invalid text comparison result in Basic [Joshua Williams]
 26. tdf#142263 Regression with EMF sample from 55007 [Bartosz Kosiorek]
 27. tdf#142268 [EMF] Arc with bottom corner above the top one [Bartosz
     Kosiorek]
 28. tdf#142325 Error read rtf created Gnostice eDocEngine V5.0.0.548 [Miklos
     Vajna]
 29. tdf#142370 CRASH: Closing tip of the day ( GTK3 ) [Caol??n McNamara]
 30. tdf#142395 FILEOPEN CSV: Space trailing values imported as garbage [Mike
     Kaganski]
 31. tdf#142467 Inserting series in Stock Chart Data Table crashes Writer
     (Fedora only?) [Caol??n McNamara]
 32. tdf#142478 [CRASH] searching on slide notes will crash Impress [Toma?
     Vajngerl]
 33. tdf#142513 Wrong zoom directing within Calc's print preview [Jim Raykowski]
 34. tdf#142629 Importing psd image with transparent background results in
     "Unknown image format" [Noel Grandin]
 35. tdf#142716 PPTX EXPORT: Text content is partially lost [G??l?ah K?se]
 36. tdf#142721 impossible set single cell border inside a table [Caol??n
     McNamara]
 37. tdf#142745 [EMF] Hang on FillRgn EMR [Bartosz Kosiorek]
 38. tdf#142767 SIDEBAR: First shape in each one of the Shapes Sidebar's
     sections does not work [Caol??n McNamara]
 39. tdf#142852 KMFL characters are not "swallowed" in a Writer textbox or
     shapeText [Caol??n McNamara]
 40. tdf#142873 Calc: Print preview zoom-out zoom-in buttons don't work in
     'Tabbed' UI, nor in 'Grouped Bar Compact' UI mode [Julien Nabet]
 41. tdf#142932 Crash when pasting cells with comments and "skip empty cells"
     option selected [Julien Nabet]
 42. tdf#143008 Text to Columns converts type date with AM/PM time wrongly [Eike
     Rathke]
 43. tdf#143047 Error in the tooltip in Toolbar if a hotkey is assigned [Mike
     Kaganski]
 44. tdf#143081 Basic Replace() function crashes LO [Julien Nabet]
 45. tdf#143088 Endless loop when opening file with many (change tracked)
     comments [Caol??n McNamara]


 To generate a diff of this commit:
 cvs rdiff -u -r1.266 -r1.267 pkgsrc/misc/libreoffice/Makefile
 cvs rdiff -u -r1.42 -r1.43 pkgsrc/misc/libreoffice/PLIST
 cvs rdiff -u -r1.115 -r1.116 pkgsrc/misc/libreoffice/distinfo
 cvs rdiff -u -r1.1 -r1.2 \
     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.

State-Changed-From-To: open->closed
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Tue, 27 Jul 2021 03:32:31 +0000
State-Changed-Why:
Updated patch committed, thanks all :-)


From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: PR/56048 CVS commit: pkgsrc/misc/libreoffice
Date: Tue, 27 Jul 2021 03:31:54 +0000

 On Mon, Jul 26, 2021 at 12:45:01PM +0000, Ryo ONODERA wrote:
  >  * Fix PR pkg/56048 with Yasushi Oshima's patch.

 thanks!

 I thought I was probably going to need to do that :-)

 -- 
 David A. Holland
 dholland@netbsd.org

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.