New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
app-office/libreoffice: allow building without LDAP support in Base #9351
Conversation
Pull Request assignment Areas affected: ebuilds app-office/libreoffice: @gentoo/office No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and ping us to reset the assignment. If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers. In order to force reassignment and/or bug reference scan, please append |
@@ -316,6 +317,9 @@ src_unpack() { | |||
src_prepare() { | |||
default | |||
|
|||
# Disable the LDAP backend extension used in Base | |||
! use ldap && epatch "${FILESDIR}/${PN}-6.0.5.2-no-openldap.patch" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is an EAPI 6 ebuild, why are you using epatch
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It now uses eapply
.
e6b7b95
to
165ce70
Compare
|
As difficult as it may be or how long it will take, I will try and get a proper patch to
9999 can't use this patch in its current state. |
Has been submitted to upstream. Change 61220 |
Thanks for submitting this for upstream patch review. It is not yet through, so let's wait until it has hit git master. Your PR needs rebasing by now. |
e13dd58
to
187d27e
Compare
@SoapGentoo This now has the proper configuration patch and uses The Linux build on LibreOffice's build server completed successfully. |
Pull request CI reportReport generated at: 2018-10-01 22:35 UTC No issues found |
My change was accepted upstream. Please add the ldap USE flag in the future (should be around the release of 6.3). |
Backported patch to 6.2 branch. Upstream commit 6776c53b7ce2e431d8636f4e5a755f50f787ec8f See also: https://archives.gentoo.org/gentoo-user/message/0feb6472b10bf112db4b4920ce334a37 See also: gentoo/gentoo#9351 Thanks-to: Andrew Udvare <audvare@gmail.com> Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Thanks for your work! This will be available in >=libreoffice-6.2.1.1. |
We had a discussion on the mailing list after someone found that the only package pulling in OpenLDAP is LibreOffice for their setup. They don't have anything that uses LDAP. Most systems have
USE="-ldap"
(implicitly) and I would imagine most desktop users have nothing to use LDAP with.LibreOffice has a backend plugin used in Base that allows connecting to an address book using LDAP. This creates one library that needs openldap to work, and it is loaded dynamically at runtime. It is not necessary for this plugin to exist and Base will simply not list LDAP as an option if this is removed at build time. Unfortunately LibreOffice does not have any way to remove the LDAP extension (ldapbe2) built-in.
This ebuild uses a patch to disable building of the LDAP extension at build time, and adds a USE flag
ldap
. For most users this will allow net-nds/openldap to be depcleaned.Version 6.1.9999 and 9999 are not supported at this time.
Mailing list thread