| 1 |
commit: 69fc15afc8b81272abfe7a4035c8a6c2d37b8d13 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 15 21:14:29 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 15 21:14:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fc15af |
| 7 |
|
| 8 |
app-office/libreoffice: fix build w/ gpgme 1.18.0, add which BDEPEND |
| 9 |
|
| 10 |
- Fix build w/ gpgme 1.18.0 by spoofing existence of progress_callback |
| 11 |
(see bug for details; reported upstream but waiting for email to appear |
| 12 |
in archive/pending moderation) |
| 13 |
|
| 14 |
- Add which BDEPEND (bunch of configure checks use it for now) |
| 15 |
|
| 16 |
Closes: https://bugs.gentoo.org/865321 |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild | 4 ++++ |
| 20 |
app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild | 4 ++++ |
| 21 |
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 4 ++++ |
| 22 |
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 4 ++++ |
| 23 |
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++++ |
| 24 |
5 files changed, 20 insertions(+) |
| 25 |
|
| 26 |
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild |
| 27 |
index 4c7509c6d65a..3561c754cf20 100644 |
| 28 |
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild |
| 29 |
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild |
| 30 |
@@ -265,6 +265,7 @@ RDEPEND="${COMMON_DEPEND} |
| 31 |
" |
| 32 |
BDEPEND=" |
| 33 |
dev-util/intltool |
| 34 |
+ sys-apps/which |
| 35 |
sys-devel/bison |
| 36 |
sys-devel/flex |
| 37 |
sys-devel/gettext |
| 38 |
@@ -583,6 +584,9 @@ src_configure() { |
| 39 |
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) |
| 40 |
fi |
| 41 |
|
| 42 |
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321 |
| 43 |
+ export ac_cv_lib_gpgmepp_progress_callback=yes |
| 44 |
+ |
| 45 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 46 |
|
| 47 |
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
| 48 |
|
| 49 |
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild |
| 50 |
index 1037e8f13e5e..d04598d4c791 100644 |
| 51 |
--- a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild |
| 52 |
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild |
| 53 |
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND} |
| 54 |
" |
| 55 |
BDEPEND=" |
| 56 |
dev-util/intltool |
| 57 |
+ sys-apps/which |
| 58 |
sys-devel/bison |
| 59 |
sys-devel/flex |
| 60 |
sys-devel/gettext |
| 61 |
@@ -570,6 +571,9 @@ src_configure() { |
| 62 |
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) |
| 63 |
fi |
| 64 |
|
| 65 |
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321 |
| 66 |
+ export ac_cv_lib_gpgmepp_progress_callback=yes |
| 67 |
+ |
| 68 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 69 |
|
| 70 |
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
| 71 |
|
| 72 |
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 73 |
index c5e49cdb159d..dd4c5cd297b3 100644 |
| 74 |
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 75 |
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 76 |
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND} |
| 77 |
" |
| 78 |
BDEPEND=" |
| 79 |
dev-util/intltool |
| 80 |
+ sys-apps/which |
| 81 |
sys-devel/bison |
| 82 |
sys-devel/flex |
| 83 |
sys-devel/gettext |
| 84 |
@@ -564,6 +565,9 @@ src_configure() { |
| 85 |
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) |
| 86 |
fi |
| 87 |
|
| 88 |
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321 |
| 89 |
+ export ac_cv_lib_gpgmepp_progress_callback=yes |
| 90 |
+ |
| 91 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 92 |
|
| 93 |
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
| 94 |
|
| 95 |
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 96 |
index c5e49cdb159d..dd4c5cd297b3 100644 |
| 97 |
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 98 |
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 99 |
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND} |
| 100 |
" |
| 101 |
BDEPEND=" |
| 102 |
dev-util/intltool |
| 103 |
+ sys-apps/which |
| 104 |
sys-devel/bison |
| 105 |
sys-devel/flex |
| 106 |
sys-devel/gettext |
| 107 |
@@ -564,6 +565,9 @@ src_configure() { |
| 108 |
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) |
| 109 |
fi |
| 110 |
|
| 111 |
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321 |
| 112 |
+ export ac_cv_lib_gpgmepp_progress_callback=yes |
| 113 |
+ |
| 114 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 115 |
|
| 116 |
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
| 117 |
|
| 118 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 119 |
index ce4f8df2f92a..6c215e444452 100644 |
| 120 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 121 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 122 |
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND} |
| 123 |
" |
| 124 |
BDEPEND=" |
| 125 |
dev-util/intltool |
| 126 |
+ sys-apps/which |
| 127 |
sys-devel/bison |
| 128 |
sys-devel/flex |
| 129 |
sys-devel/gettext |
| 130 |
@@ -564,6 +565,9 @@ src_configure() { |
| 131 |
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) |
| 132 |
fi |
| 133 |
|
| 134 |
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321 |
| 135 |
+ export ac_cv_lib_gpgmepp_progress_callback=yes |
| 136 |
+ |
| 137 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 138 |
|
| 139 |
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
Archives