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-simulation/openrct2: version bump & update nightly #8128

Closed
wants to merge 4 commits into from

Conversation

hvraven
Copy link
Contributor

@hvraven hvraven commented Apr 25, 2018

Version bump and an updated nightly package.
Main changes:

  • added missing build dep to unzip
  • restructured unpacking in favour of a default src_install. This simplifies handling in the nightly which requires multiple extra packages.
  • remove -Werror
  • force building of shared libraries. Previously both binaries were statically linked against the same library which was also installed.
  • add missing updates database_updates as suggested by QA warnings

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: games-simulation/openrct2

games-simulation/openrct2: @jansegre, @lorem-ipsum, @gentoo/proxy-maint

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.

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


Gentoo Mirror & CI services are provided by Michał Górny. The hardware was kindly provided by Todd Goodman. This unofficial service is not associated with Gentoo Infrastructure or Gentoo Foundation.

This service is provided by the service provider "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the service provider be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this service, even if advised of the possibility of such damage.

@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). labels Apr 25, 2018
@jansegre
Copy link
Contributor

It works for me, although I get this QA Notice:

 * One or more CMake variables were not used by the project:
 *   DISABLE_RCT2_TESTS
 *   SYSTEM_GTEST

@hvraven
Copy link
Contributor Author

hvraven commented Apr 30, 2018

Yeah, the QA notice is a side effect of the build system. They only add the build options for these if testing is enabled. It would be possible to work around those by adding them only if testing was selected. There is no functional difference. In my opinion it makes the ebuild a bit uglier in favour of no QA warnings. If you like I will change it.

@jansegre
Copy link
Contributor

jansegre commented May 1, 2018

It's OK for me. This can be merged as is.

@@ -1,2 +1,4 @@
DIST openrct2-0.1.1.tar.gz 6284135 BLAKE2B 71ac2671c42fb679f5430ef0d0bd5e05d112aebd20b4b59e05e3527bacf24137b81bcedc72f9cc86cbf0b7612d6dc14c82881a828108aa5b16b8ddeeed78c46e SHA512 fd84907819ac317af88c0446afcb04acdb43cd6671f0837f1294191aacf58e93887d46e6eb28d86f558577f4e7c834bc42a9ec486f67e0b64cb7bc0cc1bda427
Copy link
Member

Choose a reason for hiding this comment

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

Please mention the new version in commit message summary.

S="${WORKDIR}/OpenRCT2-${PV}"
fi

TSV="0.1.2"
Copy link
Member

Choose a reason for hiding this comment

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

Why not use ${PV} here? If somebody else bumps it, he may miss bumping this number when upstream releases new TS. On the other hand, if you put ${PV} here and upstream doesn't release new TS, the ebuild will simply fail and TSV will be updated.

"

src_unpack() {
if [[ ${PV} == 9999 ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

Indent, please.

if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
else
unpack ${P}.tar.gz || die
Copy link
Member

Choose a reason for hiding this comment

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

unpack is a built-in and dies on its own.

unpack ${P}.tar.gz || die
fi

mkdir -p "${S}/data/title"
Copy link
Member

Choose a reason for hiding this comment

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

|| die

ewarn ""
fi
gnome2_icon_cache_update
xdg_desktop_database_update
Copy link
Member

Choose a reason for hiding this comment

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

Missing xdg-utils inherit.

also force the build system to create a shared library used by both
binaries

Package-Manager: Portage-2.3.31, Repoman-2.3.9
Package-Manager: Portage-2.3.31, Repoman-2.3.9
currently some tests fail due to data not beeing found

Package-Manager: Portage-2.3.31, Repoman-2.3.9
openrct2 only requires the speexdsp libraries. Drop the speex dep on
nightly and update 0.1.2 to remove old speex handling.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
@hvraven
Copy link
Contributor Author

hvraven commented May 6, 2018

Thanks for your review. I've integrated the changes and also rebased against current master to integrate the recent speex cleanup.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2018-05-06 13:17 UTC
Newest commit scanned: e381c74
Status: ✅ good

No issues found


Gentoo Mirror & CI services are provided by Michał Górny. The hardware was kindly provided by Todd Goodman. This unofficial service is not associated with Gentoo Infrastructure or Gentoo Foundation.

This service is provided by the service provider "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the service provider be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this service, even if advised of the possibility of such damage.

@mgorny
Copy link
Member

mgorny commented May 9, 2018

Looks good, thanks!

@gentoo-bot gentoo-bot closed this in 1f017f2 May 9, 2018
@hvraven hvraven deleted the openrct2-0.1.2 branch May 14, 2018 14:16
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). 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