Skip to content
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

sci-misc/boinc: Clean up (#640822) and fix xlocale.h bug (#639108) #6643

Closed
wants to merge 3 commits into from

Conversation

Yamakuzure
Copy link
Contributor

This PR includes the following fixes and updates:

  1. Clean up old ebuilds
    As it was discussed in bug 640822, said bug is now closed with cleaning up the old ebuilds.
    The newest no longer depends on gtk2 based wxWidgets, and remains.

Closes: https://bugs.gentoo.org/640822

  1. Remove xlocale.h usage, fixes bug 639108

=sys-libs/glibc-2.26 dropped xlocale.h support.

From https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27

The nonstandard header xlocale.h has been removed in this release. It was
never intended to be included directly by programs other than glibc itself,
and it was a strict subset of the standard header locale.h.

This commit removes the inclusion of xlocale.h, and substitutes it with locale.h where necessary.

Tested-by: Sven Eden yamakuzure@gmx.net
Closes: https://bugs.gentoo.org/639108

  1. Only update the icon cache, if USE="X" is enabled

Package-Manager: Portage-2.3.19, Repoman-2.3.6

@jlec @SoapGentoo Sorry that this took so long. I have massive problems "convincing" my damn broadcom wifi chip to work properly. I hope these commits are alright for you.
I did not revision bump the ebuild, because it bears no change/advantage for users who already had boinc-7.8.4 merged successfully.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: sci-misc/boinc

sci-misc/boinc: @Yamakuzure, @gentoo/sci

Bugs linked: 639108, 640822

@gentoo-repo-qa-bot gentoo-repo-qa-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Dec 26, 2017
@@ -147,7 +147,7 @@ pkg_preinst() {
}

pkg_postinst() {
gnome2_icon_cache_update
use X && gnome2_icon_cache_update
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As already mentioned in #6530, please don't do this conditional to use X. You would have to be sure there are no icons installed then on each bump, etc. Much better to just do what gnome2.eclass does in this case. Put back the savelist in preinst, and then actually use the result in the same way gnome2.eclass does.

@@ -185,5 +185,5 @@ pkg_postinst() {
}

pkg_postrm() {
gnome2_icon_cache_update
use X && gnome2_icon_cache_update
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as in postinst

As it was discussed in bug 640822, said bug is now closed with
cleaning up the old ebuilds.
The newest no longer depends on gtk2 based wxWidgets, and remains.

Closes: https://bugs.gentoo.org/640822
Package-Manager: Portage-2.3.19, Repoman-2.3.6
>=sys-libs/glibc-2.26 dropped xlocale.h support.

From https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
 > The nonstandard header xlocale.h has been removed in this release. It was
 > never intended to be included directly by programs other than glibc itself,
 > and it was a strict subset of the standard header locale.h.

This commit removes the inclusion of xlocale.h, and substitutes it with
locale.h where necessary.

Tested-by: Sven Eden <yamakuzure@gmx.net>
Bug: https://bugs.gentoo.org/639108
Closes: https://bugs.gentoo.org/639108
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
@Yamakuzure
Copy link
Contributor Author

@leio : I am sorry, it seems that I have misunderstood that part of the (fragmented) conversation. I have changed the commit, so that it updates the icon cache like the gnome2.eclass would do it. Hopefully this is correct now. I do not have any experience with the gnome stuff...

@leio
Copy link
Member

leio commented Dec 26, 2017

Well, I changed it from what it was after someones PR got merged (pointless savelist call without using it like you do now), as it's not exactly a terribly expensive call anyhow.

@leio
Copy link
Member

leio commented Dec 27, 2017

Merged, thanks

@leio leio closed this Dec 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
3 participants