Details
- Reviewers
ketronix_dev - Group Reviewers
Triage Team - Maniphest Tasks
- T10414: Update 0ad and 0ad-data to 0.0.26
- Commits
- R326:7242b2cd6969: Update to 0.0.26
Tested on my system.
Diff Detail
- Repository
- R326 0ad
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
Congrats on your first patch.
I edited the summary to link the other diferential. This is needed to build the packages in correct order. If we don't follow this rule, then the build will fail in build server, or they are not linked to correct dependencies. It is not always true, but linkin diffs together will help the Global Maintainer to land them in build server together.
Also I added the task with your update request T10414, this will automatically close it as Resolved.
Normally these are done by the one who submitts the diffs.
There are two other things needed to improve this diff.
- You need to add a changelog, for example like this.
**Changelog:** - changes 1 - fix 2 - etc.
If the changelog is too long, then you can simply add the link. For example
Full changelog [here](the-upstream-link-with-the-changelog)
- A more specific testing plan.
To undertand what I am saying you can check git log in the package dir to see how the previous diffs were submitted.
Marking this diff as "Request Changes" because the build fails on my PC with this error:
../../../source/ps/GameSetup/HWDetect.cpp:47:10: fatal error: ft2build.h: No such file or directory
47 | #include <ft2build.h>
| ^~~~~~~~~~~~
compilation terminated.Also please check if you are using Unstable repository. To submit package updates you have to use Unstable repo.
Yeah, seems like they've enabled freetype support and it now needs pkgconfig(freetype2) as a build dependency to compile (see the "Engine Improvements" section in their release notes)
Yes @Staudey, by adding pkgconfig(freetype2) the build succeeds.
@ketronix_dev I see that there are changes in abi files, so you need to include in this diff abi_used_libs and abi_used_symbols.
$ git status On branch arcpatch-D13639 Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: abi_used_libs modified: abi_used_symbols modified: package.yml modified: pspec_x86_64.xml Untracked files: (use "git add <file>..." to include in what will be committed) 0ad-0.0.26a-41-1-x86_64.eopkg no changes added to commit (use "git add" and/or "git commit -a")
But using ypkg ./package.yml, my build succeeded....
Please check what repo are you using. And to build the package just run make in package dir.
But using ypkg ./package.yml, my build succeeded....
That's the issue then. We use solbuild and the Makefile commands to build packages, and don't call ypkg directly. I'd suggest looking at the Building a Package documentation again to set this up in the right way. The correct way to start the package build is with make
So you probably have freetype2-devel installed on your system locally, which is why ypkg picked it up. But as it's not part of the supplied build dependencies, it fails with solbuild (and would therefore also fail on the build server).
I also have some other comments below.
| package.yml | ||
|---|---|---|
| 3 | This seems to not be based on the latest commit. Current release number in the repository is 41, with this commit: https://dev.getsol.us/R326:664a47114c2b1832344b1f8ca12f754419b9c3ba Your diff seems to be based on the commit before that. Make sure to run "make pull" before starting to work on a patch, to base your work on the newest version. | |
| 40 | Why did you disable this patch? Seems to me like it's still necessary. | |
I did the test, and the old patch is still neccessary:
From 7456068f052579fc9c278646ebd6dc3156bb65d1 Mon Sep 17 00:00:00 2001 From: Pierre-Yves <pyu@riseup.net> Date: Thu, 27 Jul 2017 14:35:00 +0200 Subject: [PATCH] Add startup class to desktop file so we can provide an accurate title and icon in icon tasklists or docks. Signed-off-by: Pierre-Yves <pyu@riseup.net> --- build/resources/0ad.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/build/resources/0ad.desktop b/build/resources/0ad.desktop index c17d793..9a6b413 100644 --- a/build/resources/0ad.desktop +++ b/build/resources/0ad.desktop @@ -7,6 +7,7 @@ Terminal=false MimeType=application/x-pyromod+zip; Type=Application Categories=Game;StrategyGame; +StartupWMClass=pyrogenesis # Use the most powerful GPU available by default (i.e. a dedicated Nvidia or AMD card instead of the integrated Intel card) PrefersNonDefaultGPU=true Comment=A real-time strategy game of ancient warfare -- 2.35.5
I rebased it, so you can use it now.
Also check our comments in the diff D13715. Don't submit another diff for your changes.