commit: 69fc15afc8b81272abfe7a4035c8a6c2d37b8d13 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Aug 15 21:14:29 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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)" \
