From nobody Wed Mar 23 12:49:14 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 964EB1A3D496; Wed, 23 Mar 2022 12:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KNp8B3rtVz3qWd; Wed, 23 Mar 2022 12:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648039754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sISowmJuzxwhTLJKEHDKjNIZsJ3E12HmCLIyCA8GFYo=; b=KKAuf0KGiUjHPRsSZDkHPA+7/D1Up6fDgdTdpuI0S7799xvD05XdIgJSbK0nlH4EkuDN/a wXDyftVrva6IVeYi5+95GthoZ0ApGkG6K0Pi7aQznlzb+69QZTbYa64k+lF8IPy0heg2Nd P3HYSutwCKWVORd48CYokWFu+ecPhk3iqXRGWe5sN1Hgr6H5IWUbRfH9k3c8BEQawRStNl 0fmH46ka5Wv25gfS4ui/skjymm/hIbtv9vsyzryr40/b9ylcNvNavOin8cD9Aghmg76Emq AGobhESYthC4zWS+QVH5ebhTRwqOQluRIC2P4V6aFraXeeb/Runf+ueHvO7cPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A03423D86; Wed, 23 Mar 2022 12:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22NCnEU0039530; Wed, 23 Mar 2022 12:49:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NCnEfK039529; Wed, 23 Mar 2022 12:49:14 GMT (envelope-from git) Date: Wed, 23 Mar 2022 12:49:14 GMT Message-Id: <202203231249.22NCnEfK039529@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: b1e55004dacc - main - editors/libreoffice: Use libcuckoo from ports. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1e55004dacc16b96f6b2a3e84c6892e53c42f64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648039754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sISowmJuzxwhTLJKEHDKjNIZsJ3E12HmCLIyCA8GFYo=; b=CUAZ2Va9nlD4AidS1lD+UNjizLER4ODbAlB4g6UD4Zu9Ak3wFX4/BHpb9up1u6h8sHd52k R1rJ1zXz4Z8VkQk8beyElrhhbB7go4rhqoezxAJlAaF54TWmgw7EG6l9GtnV0dd1hqD4qO ki+llYt1yyAaalZUOQqS1mL0M/2rKpcKEZICL8ZIcOeOzZo6ZS6473SiZxm0didKV4rGv8 OS2t0y2WZsu0j9FJ2bNt4959BiNiMDBGD25Pw5EqIVztpCR+X9Eah5Cly4UIRqq5k5cs9l m5UAWn/Th0BHP+MkW3+csBW2N5iRJYfHkOXLcniapkSuRc3joVxIdNzRdqJqJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648039754; a=rsa-sha256; cv=none; b=VoQwN8C7wb6Jb/z4Qj1bue5Rw0oChhL3BplFIrSAs1x2CZoqibBIGcKJml5Dj/jNVjmVjU 2LypF+uLveLfXEE8GzHTkRk6nY94fLDvv/aLZnjhr1AM/JR0LDPg0gRvH6S3VVvMufNE5s VSEDDaa2CzFei7EMLfXAqTgnChMSGrAVbxZdxdBkET4yG299q9cLC1TyU1QE+BDrMoTaQu SWABUp75ALqKgstQBUZRiJACLhHC3lnuWigEL4yBzn1Mn0GRlZLZTRrlX5kjhVSgfRfS9z RG8hulsujmabQ2zqKz6FOYurKAZrP23fLMqXN34TOtWrqz63UNykT0bVybxSKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1e55004dacc16b96f6b2a3e84c6892e53c42f64 commit b1e55004dacc16b96f6b2a3e84c6892e53c42f64 Author: Gleb Popov AuthorDate: 2022-03-22 19:42:12 +0000 Commit: Gleb Popov 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