cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a different workaround for the mutex hang issue, which is already used elsewhere

Browse Source
This commit is contained in:
robert 2019-01-29 10:34:28 +00:00
parent cba8d090da
commit fa82e654d1
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.194 2018/12/19 20:43:17 robert Exp $
# $OpenBSD: Makefile,v 1.195 2019/01/29 10:34:28 robert Exp $
USE_WXNEEDED= Yes
@ -24,6 +24,8 @@ PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel tag:kde4
REVISION-main= 0
EPOCH= 0
MAINTAINER= Robert Nagy <robert@openbsd.org>

16
editors/libreoffice/patches/patch-desktop_source_app_app_cxx
View File

@ -1,13 +1,23 @@
$OpenBSD: patch-desktop_source_app_app_cxx,v 1.13 2018/08/18 07:07:17 robert Exp $
$OpenBSD: patch-desktop_source_app_app_cxx,v 1.14 2019/01/29 10:34:28 robert Exp $
Index: desktop/source/app/app.cxx
--- desktop/source/app/app.cxx.orig
+++ desktop/source/app/app.cxx
@@ -567,7 +567,7 @@ void Desktop::DeInit()
@@ -551,6 +551,7 @@ void Desktop::InitFinished()
void Desktop::DeInit()
{
+ const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs();
try {
// instead of removing of the configManager just let it commit all the changes
utl::ConfigManager::storeConfigItems();
@@ -567,7 +568,9 @@ void Desktop::DeInit()
// clear lockfile
m_xLockfile.reset();
- RequestHandler::Disable();
+ RequestHandler::SetDowning();
+ if ( !rCmdLineArgs.GetUnknown().isEmpty()
+ || rCmdLineArgs.IsHelp() || rCmdLineArgs.IsVersion() )
+ RequestHandler::Disable();
if( pSignalHandler )
osl_removeSignalHandler( pSignalHandler );
} catch (const RuntimeException&) {