From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE298158094 for ; Mon, 15 Aug 2022 21:15:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED6AE2BC09C; Mon, 15 Aug 2022 21:15:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB3082BC09C for ; Mon, 15 Aug 2022 21:15:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6868340D09 for ; Mon, 15 Aug 2022 21:15:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86DCF561 for ; Mon, 15 Aug 2022 21:15:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1660598099.69fc15afc8b81272abfe7a4035c8a6c2d37b8d13.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild app-office/libreoffice/libreoffice-7.3.5.2.ebuild app-office/libreoffice/libreoffice-7.3.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 69fc15afc8b81272abfe7a4035c8a6c2d37b8d13 X-VCS-Branch: master Date: Mon, 15 Aug 2022 21:15:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6d800f9f-d012-4e3e-ab06-d0449afb75fb X-Archives-Hash: 62ca9248843119f5d93a46937321af12 commit: 69fc15afc8b81272abfe7a4035c8a6c2d37b8d13 Author: Sam James gentoo org> AuthorDate: Mon Aug 15 21:14:29 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 15 21:14:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fc15af app-office/libreoffice: fix build w/ gpgme 1.18.0, add which BDEPEND - Fix build w/ gpgme 1.18.0 by spoofing existence of progress_callback (see bug for details; reported upstream but waiting for email to appear in archive/pending moderation) - Add which BDEPEND (bunch of configure checks use it for now) Closes: https://bugs.gentoo.org/865321 Signed-off-by: Sam James gentoo.org> app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild | 4 ++++ app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild | 4 ++++ app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 4 ++++ app-office/libreoffice/libreoffice-7.3.9999.ebuild | 4 ++++ app-office/libreoffice/libreoffice-9999.ebuild | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild index 4c7509c6d65a..3561c754cf20 100644 --- a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild @@ -265,6 +265,7 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND=" dev-util/intltool + sys-apps/which sys-devel/bison sys-devel/flex sys-devel/gettext @@ -583,6 +584,9 @@ src_configure() { myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi + # Workaround to fix build w/ gpgme 1.18.0, bug #865321 + export ac_cv_lib_gpgmepp_progress_callback=yes + is-flagq "-flto*" && myeconfargs+=( --enable-lto ) MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ diff --git a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild index 1037e8f13e5e..d04598d4c791 100644 --- a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild @@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND=" dev-util/intltool + sys-apps/which sys-devel/bison sys-devel/flex sys-devel/gettext @@ -570,6 +571,9 @@ src_configure() { myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi + # Workaround to fix build w/ gpgme 1.18.0, bug #865321 + export ac_cv_lib_gpgmepp_progress_callback=yes + is-flagq "-flto*" && myeconfargs+=( --enable-lto ) MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild index c5e49cdb159d..dd4c5cd297b3 100644 --- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild @@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND=" dev-util/intltool + sys-apps/which sys-devel/bison sys-devel/flex sys-devel/gettext @@ -564,6 +565,9 @@ src_configure() { myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi + # Workaround to fix build w/ gpgme 1.18.0, bug #865321 + export ac_cv_lib_gpgmepp_progress_callback=yes + is-flagq "-flto*" && myeconfargs+=( --enable-lto ) MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild index c5e49cdb159d..dd4c5cd297b3 100644 --- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild @@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND=" dev-util/intltool + sys-apps/which sys-devel/bison sys-devel/flex sys-devel/gettext @@ -564,6 +565,9 @@ src_configure() { myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi + # Workaround to fix build w/ gpgme 1.18.0, bug #865321 + export ac_cv_lib_gpgmepp_progress_callback=yes + is-flagq "-flto*" && myeconfargs+=( --enable-lto ) MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index ce4f8df2f92a..6c215e444452 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND=" dev-util/intltool + sys-apps/which sys-devel/bison sys-devel/flex sys-devel/gettext @@ -564,6 +565,9 @@ src_configure() { myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi + # Workaround to fix build w/ gpgme 1.18.0, bug #865321 + export ac_cv_lib_gpgmepp_progress_callback=yes + is-flagq "-flto*" && myeconfargs+=( --enable-lto ) MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \