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

games-engines/openmw: version 0.47 #22579

Closed
wants to merge 1 commit into from

Conversation

DarthGandalf
Copy link
Contributor

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov alexey+gentoo@asokolov.org

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @DarthGandalf
Areas affected: ebuilds
Packages affected: games-engines/openmw

games-engines/openmw: @DarthGandalf, @gentoo/proxy-maint, @gentoo/games

Linked bugs

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 request reassignment.


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

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-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). labels Oct 14, 2021
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-10-14 20:40 UTC
Newest commit scanned: 6acc598
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/8e0d7f239f/output.html

BDEPEND="
virtual/pkgconfig
doc? (
app-doc/doxygen[doc]
Copy link
Contributor

Choose a reason for hiding this comment

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

Just noticed this (was in 0.46 too), does it really need doxygen's docs to create docs?

Was this meant to be [dot]?

Which it does seem to use:
Running dot for graph 20846/20907

Technically [doc] pulls graphviz as well but not the right way to get it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right

}

src_configure() {
use devtools && ! use qt5 && \
Copy link
Contributor

Choose a reason for hiding this comment

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

fwiw don't need \ after &&, lets you continue on next line either way

Although in bash scripts, to make the condition clearer I sometime do

condition && condition-with-like-really-long-line-oh-god \
	&& next-thing

But that may feel more unnatural in an ebuild

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Comment on lines 93 to 94
-DDESIRED_QT_VERSION=5
-DBULLET_USE_DOUBLES=ON
Copy link
Contributor

Choose a reason for hiding this comment

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

What's up with these two? Regardless of USE=qt5 I always get:

 * One or more CMake variables were not used by the project:
 *   BULLET_USE_DOUBLES
 *   DESIRED_QT_VERSION

Considering bullet_use is a newly added option in the ebuild I would've expected it to do something, not that I looked more closely at this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like openmw removed ability to use single-precision bullet.

For a while the warning about qt was shown depending on the combination of use flags, so I was ignoring it. But now it's not used anymore at all.

Removed both.

Comment on lines 146 to 148
pkg_postrm() {
xdg_icon_cache_update
}
Copy link
Contributor

Choose a reason for hiding this comment

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

migrate to xdg.eclass and remove this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. Some people want me to move from xdg to xdg-utils, then some want me to move from xdg-utils to xdg, then it repeats :(

Copy link
Contributor

@ionenwks ionenwks Oct 16, 2021

Choose a reason for hiding this comment

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

The one case where it make sense to use xdg-utils directly for cache generation is if you want to make the desktop-file-utils and shared-mime-info IDEPEND optional (perhaps it's what happened?), but here it's pulling a lot of gui stuff regardless of USE (about only servers would be missing these IDEPEND) and no real reason to avoid the simplification.

I did hope EAPI-8 would just have dropped these dependencies though, it's kinda designed to work without and cache can be delayed until the dependencies get installed. EAPI-8 did drop exporting src_prepare though (may have run in cases where had to inherit xdg cmake rather than cmake xdg but that's no longer necessary).

Comment on lines 105 to 107
find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
-name '*.md5' -type f -delete || die
HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
Copy link
Contributor

Choose a reason for hiding this comment

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

CMAKE_BUILD_DIR was only valid in cmake-utils, not present in cmake.eclass

Guess this been broken for a while.

find: ‘/docs/Doxygen/html’: No such file or directory

Wonder how I missed that before, pretty sure I'd have tested USE=doc, hrm... maybe got distracted.

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, I tested USE=doc before, but not for a while

directly).\n"

if ! use qt5; then
local DOC_CONTENTS+="\n\n
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't need local twice, it's already declared above.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-10-16 11:10 UTC
Newest commit scanned: 51d2738
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/5c228bd034/output.html

@ionenwks ionenwks added the hacktoberfest-accepted PR accepted for Hacktoberfest label Oct 16, 2021
@DarthGandalf DarthGandalf deleted the openmw branch December 6, 2021 01:35
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). hacktoberfest-accepted PR accepted for Hacktoberfest self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
4 participants