Mon Feb 26 18:04:31 2018 UTC ()
Fix typo in comment


(ryoon)
diff -r1.48 -r1.49 pkgsrc/misc/libreoffice/distinfo
diff -r1.1 -r1.2 pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx
diff -r1.1 -r1.2 pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx
cvs diff -r1.48 -r1.49 pkgsrc/misc/libreoffice/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/distinfo 2018/02/13 13:03:06 1.48
+++ pkgsrc/misc/libreoffice/distinfo 2018/02/26 18:04:31 1.49
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.48 2018/02/13 13:03:06 ryoon Exp $ 1$NetBSD: distinfo,v 1.49 2018/02/26 18:04:31 ryoon Exp $
2 2
3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b 4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes 6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
7SHA1 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = c36bccbf6a0e562fa5a7b4b832af7185fa7f8a4b 7SHA1 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = c36bccbf6a0e562fa5a7b4b832af7185fa7f8a4b
8RMD160 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = ff53f6a5027654477d307baa3bcceba7b109220f 8RMD160 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = ff53f6a5027654477d307baa3bcceba7b109220f
9SHA512 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = 0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f 9SHA512 (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = 0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f
10Size (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = 1333593 bytes 10Size (libreoffice/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz) = 1333593 bytes
11SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a 11SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a
12RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb 12RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb
13SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f 13SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f
14Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes 14Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes
@@ -209,19 +209,18 @@ SHA1 (patch-autogen.sh) = eedd0091745cf6 @@ -209,19 +209,18 @@ SHA1 (patch-autogen.sh) = eedd0091745cf6
209SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b 209SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b
210SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4 210SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4
211SHA1 (patch-configure.ac) = 13024963b8d5ee21b2b8268bf6e1d442e5838454 211SHA1 (patch-configure.ac) = 13024963b8d5ee21b2b8268bf6e1d442e5838454
212SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075 212SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075
213SHA1 (patch-download.lst) = c18fe0a65f75a8c8318c9b01f6ad16685f81ae27 213SHA1 (patch-download.lst) = c18fe0a65f75a8c8318c9b01f6ad16685f81ae27
214SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = ffe2b8ff9e9ff6b5faf4eea1d51a8983908d0602 214SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = ffe2b8ff9e9ff6b5faf4eea1d51a8983908d0602
215SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = ed0c6861fd9a61eeac05e235dd505b6bed166a3a 215SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = ed0c6861fd9a61eeac05e235dd505b6bed166a3a
216SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d 216SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
217SHA1 (patch-external_mysql-connector-cpp_patches_netbsd.patch) = d0981757856f5b28082ee468b385dc2fdf027dd0 217SHA1 (patch-external_mysql-connector-cpp_patches_netbsd.patch) = d0981757856f5b28082ee468b385dc2fdf027dd0
218SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce 218SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce
219SHA1 (patch-external_postgresql_UnpackedTarball__postgresql.mk) = d0b94e20d9e1aa89adac0f4a91c7b684850c78bc 219SHA1 (patch-external_postgresql_UnpackedTarball__postgresql.mk) = d0b94e20d9e1aa89adac0f4a91c7b684850c78bc
220SHA1 (patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch) = de2b5d8e657e9721867f9c72a402cc30fd093218 220SHA1 (patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch) = de2b5d8e657e9721867f9c72a402cc30fd093218
221SHA1 (patch-mysqlc_Library__mysqlc.mk) = b040cfdb25f41896c77df3acafd4c31dc41dd590 221SHA1 (patch-mysqlc_Library__mysqlc.mk) = b040cfdb25f41896c77df3acafd4c31dc41dd590
222SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = f21567d7ba021acb697a7fe6b650d41980b6cc54 
223SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d 222SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
224SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58 223SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58
225SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb 224SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
226SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 51372020a640f9f1ccd8ebd8694e33c4fdedff47 225SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 8b744a450175b4e432d41fb6cea0ee6df72ee307
227SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 50dac45907c8d0651e9fc4a0df3f74affc940931 226SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 68e869e1c83b911765bab27f185bbad44636ea0a
cvs diff -r1.1 -r1.2 pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx 2017/08/01 11:57:37 1.1
+++ pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx 2018/02/26 18:04:31 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-xmlsecurity_source_gpg_CertificateImpl.hxx,v 1.1 2017/08/01 11:57:37 ryoon Exp $ 1$NetBSD: patch-xmlsecurity_source_gpg_CertificateImpl.hxx,v 1.2 2018/02/26 18:04:31 ryoon Exp $
2 2
3* Do not confuse wth key.h from gpgmepp and nss 3* Do not confuse with key.h from gpgmepp and nss
4 4
5--- xmlsecurity/source/gpg/CertificateImpl.hxx.orig 2017-07-25 20:26:39.000000000 +0000 5--- xmlsecurity/source/gpg/CertificateImpl.hxx.orig 2017-07-25 20:26:39.000000000 +0000
6+++ xmlsecurity/source/gpg/CertificateImpl.hxx 6+++ xmlsecurity/source/gpg/CertificateImpl.hxx
7@@ -26,7 +26,7 @@ 7@@ -26,7 +26,7 @@
8 #include <com/sun/star/security/CertificateKind.hpp> 8 #include <com/sun/star/security/CertificateKind.hpp>
9 #include <com/sun/star/security/XCertificate.hpp> 9 #include <com/sun/star/security/XCertificate.hpp>
10  10
11-#include <key.h> 11-#include <key.h>
12+#include <gpgme++/key.h> 12+#include <gpgme++/key.h>
13  13
14 class CertificateImpl : public cppu::WeakImplHelper< css::security::XCertificate, 14 class CertificateImpl : public cppu::WeakImplHelper< css::security::XCertificate,
15 css::lang::XUnoTunnel >, 15 css::lang::XUnoTunnel >,
cvs diff -r1.1 -r1.2 pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx 2017/08/01 11:57:37 1.1
+++ pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx 2018/02/26 18:04:31 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx,v 1.1 2017/08/01 11:57:37 ryoon Exp $ 1$NetBSD: patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx,v 1.2 2018/02/26 18:04:31 ryoon Exp $
2 2
3* Do not confuse wth key.h from gpgmepp and nss 3* Do not confuse with key.h from gpgmepp and nss
4 4
5--- xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx.orig 2017-07-25 20:26:39.000000000 +0000 5--- xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx.orig 2017-07-25 20:26:39.000000000 +0000
6+++ xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx 6+++ xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
7@@ -23,7 +23,7 @@ 7@@ -23,7 +23,7 @@
8  8
9 #include <gpgme.h> 9 #include <gpgme.h>
10 #include <context.h> 10 #include <context.h>
11-#include <key.h> 11-#include <key.h>
12+#include <gpgme++/key.h> 12+#include <gpgme++/key.h>
13 #include <data.h> 13 #include <data.h>
14 #include <signingresult.h> 14 #include <signingresult.h>
15 #include <importresult.h> 15 #include <importresult.h>