diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-11-03 00:56:26 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-11-03 00:56:26 +0000 |
| commit | 6d5d6429d5880f9fdf4b4b54c0fb53e44b3927f9 (patch) | |
| tree | db7a5d68a7b148f62f63c9562391af1272e3f376 /editors | |
| parent | graphics/mesa-devel: update to 20.2.b.3686 (diff) | |
devel/icu: update to 68.1
Changes: http://site.icu-project.org/download/68
ABI: https://abi-laboratory.pro/tracker/timeline/icu4c/
Reported by: GitHub (watch releases)
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/libreoffice/Makefile | 2 | ||||
| -rw-r--r-- | editors/libreoffice/files/patch-icu68 | 17 | ||||
| -rw-r--r-- | editors/libreoffice6/Makefile | 2 | ||||
| -rw-r--r-- | editors/libreoffice6/files/patch-icu68 | 31 | ||||
| -rw-r--r-- | editors/poedit/Makefile | 2 |
5 files changed, 51 insertions, 3 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 25c42ebe0d76..b28c6358fcc1 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 .include "${.CURDIR}/Makefile.common" diff --git a/editors/libreoffice/files/patch-icu68 b/editors/libreoffice/files/patch-icu68 new file mode 100644 index 000000000000..e1e068c1eb9a --- /dev/null +++ b/editors/libreoffice/files/patch-icu68 @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: use of undeclared identifier 'TRUE' + body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); + ^ + +--- i18npool/source/calendar/calendar_gregorian.cxx.orig 2020-09-30 15:54:35 UTC ++++ i18npool/source/calendar/calendar_gregorian.cxx +@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDa + "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); + int32_t nZoneOffset, nDSTOffset; + UErrorCode status = U_ZERO_ERROR; +- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); ++ body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; + status = U_ZERO_ERROR; + body->setTime( fR - (nZoneOffset + nDSTOffset), status ); diff --git a/editors/libreoffice6/Makefile b/editors/libreoffice6/Makefile index 5bdef7e22e60..ec47374ec8db 100644 --- a/editors/libreoffice6/Makefile +++ b/editors/libreoffice6/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 .include "${.CURDIR}/Makefile.common" diff --git a/editors/libreoffice6/files/patch-icu68 b/editors/libreoffice6/files/patch-icu68 new file mode 100644 index 000000000000..59edaffaefc5 --- /dev/null +++ b/editors/libreoffice6/files/patch-icu68 @@ -0,0 +1,31 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: use of undeclared identifier 'TRUE' + body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); + ^ +svx/source/dialog/fntctrl.cxx:1017:24: error: use of undeclared identifier 'TRUE' + bTransparent = TRUE; + ^ + +--- i18npool/source/calendar/calendar_gregorian.cxx.orig 2020-09-30 15:54:35 UTC ++++ i18npool/source/calendar/calendar_gregorian.cxx +@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDa + "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); + int32_t nZoneOffset, nDSTOffset; + UErrorCode status = U_ZERO_ERROR; +- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); ++ body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; + status = U_ZERO_ERROR; + body->setTime( fR - (nZoneOffset + nDSTOffset), status ); +--- svx/source/dialog/fntctrl.cxx.orig 2020-10-07 12:23:42 UTC ++++ svx/source/dialog/fntctrl.cxx +@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSe + rCTLFont.SetFillColor( rColor ); + } + else +- bTransparent = TRUE; ++ bTransparent = true; + + rFont.SetTransparent( bTransparent ); + rCJKFont.SetTransparent( bTransparent ); diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 817c39255b94..af2936308fe3 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -4,7 +4,7 @@ PORTNAME= poedit PORTVERSION= 1.8.4 -PORTREVISION= 32 +PORTREVISION= 33 CATEGORIES= editors MASTER_SITES= https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/ |