Skip to content

Commit 0f67278

Browse files
committed
Use qt6-5compat-dev instead of libqt6core5compat6-dev for Ubuntu > Jammy 22.4
1 parent 1c2475a commit 0f67278

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

packaging/CPackDebUploadPPA.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ endif()
8989
foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES})
9090

9191
if (RELEASE STREQUAL "jammy")
92-
set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libqt6shadertools6-dev,")
92+
set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libqt6shadertools6-dev, libqt6core5compat6-dev,")
9393
else()
94-
set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "qt6-shadertools-dev,")
94+
set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "qt6-shadertools-dev, qt6-5compat-dev,")
9595
endif()
9696

9797
configure_file(${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/packaging/debian/control.in

packaging/debian/control.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 11),
1414
qml6-module-qt-labs-qmlmodels,
1515
qml6-module-qtquick-controls,
1616
qml6-module-qtquick-layouts,
17-
libqt6core5compat6-dev,
1817
libqt6opengl6-dev,
1918
libqt6sql6-sqlite,
2019
libqt6svg6-dev,

tools/debian_buildenv.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ case "$1" in
2121
case "${VERSION_CODENAME}" in
2222
jammy|bullseye|victoria|vera|vanessa|virginia) # <= Ubuntu 22.04.5 LTS
2323
PACKAGES_EXTRA=(
24-
libqt6shadertools6-dev
24+
libqt6shadertools6-dev \
25+
libqt6core5compat6-dev
2526
)
2627
;;
2728
*)
2829
PACKAGES_EXTRA=(
29-
qt6-shadertools-dev
30+
qt6-shadertools-dev \
31+
qt6-5compat-dev
3032
)
3133
esac
3234

@@ -114,7 +116,6 @@ case "$1" in
114116
libopusfile-dev \
115117
libportmidi-dev \
116118
libprotobuf-dev \
117-
libqt6core5compat6-dev \
118119
libqt6opengl6-dev \
119120
libqt6sql6-sqlite \
120121
libqt6svg6-dev \

0 commit comments

Comments
 (0)