Hi Ingo, Enclosed is another iteration with the changes as specifically noted below. The last port didn't compile with an existing grantlee and it crashed on start---I think this had to do with the FB changes, but am not sure.
The enclosed port builds, installs, and runs with all functionality with a coexisting libdivecomputer and non-qt5 grantlee. Tested by connecting to the cloud, printing (well, to PDF), connecting to a dive computer. I tried to get the tests to run, but they need wxallowed. > * CATEGORIES = misc as discussed with sthen@. > * Checked the accuracy of the license markers. > Added a comment regarding the none-free icons in mobile-widgets/qml/icons. > * WANTLIB += Qt5PrintSupport Grantlee_Templates -= bz z. > * Remove x11/qt5 from MODULES; it works just fine without. > * Add x11/grantlee-qt5 dependency and disable NO_PRINTING. > Now i can use File >> Print to generate PDF files. I needed to add some weird cmakeness to remove the -isystem vs. -I that made grantlee be picked up before grantlee-qt5. > * Sort LIB_DEPENDS such that dependencies precede dependent packages. > * Drop DOPENBSD_LOCALBASE from CONFIGURE_ARGS. > * Remove the non-free files libdivecomputer/src/aes.{c,h}. > Add the same AES patches as for libdivecomputer. > * Use auto-version variables when calling autoreconf. > * Split pre-configure and pre-build. > * Add post-build target for the documentation, update the PLIST. > Do not comment Documentation/images and ${DOCFILES} in > patch-CMakeLists_txt. > * Let subsurface.debug install normally and comment it out in the PLIST. > * Remove the worst spyware features, in particular the UpdateManager, > the UserSurvey, and Facebook. So, here is where I disagree. UpdateManager is one thing---it's not useful, because the user doesn't manage updates. Same with being nagged to take the survey. But I don't think it's correct to remove functionality that depends upon user choice. I don't use FB myself, but many do and that's their choice. It doesn't do anything when not being used. Same with the ability to participate in the user survey. So in the enclosed, I leave both enabled, with the latter patched not to be in nag mode. If you consider the survey and "share" button unacceptable entirely, well, I don't use either, so it's ok with me. But I don't think that's fair to folks who do. Best, Kristaps
subsurface.tgz
Description: Binary data