diff options
| author | jkim <jkim@FreeBSD.org> | 2017-02-09 06:22:21 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2017-02-09 06:22:21 +0800 |
| commit | eb4f39e9de74a117bf2867c54b4ead5b078a3a8b (patch) | |
| tree | ee13a7dcd6c2f83e3ffc3be0865020c896abc93a /editors/libreoffice | |
| parent | 4dee4a26aca36af7f4791527cf479afaf4256034 (diff) | |
| download | freebsd-ports-gnome-eb4f39e9de74a117bf2867c54b4ead5b078a3a8b.tar.gz freebsd-ports-gnome-eb4f39e9de74a117bf2867c54b4ead5b078a3a8b.tar.zst freebsd-ports-gnome-eb4f39e9de74a117bf2867c54b4ead5b078a3a8b.zip | |
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
Diffstat (limited to 'editors/libreoffice')
| -rw-r--r-- | editors/libreoffice/Makefile | 9 | ||||
| -rw-r--r-- | editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx (renamed from editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx) | 0 | ||||
| -rw-r--r-- | editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx (renamed from editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx) | 0 |
3 files changed, 8 insertions, 1 deletions
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 index c9ab6a82b920..c9ab6a82b920 100644 --- a/editors/libreoffice/files/patch-vcl_inc_unx_gtk_gtkinst.hxx +++ b/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 index b53a62613794..b53a62613794 100644 --- a/editors/libreoffice/files/patch-vcl_unx_gtk_gtkinst.cxx +++ b/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx |