From 10f52ab4d27263439d59f55f40e88ad2fde0cf71 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 25 Mar 2020 18:59:51 +0100 Subject: nss: fix this up to work with Online again Regression from commit 8512f4ca090c85477a6670438aeefe7fdfcf8a98 (build nss using their new build system (gyp/ninja-based), 2020-02-19), the problem was that for some reason nss was pre-loaded in the past in some magic way, but after that commit we need to do this explicitly. Additionally, if the core.git build is a debug one, we now get an nss assert that checks if there was a fork between loading and using nss. I don't think that was enabled before, so just patch that out to fix the build breakage on the online.git side. online.git's unit-password-protected now passes again with this. Change-Id: I56c0019c446b4cabbb73141bbff80e8d8ffdb54c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91068 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- desktop/source/lib/init.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'desktop/source') diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 706d826d6722..7d8bed0bd81a 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -164,6 +164,8 @@ #include "lokinteractionhandler.hxx" #include "lokclipboard.hxx" #include +#include +#include using namespace css; using namespace vcl; @@ -5687,6 +5689,12 @@ static void preloadData() SvtLanguageTable::HasLanguageType(LANGUAGE_SYSTEM); (void)LanguageTag::isValidBcp47("foo", nullptr); + std::cerr << "Preload nss\n"; + { + comphelper::Hash aHash(comphelper::HashType::SHA256); + comphelper::OStorageHelper::CreatePackageEncryptionData("x"); + } + std::cerr << "Preload fonts\n"; // Initialize fonts. -- cgit v1.2.3