summaryrefslogtreecommitdiff
path: root/editors/libreoffice
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2019-04-20 16:01:00 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2019-04-20 16:01:00 +0000
commitc953132852e8443882a14941e4824703d5132e18 (patch)
tree30470d6030325f9136b120943a6dd9cbb4d610d7 /editors/libreoffice
parentdd58b7c89d0836d64f8f7f332b4a7791450b0208 (diff)
downloadfreebsd-ports-c953132852e8443882a14941e4824703d5132e18.zip
- Update to 6.2.3
Diffstat (limited to 'editors/libreoffice')
-rw-r--r--editors/libreoffice/Makefile2
-rw-r--r--editors/libreoffice/Makefile.common2
-rw-r--r--editors/libreoffice/distinfo10
-rw-r--r--editors/libreoffice/files/patch-boost-1.6917
4 files changed, 6 insertions, 25 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 7990372c7ae1..8014d83947ca 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,8 +2,6 @@
.include "${.CURDIR}/Makefile.common"
-PORTREVISION= 4
-
MASTER_SITES= https://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
https://dev-www.libreoffice.org/src/:src \
https://dev-www.libreoffice.org/extern/:ext
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 647b1ffedec8..37de09f5555d 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libreoffice
-PORTVERSION= 6.2.2
+PORTVERSION= 6.2.3
CATEGORIES+= editors
MAINTAINER= office@FreeBSD.org
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index 6a0ddb32fcae..23e70fc258e5 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1553264231
-SHA256 (libreoffice/libreoffice-6.2.2.2.tar.xz) = b83ad3a8aa7bebf34db9e984d518a8f2248ed685e04be8373cfa87bb04e31f69
-SIZE (libreoffice/libreoffice-6.2.2.2.tar.xz) = 214029032
-SHA256 (libreoffice/libreoffice-help-6.2.2.2.tar.xz) = 619f92db787dc8cb4aa81f203b3eefbd02a4affd382bf8d1b9268c846d360d92
-SIZE (libreoffice/libreoffice-help-6.2.2.2.tar.xz) = 15267780
+TIMESTAMP = 1555604895
+SHA256 (libreoffice/libreoffice-6.2.3.2.tar.xz) = f1ddb94fb2bab615ec446da83e62f2bcf963bddc7b9fe600e326701926dc6daf
+SIZE (libreoffice/libreoffice-6.2.3.2.tar.xz) = 214234080
+SHA256 (libreoffice/libreoffice-help-6.2.3.2.tar.xz) = c1b6923eb66610abeecde79fcc28c9c61353e5b1f2772a37c7aa7a018dbe1132
+SIZE (libreoffice/libreoffice-help-6.2.3.2.tar.xz) = 13024476
SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
SHA256 (libreoffice/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf) = 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63
diff --git a/editors/libreoffice/files/patch-boost-1.69 b/editors/libreoffice/files/patch-boost-1.69
deleted file mode 100644
index 2347c3c5430f..000000000000
--- a/editors/libreoffice/files/patch-boost-1.69
+++ /dev/null
@@ -1,17 +0,0 @@
-After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails:
-
-sfx2/source/appl/shutdownicon.cxx:170:12: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool'
- return loaded;
- ^~~~~~
-
---- sfx2/source/appl/shutdownicon.cxx.orig 2019-02-05 07:22:07.809681000 +0800
-+++ sfx2/source/appl/shutdownicon.cxx 2019-02-05 07:21:48.200022000 +0800
-@@ -143,7 +143,7 @@ bool LoadModule()
- #endif // ENABLE_QUICKSTART_APPLET
- }
- assert(!boost::logic::indeterminate(loaded));
-- return loaded;
-+ return bool{loaded};
- }
-
- }