CVS commit: pkgsrc/misc/libreoffice

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Mar  1 03:25:07 UTC 2018

Modified Files:
        pkgsrc/misc/libreoffice: Makefile distinfo
Added Files:
        pkgsrc/misc/libreoffice/patches: patch-desktop_scripts_soffice.sh

Log Message:
Do not share NSS database files with Mozilla products. Bump PKGREVISION

In some case, cert8.db/key3.db/secmod.db in MDB format
from Mozilla Products causes crash on opening XML-based document.
Use LibreOffice own NSS database.
XML and PDF signing with X.509 certificate is not tested.


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.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/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.142 pkgsrc/misc/libreoffice/Makefile:1.143
--- pkgsrc/misc/libreoffice/Makefile:1.142      Tue Feb 13 13:03:06 2018
+++ pkgsrc/misc/libreoffice/Makefile    Thu Mar  1 03:25:06 2018
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.142 2018/02/13 13:03:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.143 2018/03/01 03:25:06 ryoon Exp $
 
 VERREL=                6.0.1
 VERRC=         1
 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.49 pkgsrc/misc/libreoffice/distinfo:1.50
--- pkgsrc/misc/libreoffice/distinfo:1.49       Mon Feb 26 18:04:31 2018
+++ pkgsrc/misc/libreoffice/distinfo    Thu Mar  1 03:25:06 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2018/02/26 18:04:31 ryoon Exp $
+$NetBSD: distinfo,v 1.50 2018/03/01 03:25:06 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -209,6 +209,7 @@ SHA1 (patch-autogen.sh) = eedd0091745cf6
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4
 SHA1 (patch-configure.ac) = 13024963b8d5ee21b2b8268bf6e1d442e5838454
+SHA1 (patch-desktop_scripts_soffice.sh) = b5b2ccf7830d160fd4a1bb087610a1b766b25f08
 SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075
 SHA1 (patch-download.lst) = c18fe0a65f75a8c8318c9b01f6ad16685f81ae27
 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = ffe2b8ff9e9ff6b5faf4eea1d51a8983908d0602

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.sh
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.sh:1.1
--- /dev/null   Thu Mar  1 03:25:07 2018
+++ pkgsrc/misc/libreoffice/patches/patch-desktop_scripts_soffice.sh    Thu Mar  1 03:25:06 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-desktop_scripts_soffice.sh,v 1.1 2018/03/01 03:25:06 ryoon Exp $
+
+--- desktop/scripts/soffice.sh.orig    2018-02-08 14:35:19.000000000 +0000
++++ desktop/scripts/soffice.sh
+@@ -17,6 +17,10 @@
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
+ 
++# Do not depend on Mozilla profiles
++MOZILLA_CERTIFICATE_FOLDER=${HOME}/.config/libreoffice
++export MOZILLA_CERTIFICATE_FOLDER
++
+ # use POSIX locale for well-defined tool output
+ LO_SAVE_LC_ALL="$LC_ALL"
+ LC_ALL=C