From nobody Sun Mar 06 16:42:12 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 0324119F69E3; Sun, 6 Mar 2022 16:42:13 +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 4KBS6r6Fvgz4Xl5; Sun, 6 Mar 2022 16:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646584932; 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=Zsnt8wKavY9dXO+ErKoXM8IjtWJErhm/tnHFR6gMpfw=; b=DLJSw0WrEyMe4ZdtwECnLJiTC8e3SuiYfKPtIqGW649wiW3qyHiasaiKBp5u5izb7eZjBW WZtRJzOPR0hUXDVB08loRU9JYlWpeqCcPonwrAlc359wdyaTcvPkdSDoNO4ByRDIP//Aa9 uB5SmoWREz4LPgEToO46E0J5jsnou4Ef3aYaieVrEGwiJvYbWXXigD83/JmOiLEnDDmRjz vUBG9YtVFj6I7vANl3GYWQbwXlj5WTrPy7rdsGX5m6sXcu3fh/lCh4HBYuf2GAU+cQH1RV yneUXRfqls8zuyyxOnamHcQZih7OEWiP2RMbR0jDfhxOpj/k+EMvBkiydtKkUA== 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 B65FA17E59; Sun, 6 Mar 2022 16:42:12 +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 226GgCE4092402; Sun, 6 Mar 2022 16:42:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 226GgCna092401; Sun, 6 Mar 2022 16:42:12 GMT (envelope-from git) Date: Sun, 6 Mar 2022 16:42:12 GMT Message-Id: <202203061642.226GgCna092401@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: c8b6581835f1 - main - editors/libreoffice: force PDFium to link with OpenJPEG (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8b6581835f18a1dae05a4dd9a8b5829fe99b5d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646584932; 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=Zsnt8wKavY9dXO+ErKoXM8IjtWJErhm/tnHFR6gMpfw=; b=TNRmKG40JEsjx/HBIJv8mlct/oxj+GI+v2PDUGnoEYqPVpta+sqzLkmIJAelwrtuaPJz/g suYZnK2cyS9R6fGehzDXUemjaunQbjcghqztjhndayT8uMqiUTvL5ofjVU5rpt4ZXp0AVg IGwHxwWpA6U5ac2zlQCke5PPPr09YVs90djCvJSO7Wmr7269YuL3urE2mhEUrknj58t/Lp j6NvfvaFcmhzH7iLDrgTf1c6oMcZnGyCTHgynIQt7j9mcgAvGS0JP8FKtWvvqg9LQ0qCr+ FW6gVMXaRusxhLAsNxoc9CxJqf6v8DHUtnQ0sfeQ4HGNmOlPR7H1vGVyIpp6yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646584932; a=rsa-sha256; cv=none; b=j5KNHYng/RDBLWGs3bBNyP2mElmj9nMzE61vXC3Ptl8owWGwqvsdHrqRU2fPfj2jO+DYP/ iuIDej7cUPf39Nr36oXTHjTEnnhgzd829OU6xcWaPoJKTZiEnVa7cLX6Tza/bSHQECvhQ3 p/eE/MTuDMCcmkF9aeSvqgDHr6yzVdHOTNz+hYTHrTpn0iTnjSE+i3Fx2+vPLoL2BDwaoI rsvjUnMlUJH+N/EyLWDWTG+VqAo4QNpwmQf3RG9QGZSmUbY5yj3Ns1VrqhgIdyEF1EU/9/ oQX4AdBZfn7BAwqC+gPqruxiYqF2PvUy/abn7w5xQUUTqvqLF+4NC+rh1it2rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8b6581835f18a1dae05a4dd9a8b5829fe99b5d7 commit c8b6581835f18a1dae05a4dd9a8b5829fe99b5d7 Author: Dima Panov AuthorDate: 2022-03-06 16:37:48 +0000 Commit: Dima Panov CommitDate: 2022-03-06 16:37:48 +0000 editors/libreoffice: force PDFium to link with OpenJPEG (+) When libvcllo.so is linked together with libpdfiumlo.so, it also needs libopenjp2.so from graphics/openjpeg, since pdfium depends on that. Building with LTO exposes this as an error, complaining about undefined references to openjpeg library functions. While here, add py310 to allowed versions to the build PR: 262008 Submitted by: Florian Walpen Sponsored by: Netzkommune GmbH --- editors/libreoffice/Makefile | 4 ++-- editors/libreoffice/files/patch-RepositoryExternal.mk | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 7371d11ef669..d78b4085a616 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 .include "${.CURDIR}/Makefile.common" @@ -116,7 +116,7 @@ SHEBANG_GLOB= *.py GNU_CONFIGURE= yes USES= autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \ gettext gl gmake gnome jpeg localbase:ldflags perl5 pkgconfig \ - python:3.8-3.9 shebangfix shared-mime-info ssl tar:xz xorg + python:3.8-3.10 shebangfix shared-mime-info ssl tar:xz xorg USE_GL= gl glew glu USE_GNOME= cairo glib20 libxml2 libxslt USE_OPENLDAP= yes diff --git a/editors/libreoffice/files/patch-RepositoryExternal.mk b/editors/libreoffice/files/patch-RepositoryExternal.mk new file mode 100644 index 000000000000..40589b578ab4 --- /dev/null +++ b/editors/libreoffice/files/patch-RepositoryExternal.mk @@ -0,0 +1,10 @@ +--- RepositoryExternal.mk.orig 2022-02-28 18:19:33 UTC ++++ RepositoryExternal.mk +@@ -4203,6 +4203,7 @@ $(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + ) + $(call gb_LinkTarget_use_libraries,$(1),pdfium) ++$(call gb_LinkTarget_add_libs,$(1),$(OPENJPEG2_LIBS)) + endef + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ + pdfium \