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

Keyword mupdf and dep for ~arm64 #3638

Closed
wants to merge 3 commits into from

Conversation

NeddySeagoon
Copy link
Contributor

Works on Raspberry Pi 3 in 64 bit mode.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
…x-a53

Package-Manager: Portage-2.3.3, Repoman-2.3.1
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: app-text/mupdf, media-libs/glfw

app-text/mupdf: @xmw
media-libs/glfw: @gentoo/games

@gentoo-repo-qa-bot gentoo-repo-qa-bot added the assigned PR successfully assigned to the package maintainer(s). label Jan 24, 2017
@chewi
Copy link
Member

chewi commented Jan 24, 2017

Are these related? If not, you should submit them separately, otherwise each maintainer can't deal with their own package without it looking weird in the commit history.

@NeddySeagoon
Copy link
Contributor Author

Yes. mupdf depends on media-libs/glfw.
From equery d media-libs/glfw
mupdf is the only user.

@chewi
Copy link
Member

chewi commented Jan 24, 2017

Fair enough. I checked glfw and repoman complains about the Wayland stuff. I guess this could be ignored as it is an experimental profile.

@NeddySeagoon
Copy link
Contributor Author

Probably. The only changes I made were to the KEYWORDS and copyright date.
What's the conflict?

@chewi
Copy link
Member

chewi commented Jan 24, 2017

dev-libs/wayland and dev-libs/wayland-protocols (behind the wayland USE flag) are not keyworded for arm64.

@NeddySeagoon
Copy link
Contributor Author

Wayland on a Raspberry Pi sounds a bit adventurous. Its tested on Xfce4.
Please suggest a way forward. I can build test the libs but not runtime test. I don't think that's good enough for a ~arm64 keyword.

@chewi
Copy link
Member

chewi commented Jan 25, 2017

The wayland flag could be masked on arm64 pending further testing but I don't mind that much since it's an experimental profile. Just thought I should mention it.

@NeddySeagoon
Copy link
Contributor Author

Others may be playing with wayland on arm64. I have no way to tell. It might take them by surprise. Yes its a bit piecemeal but its experimental. leio ran a PR to show all tud ~arm64 arm64 inconsistencies like this. There were 310. This fixes some and creates a few more.

@chewi
Copy link
Member

chewi commented Jan 25, 2017

I'll hand over to @xmw to okay this change. I can merge it if he wants. You'll need to rebase though as there's a conflict now.

@NeddySeagoon
Copy link
Contributor Author

WFM.

@gentoo-repo-qa-bot
Copy link
Collaborator

😞 The QA check for this pull request has found the following issues:

New issues caused by PR:
https://qa-reports.gentoo.org/output/gentoo-ci/57f899902/output.html#app-text/llpp

@NeddySeagoon
Copy link
Contributor Author

How does adding an ~arm64 keyword cause ppc issues?

@chewi
Copy link
Member

chewi commented Jan 28, 2017

You didn't resolve the conflict properly and made ppc/ppc64 unstable rather than stable. You need to rebase in any case as we don't want conflict resolutions in the commit history. Try to follow the steps I told you the other day.

gentoo-bot pushed a commit that referenced this pull request Jan 29, 2017
Package-Manager: Portage-2.3.3, Repoman-2.3.1
gentoo-bot pushed a commit that referenced this pull request Jan 29, 2017
Package-Manager: Portage-2.3.3, Repoman-2.3.1
@xmw
Copy link
Contributor

xmw commented Jan 29, 2017

commit 9a6260e
Author: Michael Weber xmw@gentoo.org
Date: Sun Jan 29 23:33:58 2017 +0100

app-text/mupdf: Add ~arm64 keyword (https://github.com/gentoo/gentoo/pull/3638).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

commit 3ae2c5a
Author: Michael Weber xmw@gentoo.org
Date: Sun Jan 29 23:32:05 2017 +0100

media-libs/glfw: Add ~arm64 keyword (https://github.com/gentoo/gentoo/pull/3638).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

@xmw xmw closed this Jan 29, 2017
@chewi
Copy link
Member

chewi commented Jan 29, 2017

As demonstrated, it's easy enough to make keyword changes ourselves. Just trying to get you more familiar with git!

@NeddySeagoon
Copy link
Contributor Author

chewi,

I don't understand how I screwed up the ppc keyword. I'll need to learn how to get the history out of git.

xmw,

Thank you for fixing my mess.

@chewi
Copy link
Member

chewi commented Jan 30, 2017

It's hard to say exactly what you did but even though you only wanted to add ~arm64, it looks like in attempting to resolve the conflict, you made it say:

KEYWORDS="~arm64 ~ppc ~ppc64"

Rather than:

KEYWORDS="~arm64 ppc ppc64"

You can see this if you click the Files changed tab at the top.

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).
Projects
None yet
4 participants