From 678e87e002ee3668601f1a8299add88a5ac50f06 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 8 Feb 2017 22:22:21 +0000 Subject: [PATCH] Do not apply the kludge for PR214473 on all supported FreeBSD versions. These patches actually reintroduced an upstream bug. https://gerrit.libreoffice.org/22291 PR: 214473 --- editors/libreoffice/Makefile | 9 ++++++++- ...tkinst.hxx => extrapatch-vcl_inc_unx_gtk_gtkinst.hxx} | 0 ...tk_gtkinst.cxx => extrapatch-vcl_unx_gtk_gtkinst.cxx} | 0 3 files changed, 8 insertions(+), 1 deletion(-) rename editors/libreoffice/files/{patch-vcl_inc_unx_gtk_gtkinst.hxx => extrapatch-vcl_inc_unx_gtk_gtkinst.hxx} (100%) rename editors/libreoffice/files/{patch-vcl_unx_gtk_gtkinst.cxx => extrapatch-vcl_unx_gtk_gtkinst.cxx} (100%) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 68ff42c1fd21..4cb1e140e772 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 3 +PORTREVISION= 4 MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ http://dev-www.libreoffice.org/src/:src \ http://dev-www.libreoffice.org/extern/:ext @@ -273,6 +273,13 @@ _MAKE_JOBS= # .if ${COMPILER_FEATURES:Mlibstdc++} BROKEN= Build with system libstdc++ is unsupported .endif +.if (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200003) || \ + (${OSVERSION} >= 1100500 && ${OSVERSION} < 1100501) || \ + (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100122) || \ + ${OSVERSION} < 1003506 +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx \ + ${PATCHDIR}/extrapatch-vcl_unx_gtk_gtkinst.cxx +.endif .endif # FreeBSD .if ${COMPILER_TYPE} == "clang" diff --git a/editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx b/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx similarity index 100% rename from editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx rename to editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx diff --git a/editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx b/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx similarity index 100% rename from editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx rename to editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx