Hi Chris, > On 9/12/26 10:35 AM, Diederik de Haas wrote: >> In upstream issue #7067 one of the mumble maintainers asked for testing of >> https://github.com/mumble-voip/mumble/pull/7290 >> >> https://github.com/mumble-voip/mumble/issues/7067#issuecomment-5297216501 : >> "Could someone please test the changes in #7290 against a version of Ice >= >> 3.8? I currently don't have such a version at hand for testing so I can't do >> it >> on my own (easily)." >> >> @Chris: can you push the 'upstream' and 'pristine-tar' branches to Salsa?
On Sat Sep 12, 2026 at 11:35 PM CEST, Chris Knadle wrote: > I pushed both 'upstream' and 'pristine-tar' branches to salsa. I've made a serious attempt and I've gotten further, but the build still fails and fixing that is beyond my capabilities. The upstream PR 7290 is made against upstream 'master' branch (naturally), but the changes between 'master' and 1.5.857 are HUGE. So I tried to backport it against 1.5.x as follows: 1. Convert the Debian patches to be compatible with ``git am`` 2. Backport mostly build system changes to 1.5.x 3. Add (backported) patch set of PR 7290 ad 1) When trying to adjust/backport patches, I find it useful to apply the Debian patches to the upstream source (1.5.857 in this case) and use that to rebase/adjust/backport other patches. For that I do ``git am <path-to-debian-patches>`` but noticed that didn't work. So I converted the ``.diff`` files to ``.patch`` files and fixed some (minor) things in the process. src branch: https://salsa.debian.org/diederik/mumble/-/tree/rework-patches ad 2) To be able to apply the patches from PR 7290 onto the 1.5.x branch, I also needed to backport changes to ``CMakeLists.txt`` src branch: https://salsa.debian.org/diederik/mumble/-/tree/backport-build-system-changes ad 3) And I also needed to make changes to the patches of PR 7290 itself in order to start the compilation. src branch: https://salsa.debian.org/diederik/mumble/-/tree/zeroc-ice-compat You could just look at that last branch as 3) is build upon 2) which is build upon 1). The build fails with these lines: ``` make[4]: *** [src/murmur/CMakeFiles/mumble_server_generated_ice_files.dir/build.make:89: src/murmur/CMakeFiles/mumble_server_generated_ice_files.dir/MumbleServer.cpp.o] Error 1 make[4]: Leaving directory '/build/package/package/obj-x86_64-linux-gnu' make[3]: *** [CMakeFiles/Makefile2:3720: src/murmur/CMakeFiles/mumble_server_generated_ice_files.dir/all] Error 2 make[3]: *** Waiting for unfinished jobs.... ``` https://salsa.debian.org/diederik/mumble/-/jobs/10379299#L3357 And that's because the ``src/murmur/CMakeFiles`` directory doesn't exist. But I don't know what I would need to do/change so that it does get created and thus not fail at that point. It would be most useful (for me) if upstream made a variant of PR 7290 which targets the 1.5.x branch as they're WAY more familiar with the code and cmake then I am. FWIW: I think the commits from 1) would be useful in any case, but I'll leave it up to you to use them or not. Hopefully you or someone else can get further then I did. Cheers, Diederik
signature.asc
Description: PGP signature
