| nephros | piggz[m]: your there? | 11:26 |
|---|---|---|
| x2s | .oO( well, I bought the Xperia V early, because I hoped to make some good video shots with it of something. But either I'm too stupid and don't know how to use a camera or the camera is just shitty ) | 11:47 |
| piggz[m] | attah: i am now | 12:45 |
| nephros | piggz[m]: my ping was just about extra-cmake-modules/pull/1 but you already saw it :) | 14:10 |
| mal | nephros: afaik the issue is that __cmake_in_source_build which causes issues with the cmake macros | 14:17 |
| mal | https://github.com/sailfishos-chum/kf5/blob/main/macros.kf5#L24C13-L24C36 | 14:18 |
| mal | when doing "undefine __cmake_in_source_build" but using %make_build and %make_install is not compatible | 14:20 |
| mal | afaik | 14:21 |
| nephros | mal: yea that's what I found. | 14:31 |
| nephros | WHat we can do is switch everything to %cmake_build/install. | 14:31 |
| nephros | But SFOS 4.5 doesn't have the updated cmake which ships the macros. | 14:32 |
| nephros | ... and almost all the existing opt-qt and opt-kf5 specs are doing the mkdir build;pushd build;cmake..;popd dance. | 14:34 |
| piggz[m] | so, we need to update all the .specs and add #if sfos >= 4600 ... cmake_build :D | 14:45 |
| mal | piggz[m]: or make your own conditional cmake macros into macros.kf5 ? | 14:48 |
| piggz[m] | hmmm | 14:48 |
| mal | and then update all spec files to use proper macros? | 14:49 |
| mal | a lot of work of course | 14:49 |
| piggz[m] | yeah ... but seems like might be the right solution? | 14:49 |
| nephros | piggz[m]: mal: please see https://github.com/sailfishos-chum/extra-cmake-modules/pull/1#issuecomment-2147619312 | 14:51 |
| nephros | that does work, and is more or less that. | 14:51 |
| mal | yeah but no need to have new package | 14:52 |
| nephros | I also think it's the way to go, that waty we're close to upstream cmake and upstrem kf5 correct? | 14:52 |
| nephros | ok? | 14:53 |
| piggz[m] | nephros: how about adding that in here https://github.com/sailfishos-chum/kf5/blob/main/macros.kf5 and making the .specs just use %cmake_build ? | 14:53 |
| mal | packages should move to cmake_build and cmake_install | 14:53 |
| mal | and macros.kf5 is a good place for compat macros | 14:53 |
| mal | imo | 14:54 |
| nephros | agreed. about the migration. Where to put the macros I leave that to the chum/qt5.15 gurus ;) | 14:54 |
| nephros | a separate package would make it easier for no-KF5 cmake users to benefit. | 14:55 |
| piggz[m] | guru is a bit of a stretch! | 14:55 |
| mal | nephros: but other packages probably don't have "undefine __cmake_in_source_build" | 14:55 |
| piggz[m] | anyway, qt 6.7 is the next goal! | 14:56 |
| nephros | ma: that's true. They also none of the cmake rpm macros. | 14:56 |
| nephros | *have | 14:56 |
| piggz[m] | so .... solution is, update kf5 macros package with required macros for <= 4.5 .. then update _all_ the kf5 .specs ? | 14:59 |
| piggz[m] | rinigus: ^^ | 15:00 |
| piggz[m] | be worth also updating to latest kf5 libs on the way? | 15:00 |
| mal | yeah, easier if all use same | 15:01 |
| nephros | I can help with the specs if you like. | 15:01 |
| mal | quite easy but repetitive work | 15:01 |
| nephros | Yes. Chance to spend time writing a tool to do it. Which will take more time than the actual work, but is the "proper" solution. | 15:02 |
| piggz[m] | rinigus has a script somewhere which does the upstream updates .... | 15:02 |
| piggz[m] | probably best he runs that | 15:03 |
| piggz[m] | .specs probably just hand-ball fwiw | 15:03 |
| nephros | piggz[m]: yeah, but a script is not easy to get right help with the pushe;cmake;popd stuff, because different options to cmake | 15:03 |
| nephros | Hasn't Qt moved from qmake to cmake? Does it make sense to do the compat macros in sailfishos-chum/qt5/blob/main/macros.qt5 instead? | 15:11 |
| piggz[m] | erm only qt6 has gone to cmake | 15:21 |
| nephros | ah ok. | 15:23 |
| nephros | I just looked at qt5keychain and that uses cmake. but that may be an outlier/exception. | 15:25 |
| nephros | my script found ~25 spec files to update. not too bad. | 17:00 |
| rinigus | evening! I would try to update all qt5/kf5 to the latest versions and would use the scripts for it. mal has been handling OBS builds in manual manner - those should also go back to automatic, I think. | 17:17 |
| rinigus | as for %cmake - maybe we shouldn't care super much about 4.5? like in 1/2 year from now? | 17:18 |
| rinigus | qt6 is going to be "fun" | 17:18 |
| nephros | rinigus: I have most?some? of the specs done. I guess this change is useful for 4.6 anyway right? | 17:32 |
| nephros | I mean going from make_build to cmake_build. | 17:33 |
| rinigus | nephros: in that case we would need still to support 4.5 and would need that macro somewhere | 17:36 |
| rinigus | OK, you finish changes first and then I'll start the updates. otherwise we would get into conflict about it (maybe) | 17:37 |
| nephros | rinigus: as you like. diffs are not complex. | 17:39 |
| nephros | would you like lots of PRs, or a tarball , or a set of diffs? | 17:40 |
| rinigus | nephros: just easier to work when I know that its all in my hands :) | 17:41 |
| rinigus | none :) . lots of PRs is easiest for me. if you have time to make them | 17:41 |
| nephros | Just to be clear - I don't insist on going this route. if there's another way you prefer, fine. | 17:43 |
| rinigus | nephros: no problem, its good to make SPEC cleaner | 17:45 |
| mal | rinigus: anyway, updating to use cmake_build and cmake_install and we can fix 4.5 in the macros later would make sense | 17:46 |
| rinigus | mal: sure. | 17:47 |
| nephros | gotta say, I love unix shell. 25 repos forked, branched, committed, pushed. In two minutes. On my fucking mobile phone. | 17:51 |
| nephros | :D | 17:51 |
| piggz[m] | nephros: do you have a test build in your home obs, with the macro changes and maybe 1 or 2 packages, to see it all working? | 17:55 |
| nephros | piggz[m]: yes. its linked from the comment url I gave above. just a moment. | 17:59 |
| nephros | https://build.sailfishos.org/package/show/home:nephros:branches:sailfishos:chum:testing:4.6-fixes/opt-kf5-kconfig | 18:00 |
| nephros | in this version the compat macros are in the spec. | 18:00 |
| nephros | I can add some more to test. | 18:02 |
| nephros | I guess angelfish is the crown jewel. | 18:08 |
| piggz[m] | im rather a fan of elisa and tokodon | 18:14 |
| piggz[m] | used daily | 18:14 |
| piggz[m] | ill update them after the libs are done | 18:15 |
| nephros | Ok PRs submitted, I hope they're ok. | 18:18 |
| mal | nephros: fix that https://github.com/sailfishos-chum/extra-cmake-modules/pull/1/files also | 18:21 |
| mal | to use the macros | 18:21 |
| nephros | on it | 18:24 |
| nephros | ok , done, compiled. | 18:32 |
| mal | nephros: I still think the macros in that PR should be in the kf5 package instead | 18:36 |
| nephros | mal: you mean drop them from the PR branch? yea. | 18:48 |
| nephros | piggz[m]: well I tried adding elisa and tokodon to that testing repo. | 19:35 |
| nephros | But dep on kio pulls in basically all of the others - I'm gonna stop here, should suffice as a PoC | 19:35 |
| mal | nephros: maybe do the macro fix if you want, should be mostly copy of the stuff you had already in that PR before, but please keep the formatting as it was in the cmake macros file to make comparison easier | 19:40 |
| nephros | mal: Like that? should show nicely in a diff: https://github.com/sailfishos-chum/kf5/compare/main...nephros:kf5:cmake-compat-macros | 20:07 |
| nephros | Not sure which parts to skip from the original... | 20:09 |
| mal | nephros: I wonder how that works when there is %cmake macro already in cmake repo, maybe you should just add the cmake_build and cmake_install and variables needed by those | 21:08 |
Generated by irclog2html.py 2.17.1 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!