Fix packaging for ubuntu questing#4717
Conversation
|
Artifacts: |
|
Artifacts: |
|
Artifacts: |
|
Artifacts: |
|
Webengine support will be removed. This is a 150MB monster library that is not the right tool for the job. |
|
Would you consider merging a PR that disables print/user manual support for Ubuntu 25.10 so that Ubuntu 25.10 users at least have a usable Subsurface version? Because The 25.04 version isn't installable in 25.10 right now and it would suck to need to run subsurface in a VM. |
Go for it - help is appreciated and it's great if we can avoid leaving 25.10 users high and dry until we get Qt6 support done. Bonus points if the user manual action opens https://subsurface-divelog.org/subsurface-user-manual/ in a browser until we get native manual support back. |
Webengine support will be removed[1], and Ubuntu 25.10 has removed libqt5webkit5-dev, so turn webkit-using features off. [1] subsurface#4717 (comment)
|
@mikeller @dirkhh Done, please have a look:
|
|
Artifacts: |
|
Artifacts: |
|
Artifacts: |
|
Oh and @hyperair you will have to fix the sign-off on your commit messages, see https://github.com/subsurface/subsurface/pull/4717/checks?check_run_id=64790567736. |
dirkhh
left a comment
There was a problem hiding this comment.
Would you mind adding a Signed-off-by to the last two commits?
I think I'd prefer if you rebased the commits to avoid the bit of back-and-forth with QWebEngine, but that's not required.
Other than that this looks great.
But we try not to merge things without SOB, so I'll submit this as a "Request changes" even though I approve the changes themselves...
packaging/ubuntu/make-package.sh
Outdated
|
|
||
| # newer ubuntu releases no longer have libqt5webkit5-dev, so use | ||
| # qtwebengine5-dev instead | ||
| sed -i 's/libqt5webkit5-dev/qtwebengine5-dev/' debian/control |
There was a problem hiding this comment.
We are going a bit back and forth here between this commit and the rest of the series... not a huge problem, but maybe we should rebase / combine these commits for them to make more sense...
| diveList->scrollTo(diveList->model()->index(0, 0), QAbstractItemView::PositionAtCenter); | ||
| #ifdef NO_USERMANUAL | ||
| ui.menuHelp->removeAction(ui.actionUserManual); | ||
| #endif |
There was a problem hiding this comment.
this makes the name of the #define a bit illogical, but it's temporary in many ways, so I'm not too worried.
There was a problem hiding this comment.
this makes the name of the #define a bit illogical, but it's temporary in many ways, so I'm not too worried.
@dirkhh Maybe NO_HARD_TO_BUILD_USERMANUAL 😁
Jokes aside, I've been toying with the thought of moving the desktop manual completely to the web version for some time. This would cut some scope from the list of things that are currently hard-to-do for us in Qt6, and after all this has been working fine for the mobile version for a long time, with no user complaints for what I can tell.
There was a problem hiding this comment.
Well ... User manual works fine with Qt6 and QLiteHtml 😁
There was a problem hiding this comment.
It works - not sure I find the current look so fine:
So all in all I am wondering if we shouldn't see the effort that went into making this work with QLiteHtml as sunk cost, and avoid future effort to keep this working and possibly make it look better by moving to the browser-based approach...
There was a problem hiding this comment.
Dive site without Internet. Liveaboard.
Not needing the Internet to look at the manual is useful.
That's why we did all this in the first place
There was a problem hiding this comment.
Dive site without Internet. Liveaboard. Not needing the Internet to look at the manual is useful. That's why we did all this in the first place
My hunch would be that more people who get into this situation will be bringing a mobile phone rather than a laptop, and we seem to be happy to accept this shortcoming there...
But point taken. If this is a concern then we can simply open the packaged HTML user manual in the system default browser, like what #4735 does. Or we could even package the PDF manual for a smaller, more compact binary, and open it in the system viewer.
Ubuntu 25.10 has removed libqt5webkit5-dev and webengine support will be removed[1], so turn webkit-using features off. [1] subsurface#4717 (comment) Signed-off-by: Chow Loong Jin <hyperair@debian.org>
Building subsurface with lto turned on (default in ubuntu questing and above) causes subsurface to segfault on startup. Also cleanup the typo'd DEB_BUILD+OPTIONS env var which was not doing anything. Signed-off-by: Chow Loong Jin <hyperair@debian.org>
Signed-off-by: Chow Loong Jin <hyperair@debian.org>
ea34a8e to
b0f42d9
Compare
|
@dirkhh Done. Could you also fix the package copies for 
I think you'll need to redo the copy, selecting the "Copy existing binaries" option as opposed to "Rebuild the copied sources" when doing the copy to have it work. |
|
Artifacts: |
|
Artifacts: |
|
Artifacts: |
dirkhh
left a comment
There was a problem hiding this comment.
thanks - I once again tried to get Launchpad to copy those private header packages
Ubuntu 25.10 has removed libqt5webkit5-dev and webengine support will be removed[1], so turn webkit-using features off. [1] #4717 (comment) Signed-off-by: Chow Loong Jin <hyperair@debian.org>
|
Thank you for working on this. On my third attempt the copying of the private headers worked and I verified that we now have a Subsurface-daily package for 25.10 |
Describe the pull request:
Pull request long description:
Fix build failures of the
subsurfacepackage in the releases and daily PPAs in ubuntuquesting, caused by unsatisfiable build-dependencylibqt5webkit5-dev.There is also a separate issue of
subsurface-qt-private-headersnot having been properly copied toquestingin the PPA, but I can't fix that in a PR.Changes made:
packaging/ubuntu/make-package.shto swap out thelibqt5webkit5-devbuild-dep forqtwebengine5-devon Ubuntu QuestingRelated issues:
Additional information:
Documentation change:
Mentions:
@Saviq @mikeller @dirkhh