Build Ubuntu packages with Qt6 linux support #3063

oskirby · 2022-03-17T19:04:34Z

This is a re-submission of PR #2769 but we will hopefully clear up the package dependencies a little better so that the resulting packages can be installed cleanly on all of Focal, Bionic, Impish and Jammy releases.

Before merging, we need to ensure that these install cleanly without dependency problems on each of the following distros:

18.04/Bionic
20.04/Focal
21.10/Impish
22.04/Jammy

Until the Qt6 packages have been merged into a public-facing PPA, it is necessary to install the Qt6-testing PPA first, which can be done with the command: sudo add-apt-repository ppa:okirby/qt6-testing

This reverts commits 4666266 and 86b5692

codecov-commenter · 2022-03-17T20:37:51Z

Codecov Report

Merging #3063 (3af68ac) into main (77389fe) will decrease coverage by 0.94%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #3063      +/-   ##
==========================================
- Coverage   74.39%   73.45%   -0.95%     
==========================================
  Files         199      199              
  Lines       10359    10398      +39     
  Branches     1149     1152       +3     
==========================================
- Hits         7707     7638      -69     
- Misses       2629     2737     +108     
  Partials       23       23

Flag	Coverage Δ
lottie_tests	`93.35% <ø> (ø)`
qml_tests	`11.27% <ø> (+0.01%)`	⬆️
unit_tests	`72.43% <ø> (-1.02%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
src/networkrequest.h	`0.00% <0.00%> (-100.00%)`	⬇️
src/logger.cpp	`80.39% <0.00%> (-10.72%)`	⬇️
src/networkrequest.cpp	`44.22% <0.00%> (-10.13%)`	⬇️
...uthenticationinapp/authenticationinapplistener.cpp	`60.79% <0.00%> (-6.16%)`	⬇️
src/tasks/authenticate/taskauthenticate.cpp	`37.50% <0.00%> (-5.00%)`	⬇️
src/models/serverdata.cpp	`88.88% <0.00%> (-0.16%)`	⬇️
tests/auth/testsignupandin.cpp	`93.30% <0.00%> (-0.12%)`	⬇️
src/networkwatcher.cpp	`2.17% <0.00%> (-0.05%)`	⬇️
src/pinghelper.cpp	`0.98% <0.00%> (ø)`
src/featurelist.cpp	`54.96% <0.00%> (ø)`
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 77389fe...3af68ac. Read the comment docs.

* Reorganize Debian control/rules files to build by Qt version. * Build all Ubuntu packages using pbuilder * Bump golang build-depends to require epoch >= 2 * Add update/universe repository * Use Qt6 for all Ubuntu versions. * Add qt6-l10n-tools dependency for Qt6 builds. * Add missing Qt deps for svg and core5compat modules * Fix OpenGL dependancy clash on Ubuntu/Bionic * Use libgl-dev instead of libglx-dev | libglvnd-dev * Bump Fedora/RPM to use Qt6 * Workaround for missing WASM linguist tools * Bump Fedora/RPM builder image to fedora:34 * Revert Qt6 support for Fedora. This reverts commits 4666266 and 86b5692 * Reduce minimum wireguard version to 1.0.20200513 * Add missing runtime packages for Qt6

* Add include all networks * Add feature to feature list * Renaming to ioskillswitch * alphabetical order * address comments and lint errors * fix lint errors * Reactivate Qt6 android builds This reverts commit c0dab41. * enable signing * Add missing error string (#3067) * Fix #3026 - Submit auth forms on 'Enter' clicks only when the submit button is enabled (#3066) * Disable 2FA "Verify" button when code input is empty (#3065) * Fix #3060 (#3064) * Build Ubuntu packages with Qt6 linux support (#3063) * Reorganize Debian control/rules files to build by Qt version. * Build all Ubuntu packages using pbuilder * Bump golang build-depends to require epoch >= 2 * Add update/universe repository * Use Qt6 for all Ubuntu versions. * Add qt6-l10n-tools dependency for Qt6 builds. * Add missing Qt deps for svg and core5compat modules * Fix OpenGL dependancy clash on Ubuntu/Bionic * Use libgl-dev instead of libglx-dev | libglvnd-dev * Bump Fedora/RPM to use Qt6 * Workaround for missing WASM linguist tools * Bump Fedora/RPM builder image to fedora:34 * Revert Qt6 support for Fedora. This reverts commits 4666266 and 86b5692 * Reduce minimum wireguard version to 1.0.20200513 * Add missing runtime packages for Qt6 * Add application/octet-stream to form (#3094) Socorro now enforces that the Content-Type of the uploaded file is application/octet-stream. * Porting the latest ios fix to 2.8 (#3107) * Add a new string to fix the connection label - VPN-1858 (#3089) * Schedule contact-tasks during the authentication - VPN-1947 (#3109) * fix: Connection info restart button (#3080) * Fix connection info mobile layout (#3078) * fix: Box height on mobile devices * chore: Center connection info content vertically * fix: Disable VPNToggle when connection info view is open (#3075) * fix: Animation not playing when navigating back from Get help view (#3057) * fix: What’s new panel translations (#3104) * fix: Settings accessible label when CI is open (#3113) * Fix for AIA inputs on Android (#3054) * fix: Handle IAA inputs covered by keyboard on Android * chore: Vertical keyboard transition * chore: Add comment for temporary fix for QTBUG-96117 * Revert changes * Android: change windowSoftInputMode to "adjustPan" * Clean up Co-authored-by: Lesley Norton <[email protected]> Co-authored-by: Lesley Norton <[email protected]> * fix: ConnectionInfo binding loop (#3133) * chore: Run ConnectionInfo animation only once (#3136) * fix: Disable controller nav when CI is open * chore: Remove unused legacy connectionInfo button and property Co-authored-by: Moritz Birghan <[email protected]> Co-authored-by: Marcus Kestler <[email protected]> Co-authored-by: Lesley Norton <[email protected]> Co-authored-by: Owen Kirby <[email protected]> Co-authored-by: Marcus Kestler <[email protected]> Co-authored-by: Andrea Marchesini <[email protected]> Co-authored-by: Andrea Marchesini <[email protected]> Co-authored-by: Lesley Norton <[email protected]>

* Add include all networks * Add feature to feature list * Renaming to ioskillswitch * alphabetical order * address comments and lint errors * fix lint errors * Reactivate Qt6 android builds This reverts commit c0dab41. * enable signing * Add missing error string (#3067) * Fix #3026 - Submit auth forms on 'Enter' clicks only when the submit button is enabled (#3066) * Disable 2FA "Verify" button when code input is empty (#3065) * Fix #3060 (#3064) * Build Ubuntu packages with Qt6 linux support (#3063) * Reorganize Debian control/rules files to build by Qt version. * Build all Ubuntu packages using pbuilder * Bump golang build-depends to require epoch >= 2 * Add update/universe repository * Use Qt6 for all Ubuntu versions. * Add qt6-l10n-tools dependency for Qt6 builds. * Add missing Qt deps for svg and core5compat modules * Fix OpenGL dependancy clash on Ubuntu/Bionic * Use libgl-dev instead of libglx-dev | libglvnd-dev * Bump Fedora/RPM to use Qt6 * Workaround for missing WASM linguist tools * Bump Fedora/RPM builder image to fedora:34 * Revert Qt6 support for Fedora. This reverts commits 4666266 and 86b5692 * Reduce minimum wireguard version to 1.0.20200513 * Add missing runtime packages for Qt6 * Add application/octet-stream to form (#3094) Socorro now enforces that the Content-Type of the uploaded file is application/octet-stream. * Porting the latest ios fix to 2.8 (#3107) * Add a new string to fix the connection label - VPN-1858 (#3089) * Schedule contact-tasks during the authentication - VPN-1947 (#3109) * fix: Connection info restart button (#3080) * Fix connection info mobile layout (#3078) * fix: Box height on mobile devices * chore: Center connection info content vertically * fix: Disable VPNToggle when connection info view is open (#3075) * fix: Animation not playing when navigating back from Get help view (#3057) * fix: What’s new panel translations (#3104) * fix: Settings accessible label when CI is open (#3113) * Fix for AIA inputs on Android (#3054) * fix: Handle IAA inputs covered by keyboard on Android * chore: Vertical keyboard transition * chore: Add comment for temporary fix for QTBUG-96117 * Revert changes * Android: change windowSoftInputMode to "adjustPan" * Clean up Co-authored-by: Lesley Norton <[email protected]> Co-authored-by: Lesley Norton <[email protected]> * fix: ConnectionInfo binding loop (#3133) * chore: Run ConnectionInfo animation only once (#3136) * fix: Translation on initial What’s new slide Co-authored-by: Moritz Birghan <[email protected]> Co-authored-by: Marcus Kestler <[email protected]> Co-authored-by: Lesley Norton <[email protected]> Co-authored-by: Owen Kirby <[email protected]> Co-authored-by: Marcus Kestler <[email protected]> Co-authored-by: Andrea Marchesini <[email protected]> Co-authored-by: Andrea Marchesini <[email protected]> Co-authored-by: Lesley Norton <[email protected]>

* Add include all networks * Add feature to feature list * Renaming to ioskillswitch * alphabetical order * address comments and lint errors * fix lint errors * Reactivate Qt6 android builds This reverts commit c0dab41. * enable signing * Add missing error string (#3067) * Fix #3026 - Submit auth forms on 'Enter' clicks only when the submit button is enabled (#3066) * Disable 2FA "Verify" button when code input is empty (#3065) * Fix #3060 (#3064) * Build Ubuntu packages with Qt6 linux support (#3063) * Reorganize Debian control/rules files to build by Qt version. * Build all Ubuntu packages using pbuilder * Bump golang build-depends to require epoch >= 2 * Add update/universe repository * Use Qt6 for all Ubuntu versions. * Add qt6-l10n-tools dependency for Qt6 builds. * Add missing Qt deps for svg and core5compat modules * Fix OpenGL dependancy clash on Ubuntu/Bionic * Use libgl-dev instead of libglx-dev | libglvnd-dev * Bump Fedora/RPM to use Qt6 * Workaround for missing WASM linguist tools * Bump Fedora/RPM builder image to fedora:34 * Revert Qt6 support for Fedora. This reverts commits 4666266 and 86b5692 * Reduce minimum wireguard version to 1.0.20200513 * Add missing runtime packages for Qt6 * Add application/octet-stream to form (#3094) Socorro now enforces that the Content-Type of the uploaded file is application/octet-stream. * Porting the latest ios fix to 2.8 (#3107) * Add a new string to fix the connection label - VPN-1858 (#3089) * Schedule contact-tasks during the authentication - VPN-1947 (#3109) * fix: Connection info restart button (#3080) * Fix connection info mobile layout (#3078) * fix: Box height on mobile devices * chore: Center connection info content vertically * fix: Disable VPNToggle when connection info view is open (#3075) * fix: Animation not playing when navigating back from Get help view (#3057) * fix: What’s new panel translations (#3104) * fix: Settings accessible label when CI is open (#3113) * Fix for AIA inputs on Android (#3054) * fix: Handle IAA inputs covered by keyboard on Android * chore: Vertical keyboard transition * chore: Add comment for temporary fix for QTBUG-96117 * Revert changes * Android: change windowSoftInputMode to "adjustPan" * Clean up Co-authored-by: Lesley Norton <[email protected]> Co-authored-by: Lesley Norton <[email protected]> * fix: ConnectionInfo binding loop (#3133) * chore: Run ConnectionInfo animation only once (#3136) * fix: Disable controller nav when CI is open * chore: Remove unused legacy connectionInfo button and property Co-authored-by: Moritz Birghan <[email protected]> Co-authored-by: Marcus Kestler <[email protected]> Co-authored-by: Lesley Norton <[email protected]> Co-authored-by: Owen Kirby <[email protected]> Co-authored-by: Marcus Kestler <[email protected]> Co-authored-by: Andrea Marchesini <[email protected]> Co-authored-by: Andrea Marchesini <[email protected]> Co-authored-by: Lesley Norton <[email protected]>

* Add include all networks * Add feature to feature list * Renaming to ioskillswitch * alphabetical order * address comments and lint errors * fix lint errors * Reactivate Qt6 android builds This reverts commit c0dab41. * enable signing * Add missing error string (#3067) * Fix #3026 - Submit auth forms on 'Enter' clicks only when the submit button is enabled (#3066) * Disable 2FA "Verify" button when code input is empty (#3065) * Fix #3060 (#3064) * Build Ubuntu packages with Qt6 linux support (#3063) * Reorganize Debian control/rules files to build by Qt version. * Build all Ubuntu packages using pbuilder * Bump golang build-depends to require epoch >= 2 * Add update/universe repository * Use Qt6 for all Ubuntu versions. * Add qt6-l10n-tools dependency for Qt6 builds. * Add missing Qt deps for svg and core5compat modules * Fix OpenGL dependancy clash on Ubuntu/Bionic * Use libgl-dev instead of libglx-dev | libglvnd-dev * Bump Fedora/RPM to use Qt6 * Workaround for missing WASM linguist tools * Bump Fedora/RPM builder image to fedora:34 * Revert Qt6 support for Fedora. This reverts commits 4666266 and 86b5692 * Reduce minimum wireguard version to 1.0.20200513 * Add missing runtime packages for Qt6 * Add application/octet-stream to form (#3094) Socorro now enforces that the Content-Type of the uploaded file is application/octet-stream. * Porting the latest ios fix to 2.8 (#3107) * Add a new string to fix the connection label - VPN-1858 (#3089) * Schedule contact-tasks during the authentication - VPN-1947 (#3109) * fix: Connection info restart button (#3080) * Fix connection info mobile layout (#3078) * fix: Box height on mobile devices * chore: Center connection info content vertically * fix: Disable VPNToggle when connection info view is open (#3075) * fix: Animation not playing when navigating back from Get help view (#3057) * fix: What’s new panel translations (#3104) * fix: Settings accessible label when CI is open (#3113) * Fix for AIA inputs on Android (#3054) * fix: Handle IAA inputs covered by keyboard on Android * chore: Vertical keyboard transition * chore: Add comment for temporary fix for QTBUG-96117 * Revert changes * Android: change windowSoftInputMode to "adjustPan" * Clean up Co-authored-by: Lesley Norton <[email protected]> Co-authored-by: Lesley Norton <[email protected]> * fix: ConnectionInfo binding loop (#3133) * chore: Run ConnectionInfo animation only once (#3136) * fix: Translation on initial What’s new slide Co-authored-by: Moritz Birghan <[email protected]> Co-authored-by: Marcus Kestler <[email protected]> Co-authored-by: Lesley Norton <[email protected]> Co-authored-by: Owen Kirby <[email protected]> Co-authored-by: Marcus Kestler <[email protected]> Co-authored-by: Andrea Marchesini <[email protected]> Co-authored-by: Andrea Marchesini <[email protected]> Co-authored-by: Lesley Norton <[email protected]>

oskirby added 14 commits March 15, 2022 05:27

Reorganize Debian control/rules files to build by Qt version.

ad7774b

Build all Ubuntu packages using pbuilder

60e149b

Bump golang build-depends to require epoch >= 2

f163451

Add update/universe repository

eff676a

Use Qt6 for all Ubuntu versions.

faada36

Add qt6-l10n-tools dependency for Qt6 builds.

f446be9

Add missing Qt deps for svg and core5compat modules

f229781

Fix OpenGL dependancy clash on Ubuntu/Bionic

6a45c82

Use libgl-dev instead of libglx-dev | libglvnd-dev

b6cb5a9

Bump Fedora/RPM to use Qt6

4666266

Workaround for missing WASM linguist tools

eaebbb2

Bump Fedora/RPM builder image to fedora:34

86b5692

Revert Qt6 support for Fedora.

11d1f05

This reverts commits 4666266 and 86b5692

Reduce minimum wireguard version to 1.0.20200513

6655400

bakulf approved these changes Mar 17, 2022

View reviewed changes

Add missing runtime packages for Qt6

3af68ac

oskirby force-pushed the qt6-linux-support branch from 8375c49 to 3af68ac Compare March 18, 2022 01:50

oskirby marked this pull request as ready for review March 18, 2022 03:29

bakulf merged commit 24c9c95 into main Mar 18, 2022

bakulf deleted the qt6-linux-support branch March 18, 2022 07:32

oskirby mentioned this pull request Apr 7, 2022

Fix PPA automation workflow after Qt6 changes #3289

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Build Ubuntu packages with Qt6 linux support #3063

Build Ubuntu packages with Qt6 linux support #3063

oskirby commented Mar 17, 2022 •

edited

Loading

codecov-commenter commented Mar 17, 2022 •

edited

Loading

Build Ubuntu packages with Qt6 linux support #3063

Build Ubuntu packages with Qt6 linux support #3063

Conversation

oskirby commented Mar 17, 2022 • edited Loading

codecov-commenter commented Mar 17, 2022 • edited Loading

Codecov Report

oskirby commented Mar 17, 2022 •

edited

Loading

codecov-commenter commented Mar 17, 2022 •

edited

Loading