Attachment 220063 Details for Bug 251450 – v1

[patch] v1

bug251450.diff (text/plain), 2.31 KB, created by Jan Beich on 2020-11-29 13:40:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-11-29 13:40:44 UTC

Size: 2.31 KB

patch

obsolete

>From db1e3a3052a1f77a24785c9debd18d8b0941260c Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 29 Nov 2020 13:35:09 +0000
>Subject: [PATCH] editors/libreoffice: simplify QT5 on FreeBSD < 12 logic
>
>- Enables QT5 by default on DragonFly
>- Enables QT5 when DEFAULT_VERSIONS += ssl=openssl
>- Doesn't need to be adjusted when 14.0-CURRENT appears
>
>PR:		251450
>Approved by:	?
>---
> editors/libreoffice/Makefile  | 10 ++++++----
> editors/libreoffice6/Makefile | 10 ++++++----
> 2 files changed, 12 insertions(+), 8 deletions(-)
>
>diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
>index 248c38e44c2e..376f06a55918 100644
>--- a/editors/libreoffice/Makefile
>+++ b/editors/libreoffice/Makefile
>@@ -121,10 +121,12 @@ USES=		autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \
> 		pkgconfig python:3.5+ shebangfix shared-mime-info ssl tar:xz xorg
> 
> OPTIONS_DEFINE=	COINMP CUPS DOCS GNOME GTK3 JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV
>-OPTIONS_DEFAULT=	CUPS MMEDIA
>-OPTIONS_DEFAULT_FreeBSD_12=	QT5
>-OPTIONS_DEFAULT_FreeBSD_13=	QT5
>-OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
>+OPTIONS_DEFAULT=	CUPS MMEDIA QT5
>+
>+.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mssl=*}
>+# Blocked by net/qt5-network: cannot use QT5 with default OpenSSL
>+OPTIONS_EXCLUDE_FreeBSD_11+=	QT5
>+.endif
> 
> COINMP_DESC=	Enable CoinMP (deprecated) math solver
> GTK3_DESC=	GTK+ 3 GUI toolkit support (incomplete visual style)
>diff --git a/editors/libreoffice6/Makefile b/editors/libreoffice6/Makefile
>index 898be75b579b..5f75d8614288 100644
>--- a/editors/libreoffice6/Makefile
>+++ b/editors/libreoffice6/Makefile
>@@ -120,10 +120,12 @@ USES=		autoreconf:build bison compiler:c++14-lang cpe desktop-file-utils \
> 		pkgconfig python shebangfix shared-mime-info ssl tar:xz xorg
> 
> OPTIONS_DEFINE=	CUPS DOCS GNOME GTK3 I18N JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV
>-OPTIONS_DEFAULT=	CUPS MMEDIA
>-OPTIONS_DEFAULT_FreeBSD_12=	QT5
>-OPTIONS_DEFAULT_FreeBSD_13=	QT5
>-OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
>+OPTIONS_DEFAULT=	CUPS MMEDIA QT5
>+
>+.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mssl=*}
>+# Blocked by net/qt5-network: cannot use QT5 with default OpenSSL
>+OPTIONS_EXCLUDE_FreeBSD_11+=	QT5
>+.endif
> 
> GTK3_DESC=	GTK+ 3 GUI toolkit support (incomplete visual style)
> I18N_DESC=	Build i18n resources

Actions: View | Diff

Attachments on bug 251450: 220063