CVS commit: pkgsrc/misc/libreoffice

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Dec 14 13:12:24 UTC 2018

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

Log Message:
Fix build with boost-1.69.0


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-sfx2_source_appl_shutdownicon.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/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.68 pkgsrc/misc/libreoffice/distinfo:1.69
--- pkgsrc/misc/libreoffice/distinfo:1.68       Thu Dec 13 16:34:10 2018
+++ pkgsrc/misc/libreoffice/distinfo    Fri Dec 14 13:12:24 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2018/12/13 16:34:10 abs Exp $
+$NetBSD: distinfo,v 1.69 2018/12/14 13:12:24 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -240,6 +240,7 @@ SHA1 (patch-opencl_source_openclconfig.c
 SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 1910ebf571181b2f6a973e2f6537baf67edbcb4a
 SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx) = 15a5d9708a5349f6584231dcf787537618371cb0
 SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_wrapper__gpl.cxx) = f2ecf16e731bebc88639598c5e63b05998317f8a
+SHA1 (patch-sfx2_source_appl_shutdownicon.cxx) = 111d4ca26c55cf2ab192c1fcec40e9e3f3017e57
 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
 SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
 SHA1 (patch-svx_source_gengal_gengal.sh) = 3313785a2cf2d22634a28fd6cf7a0ff19afcea62

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-sfx2_source_appl_shutdownicon.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-sfx2_source_appl_shutdownicon.cxx:1.1
--- /dev/null   Fri Dec 14 13:12:24 2018
+++ pkgsrc/misc/libreoffice/patches/patch-sfx2_source_appl_shutdownicon.cxx     Fri Dec 14 13:12:24 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-sfx2_source_appl_shutdownicon.cxx,v 1.1 2018/12/14 13:12:24 ryoon Exp $
+
+* Fix build with boost-1.69.0
+
+--- sfx2/source/appl/shutdownicon.cxx.orig     2018-10-29 19:55:29.000000000 +0000
++++ sfx2/source/appl/shutdownicon.cxx
+@@ -141,7 +141,7 @@ bool LoadModule()
+ #endif // ENABLE_QUICKSTART_APPLET
+     }
+     assert(!boost::logic::indeterminate(loaded));
+-    return loaded;
++    return bool(loaded);
+ }
+ 
+ }