Attached is the debdiff for tenacious (26.0.0+repack-1ubuntu1).

Dropping d/p/antlr4.diff and d/p/antlr4-buildfix.patch alone is not enough 
because:
- the +repack orig tarball strips parsers/*/generated/* and d/clean deletes 
them on dh_clean
- upstream's checked-in ANTLR 4.13.2 parsers (ATN format v4, matching runtime 
4.10) use 4.11+ antlr4::internal::{OnceFlag,call_once} and the 
ParserATNSimulatorOptions constructor overload

This debdiff:
- updates d/p/antlr4.diff to ship upstream's 26.0.0 generated parsers adapted 
for runtime 4.10 (std::{once_flag,call_once} and the 4-arg ParserATNSimulator 
constructor) and drops find_package(ANTLR)
- drops d/p/antlr4-buildfix.patch (runtime 4.10 already aliases antlrcpp::Any 
to std::any), d/clean, and the antlr4 build-dependency

Verified with a full build against libantlr4-runtime-dev
4.10+dfsg-1build1 and upstream's GoogleTest suite (227/227 tests pass,
including ExpressionParser and doc_parser).

PPA test build (tenacious):
https://launchpad.net/~steelf/+archive/ubuntu/ppa/+packages?field.name_filter=freespace2
- amd64: https://launchpad.net/~steelf/+archive/ubuntu/ppa/+build/33884295
- arm64: https://launchpad.net/~steelf/+archive/ubuntu/ppa/+build/33884296
- ppc64el: https://launchpad.net/~steelf/+archive/ubuntu/ppa/+build/33884297

** Patch added: "freespace2_26.0.0+repack-1ubuntu1.debdiff"
   
https://bugs.launchpad.net/bugs/2170760/+attachment/6013378/+files/freespace2_26.0.0+repack-1ubuntu1.debdiff

** Tags added: patch tenacious

** Changed in: freespace2 (Ubuntu)
       Status: New => Confirmed

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/2170760

Title:
  freespace2 FTBFS: ANTLR parsers generated for runtime 4.9, Ubuntu has
  antlr4-cpp-runtime 4.10

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/freespace2/+bug/2170760/+subscriptions


-- 
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to