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.

Sign up for GitHub

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

Jump to bottom

x11-themes/vanilla-dmz-xcursors, x11-themes/vanilla-dmz-aa-xcursors: version bump to 0.4.5 #7456

Closed
wants to merge 2 commits into from
Closed

x11-themes/vanilla-dmz-xcursors, x11-themes/vanilla-dmz-aa-xcursors: version bump to 0.4.5 #7456

wants to merge 2 commits into from

Conversation

realnc
Copy link
Contributor

@realnc realnc commented Mar 14, 2018

The two mouse cursor themes x11-themes/vanilla-dmz-xcursors and x11-themes/vanilla-dmz-aa-xcursors have accumulated some bit rot. Debian provides updated versions.

The updated ebuilds install the themes in the correct locations, including index.theme files. The 0.4 ebuilds currently in portage have stopped working correctly on modern desktops for a quite a while now, probably due to outdated install locations.

This brings these packages up to date with how other distros package them (like Debian and Arch.)

The cursors are compiled with xcursorgen (and it's now in DEPEND.)

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

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: x11-themes/vanilla-dmz-aa-xcursors, x11-themes/vanilla-dmz-xcursors

x11-themes/vanilla-dmz-aa-xcursors: @gentoo/proxy-maint (maintainer needed)
x11-themes/vanilla-dmz-xcursors: @gentoo/proxy-maint (maintainer needed)

Bugs linked: 554920

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

@gentoo-repo-qa-bot gentoo-repo-qa-bot added maintainer-needed There is at least one affected package with no maintainer. Review it if you can. assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Mar 14, 2018
mgorny
mgorny requested changes Mar 14, 2018
View reviewed changes
Copy link
Member

@mgorny mgorny left a comment

Choose a reason for hiding this comment

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

Same comments apply to the second package.

x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild Outdated

EAPI=6

MY_PN="Vanilla-DMZ"
Copy link
Member

Choose a reason for hiding this comment

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

This is not used anywhere.

x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild Outdated
S="${WORKDIR}/dmz-cursor-theme-${PV}"

src_compile() {
cd "${S}/DMZ-White/pngs" && ./make.sh
Copy link
Member

Choose a reason for hiding this comment

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

Please split this to one command per line, and || die for both.

x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild Outdated
insinto /usr/share/icons/Vanilla-DMZ/cursors
doins "${S}/DMZ-White/xcursors/"* || die "doins failed"
insinto /usr/share/icons/Vanilla-DMZ
doins "${S}/DMZ-White/index.theme" || die "doins failed"
Copy link
Member

Choose a reason for hiding this comment

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

How about replacing both doins with a single:

doins -r DMZ-White/{xcursors,index.theme}

Also note that ${S} is the current directory at this point.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean:

insinto /usr/share/icons/Vanilla-DMZ
doins -r DMZ-White/{xcursors,index.theme} || die "doins failed"

This would install into /usr/share/icons/Vanilla-DMZ/xcursors, but we actually want to install into /usr/share/icons/Vanilla-DMZ/cursors.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, sorry, I didn't notice the little x there.

x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild Outdated
elog "You can change the size by adding a line like:"
elog "Xcursor.size: 48"
elog
elog "Also, to globally use this set of mouse cursors edit the file:"
Copy link
Member

Choose a reason for hiding this comment

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

Files in /usr/share must not be modified by users. That is purely package manager domain.

x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild Outdated
}

pkg_postinst() {
elog "To use this set of cursors, edit or create the file ~/.Xdefaults"
Copy link
Member

Choose a reason for hiding this comment

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

Can't this cursor theme be selected via normal DE settings?

Copy link
Contributor Author

@realnc realnc Mar 14, 2018 •
edited

Choose a reason for hiding this comment

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

Can't this cursor theme be selected via normal DE settings?

This stuff is in the 0.4 ebuild, which is the only reason I kept it in. I'll remove it.

@realnc
Copy link
Contributor Author

realnc commented Mar 14, 2018

@mgorny
PR updated with requested changes.

mgorny
mgorny reviewed Mar 15, 2018
View reviewed changes
x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild Outdated

src_install() {
insinto /usr/share/icons/Vanilla-DMZ-AA/cursors
doins "${S}/DMZ-Black/xcursors/"* || die "doins failed"
Copy link
Member

Choose a reason for hiding this comment

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

Oh but you could use:

doins -r DMZ-Black/xcursors/.

here, can't you?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. Made the change.

x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild Outdated
insinto /usr/share/icons/Vanilla-DMZ-AA/cursors
doins "${S}/DMZ-Black/xcursors/"* || die "doins failed"
insinto /usr/share/icons/Vanilla-DMZ-AA
doins "${S}/DMZ-Black/index.theme" || die "doins failed"
Copy link
Member

Choose a reason for hiding this comment

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

Also here, please don't use ${S} when it's the current directory. That's making people question their senses ;-).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, sorry. Fixed now, and I dropped the die.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2018-03-16 00:40 UTC
Newest commit scanned: 931416f
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/44a28ccc5/output.html#net-fs/samba

mgorny
mgorny approved these changes Mar 16, 2018
View reviewed changes
Copy link
Member

@mgorny mgorny left a comment

Choose a reason for hiding this comment

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

Thanks. Looks good and seems to work. Will merge.

@realnc realnc deleted the vanilla-dmz-0.4.5 branch March 17, 2018 03:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgorny mgorny mgorny approved these changes

Assignees
No one assigned
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. maintainer-needed There is at least one affected package with no maintainer. Review it if you can.
Projects
None yet
Milestone
No milestone
3 participants
@realnc @gentoo-repo-qa-bot @mgorny