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

unbreak pdf export and printing by switching to libressl from nss for

Browse Source 
digest so that the MD5_Update symbol will not conflict between libcrypto
and libnss

a hack might come later for nss as well
This commit is contained in:
robert 2018-09-07 07:15:50 +00:00
parent 2ba41b782d
commit 3522e7e9ec
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.189 2018/08/27 14:07:22 sthen Exp $
# $OpenBSD: Makefile,v 1.190 2018/09/07 07:15:50 robert Exp $
USE_WXNEEDED= Yes
@ -13,6 +13,8 @@ SHARED_LIBS += orcus-0.13 0.0 # 0.0
SHARED_LIBS += orcus-parser-0.13 0.0 # 0.0
SHARED_LIBS += staroffice-0.0-lo 0.0 # 0.0
REVISION-main= 0
BV= 6.1
VERSION= ${BV}.0.3
DISTNAME= libreoffice-${VERSION}
@ -253,6 +255,7 @@ WANTLIB-kde+= ICE SM Xext icuuc
WANTLIB-kde+= X11 ${COMPILER_LIBCXX} glib-2.0 intl m pthread
WANTLIB-kde+= QtCore QtGui QtNetwork kdecore kdeui kfile kio
WANTLIB-kde+= epoxy harfbuzz-icu
WANTLIB-kde+= harfbuzz
.include <bsd.port.arch.mk>
@ -336,6 +339,7 @@ CONFIGURE_ARGS+=\
--with-system-redland \
--with-system-zlib \
--with-vendor="The OpenBSD project" \
--with-tls="openssl" \
--without-junit \
--without-krb5 \
--without-gssapi \
@ -362,7 +366,7 @@ PARALLEL_BUILD = No
.if defined(MAKE_JOBS)
NCPU= ${MAKE_JOBS}
.elif ${FLAVOR:Mparallel}
NCPU!= echo $$((`sysctl -n hw.ncpu` + 1))
NCPU!= echo $$((`sysctl -n hw.ncpuonline` + 1))
.else
NCPU= 1
.endif

5
editors/libreoffice/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.52 2018/08/18 07:07:17 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.53 2018/09/07 07:15:50 robert Exp $
bin/libreoffice
bin/libreoffice${BV}
bin/lobase
@ -4184,9 +4184,6 @@ lib/libreoffice/share/xslt/import/wordml/wordml2ooo_props.xsl
lib/libreoffice/share/xslt/import/wordml/wordml2ooo_settings.xsl
lib/libreoffice/share/xslt/import/wordml/wordml2ooo_table.xsl
lib/libreoffice/share/xslt/import/wordml/wordml2ooo_text.xsl
man/ja_JP.EUC/cat3f/
man/ja_JP.EUC/man3f/
man/ja_JP.EUC/man3p/
share/applications/calc.desktop
share/applications/draw.desktop
share/applications/impress.desktop