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

add some missing ifdefs to use linux specific code on openbsd as well:

Browse Source 
- add missing VCL backend info in About
- calculate max call level based on stack size
This commit is contained in:
robert 2019-02-28 22:09:41 +00:00
parent 99d0eeb0ab
commit 9d6706fec0
5 changed files with 59 additions and 1 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.196 2019/02/09 15:23:07 robert Exp $ # $OpenBSD: Makefile,v 1.197 2019/02/28 22:09:41 robert Exp $
USE_WXNEEDED= Yes USE_WXNEEDED= Yes
@ -24,6 +24,8 @@ PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity CATEGORIES= editors productivity
DPB_PROPERTIES= parallel tag:kde4 DPB_PROPERTIES= parallel tag:kde4
REVISION-main= 0
EPOCH= 0 EPOCH= 0
MAINTAINER= Robert Nagy <robert@openbsd.org> MAINTAINER= Robert Nagy <robert@openbsd.org>

14
editors/libreoffice/patches/patch-basic_source_classes_sbxmod_cxx Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-basic_source_classes_sbxmod_cxx,v 1.1 2019/02/28 22:09:41 robert Exp $
Index: basic/source/classes/sbxmod.cxx
--- basic/source/classes/sbxmod.cxx.orig
+++ basic/source/classes/sbxmod.cxx
@@ -1069,7 +1069,7 @@ void SbModule::Run( SbMethod* pMeth )
struct rlimit rl;
getrlimit ( RLIMIT_STACK, &rl );
#endif
-#if defined LINUX
+#if defined(LINUX) || defined(__OpenBSD__)
// Empiric value, 900 = needed bytes/Basic call level
// for Linux including 10% safety margin
nMaxCallLevel = rl.rlim_cur / 900;

14
editors/libreoffice/patches/patch-idl_source_objects_types_cxx Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-idl_source_objects_types_cxx,v 1.1 2019/02/28 22:09:41 robert Exp $
Index: idl/source/objects/types.cxx
--- idl/source/objects/types.cxx.orig
+++ idl/source/objects/types.cxx
@@ -251,7 +251,7 @@ void SvMetaType::WriteSfxItem(
// write the implementation part
rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl;
- rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(LINUX))) || STATIC_LINKING)" ) << endl;
+ rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(LINUX) || defined(OPENBSD))) || STATIC_LINKING)" ) << endl;
rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl;
rOutStm.WriteCharPtr( "#endif" ) << endl;
rOutStm.WriteOString( aTypeName ).WriteOString( aVarName )

14
editors/libreoffice/patches/patch-sal_osl_unx_sockimpl_hxx Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-sal_osl_unx_sockimpl_hxx,v 1.1 2019/02/28 22:09:41 robert Exp $
Index: sal/osl/unx/sockimpl.hxx
--- sal/osl/unx/sockimpl.hxx.orig
+++ sal/osl/unx/sockimpl.hxx
@@ -24,7 +24,7 @@
#include <osl/socket.h>
#include <osl/interlck.h>
-#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD)
+#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)
#define CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT 1
#endif

14
editors/libreoffice/patches/patch-vcl_source_app_svapp_cxx Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-vcl_source_app_svapp_cxx,v 1.1 2019/02/28 22:09:41 robert Exp $
Index: vcl/source/app/svapp.cxx
--- vcl/source/app/svapp.cxx.orig
+++ vcl/source/app/svapp.cxx
@@ -1103,7 +1103,7 @@ OUString Application::GetHWOSConfInfo()
aDetails.append( VclResId(SV_APP_DEFAULT) );
aDetails.append( "; " );
-#if (defined LINUX || defined _WIN32 || defined MACOSX)
+#if (defined LINUX || defined _WIN32 || defined MACOSX || defined OPENBSD)
aDetails.append( SV_APP_VCLBACKEND );
aDetails.append( GetToolkitName() );
aDetails.append( "; " );