git: b1e55004dacc - main - editors/libreoffice: Use libcuckoo from ports.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Wed, 23 Mar 2022 12:49:14 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b1e55004dacc16b96f6b2a3e84c6892e53c42f64

commit b1e55004dacc16b96f6b2a3e84c6892e53c42f64
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-03-22 19:42:12 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-03-23 12:49:03 +0000

    editors/libreoffice: Use libcuckoo from ports.
    
    Test Plan: Build- and run-tested on 14-CURRENT.
    
    Reviewed by: #office, lwhsu, fluffy
    
    Differential Revision: https://reviews.freebsd.org/D34638
---
 editors/libreoffice/Makefile | 5 ++---
 editors/libreoffice/distinfo | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 6128adfc52d1..bd0562f45f87 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	3
 
 .include "${.CURDIR}/Makefile.common"
 
@@ -23,6 +23,7 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
 		vigra-config:graphics/vigra \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
+		${LOCALBASE}/include/libcuckoo/cuckoohash_map.hh:devel/libcuckoo \
 		bash:shells/bash \
 		gsed:textproc/gsed \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
@@ -98,7 +99,6 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 DISTFILES+=	f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf:ext
 DISTFILES+=	dtoa-20180411.tgz:src
 DISTFILES+=	skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz:src
-DISTFILES+=	libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz:src
 
 NOT_FOR_ARCHS=		armv6 armv7
 NOT_FOR_ARCHS_REASON=	Unsupported host_cpu
@@ -265,7 +265,6 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-parallelism=${MAKE_JOBS_NUMBER} \
 		--with-system-abseil \
 		--with-system-cppunit \
-		--with-system-cuckoo=no \
 		--with-system-curl \
 		--with-system-dicts \
 		--with-system-gpgmepp \
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index 41caeab69706..d7755054f16d 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -11,8 +11,6 @@ SHA256 (libreoffice/pdfium-4699.tar.bz2) = ee80fe0a3b20ef5c5babc494cd655d1b1a0bd
 SIZE (libreoffice/pdfium-4699.tar.bz2) = 8780890
 SHA256 (libreoffice/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz) = 97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177
 SIZE (libreoffice/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz) = 11826600
-SHA256 (libreoffice/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz) = 471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e
-SIZE (libreoffice/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz) = 5005888
 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
 SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b