Bug 269122
| Summary: | games/jaggedalliance2: update to 0.20.0 | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Pavel Timofeev <timp87> | ||||||||
| Component: | Individual Port(s) | Assignee: | Dmitry Marakasov <amdmi3> | ||||||||
| Status: | Closed FIXED | ||||||||||
| Severity: | Affects Only Me | CC: | eduardo, yuri | ||||||||
| Priority: | --- | Flags: | yuri:
maintainer-feedback+
|
||||||||
| Version: | Latest | ||||||||||
| Hardware: | Any | ||||||||||
| OS: | Any | ||||||||||
| URL: | https://ja2-stracciatella.github.io/2022/11/14/release-0.20.0.html | ||||||||||
| Attachments: |
|
||||||||||
|
Description
Pavel Timofeev
2023-01-23 21:54:06 UTC
Setting maintainer-feedback to yuri so he can take a look at (possible) revert. The patch is outdated (3 PORTREVISION bumps missed), but builds fine.
There are Q/A problems:
====> Running Q/A tests (stage-qa)
Error: /usr/local/bin/ja2 is linked to /usr/local/lib/liblua-5.4.so from lang/lua54 but it is not declared as a dependency
Warning: you need USES+=lua
Should be fixed like this:
--- dependencies/lib-lua/CMakeLists.txt.orig 2022-11-11 20:19:16 UTC
+++ dependencies/lib-lua/CMakeLists.txt
@@ -3,7 +3,7 @@
option(LOCAL_LUA_LIB "Download and build Lua instead of searching the system" ON)
if (NOT LOCAL_LUA_LIB)
message(STATUS "Using system Lua")
- find_package(Lua "5.3" REQUIRED)
+ find_package(Lua "5.3" REQUIRED EXACT)
if (NOT LUA_FOUND)
message(FATAL_ERROR "Lua 5.3 not found")
endif()
Created attachment 239704 [details]
port patch2
- Fix lua dependency
- pet portlint
Remaining Q/A problems: ====> Running Q/A tests (stage-qa) Warning: you may not need USES=desktop-file-utils Warning: Possible REINPLACE_CMD issues: - - REINPLACE_CMD ran, but did not modify file contents: rust/stracciatella/src/stracciatella.rs (In reply to Dmitry Marakasov from comment #4) I added USES=desktop-file-utils because portlint told me to do that. Reinplace_cmd is fine, it's intended. (In reply to Pavel Timofeev from comment #5) > I added USES=desktop-file-utils because portlint told me to do that. Portlint is garbage. desktop-file-utils is needed when a ports install .desktop files which define MIME type handlers, which is not the case for this port. > Reinplace_cmd is fine, it's intended. Since it does nothing, it's definitely not what you've intended. The `/some/place/where/the/data/is` string is (now?) located in different files. (In reply to Dmitry Marakasov from comment #6) > Portlint is garbage. desktop-file-utils is needed when a ports install .desktop files which define MIME type handlers, which is not the case for this port. So this file is not suitable? https://cgit.freebsd.org/ports/tree/games/jaggedalliance2/pkg-plist#n5 > Since it does nothing, it's definitely not what you've intended. The `/some/place/where/the/data/is` string is (now?) located in different files. You're right. I'll take a look again. (In reply to Dmitry Marakasov from comment #6) Hello Dmitry, share/applications/ja2-stracciatella.desktop from 0.19.1 version: --- [Desktop Entry] Name=Jagged Alliance 2 - Stracciatella GenericName=Strategy/RP Game Comment=An enhanced port of Jagged Alliance 2 to SDL Exec=ja2-launcher TryExec=ja2-launcher Icon=ja2-stracciatella Terminal=false Type=Application Categories=Game;StrategyGame;RolePlaying; Version=1.0 --- Are you saying that desktop-file-utils not needed in this case. Where can I find a suitable case for USES=desktop-file-utils? Thanks (In reply to Nuno Teixeira from comment #8) (...) Nevermind, I missed this. Need to start checking .desktop files that really need desktop-file-utils: --- 6.9.5.2. Updating Desktop Database If a port has a MimeType entry in its portname.desktop, the desktop database must be updated after install and deinstall. To do this, define USES= desktop-file-utils. --- (In reply to Nuno Teixeira from comment #8) (...) Nevermind, I missed this. Need to start checking .desktop files that really need desktop-file-utils: --- 6.9.5.2. Updating Desktop Database If a port has a MimeType entry in its portname.desktop, the desktop database must be updated after install and deinstall. To do this, define USES= desktop-file-utils. --- > Nevermind, I missed this. Need to start checking .desktop files that really need desktop-file-utils
Yes. The example desktop files would be
grep -R ^MimeType= /usr/local/share/applications
and the resulting file generated by update-desktop-database is
/usr/local/share/applications/mimeinfo.cache
Created attachment 239755 [details]
port patch3
please have a look
Looks good. We'll probably have to wait now for yuri@'s approval or timeout to update miniaudio. Approved. Please revert the miniaudio commit or otherwise update it. Thanks, Yuri A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e2df1c4b20778bc83a6c5405736f02a3ea75f56 commit 0e2df1c4b20778bc83a6c5405736f02a3ea75f56 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2023-02-09 20:39:23 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2023-02-15 16:33:34 +0000 audio/miniaudio: update 0.10.43 → 0.11.9 PR: 269122 Approved by: yuri (maintainer) audio/miniaudio/Makefile | 6 ++---- audio/miniaudio/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4e3544e2ee2789b264d8c315cc6790387b287c0 commit f4e3544e2ee2789b264d8c315cc6790387b287c0 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2023-02-09 20:41:19 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2023-02-15 16:33:34 +0000 games/jaggedalliance2: update 0.19.1 → 0.20.0 PR: 269122 Submitted by: timp87@gmail.com (maintainer) games/jaggedalliance2/Makefile | 50 ++++++++++---- games/jaggedalliance2/distinfo | 76 +++++++++++++++++----- .../files/patch-CMakeLists.txt (gone) | 11 ---- .../patch-dependencies_lib-lua_CMakeLists.txt | 33 +++------- ...ependencies_lib-miniaudio_CMakeLists.txt (gone) | 34 ---------- ...tch-dependencies_lib-sol2_CMakeLists.txt (gone) | 23 ------- .../files/patch-rust_stracciatella_Cargo.toml | 12 ++-- .../patch-rust_stracciatella_src_fs.rs (gone) | 11 ---- .../files/patch-src_sgp_SoundMan.cc (gone) | 11 ---- 9 files changed, 117 insertions(+), 144 deletions(-) |
