Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-31 17:54:55 +01:00
Code Issues Releases Wiki Activity

Add Qt 6 support to debian files

Browse Source
This commit is contained in:
Jonas Kvinge 2022-04-22 23:56:30 +02:00
parent 499c86a8b8
commit 2059bce6a7
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.github/workflows/ccpp.yml vendored
View File

@ -942,8 +942,8 @@ jobs:
libtag1-dev libtag1-dev
qtbase5-dev qtbase5-dev
qtbase5-dev-tools qtbase5-dev-tools
qtbase5-private-dev
qttools5-dev qttools5-dev
qttools5-dev-tools
libqt5x11extras5-dev libqt5x11extras5-dev
libgstreamer1.0-dev libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev
@ -1003,8 +1003,8 @@ jobs:
libtag1-dev libtag1-dev
qtbase5-dev qtbase5-dev
qtbase5-dev-tools qtbase5-dev-tools
qtbase5-private-dev
qttools5-dev qttools5-dev
qttools5-dev-tools
libqt5x11extras5-dev libqt5x11extras5-dev
libgstreamer1.0-dev libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev
@ -1061,11 +1061,11 @@ jobs:
libasound2-dev libasound2-dev
libpulse-dev libpulse-dev
libtag1-dev libtag1-dev
qtbase5-dev qt6-base-dev
qtbase5-dev-tools qt6-base-dev-tools
qtbase5-private-dev qt6-tools-dev
qttools5-dev qt6-tools-dev-tools
libqt5x11extras5-dev qt6-l10n-tools
libgstreamer1.0-dev libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev
gstreamer1.0-alsa gstreamer1.0-alsa
@ -1128,8 +1128,8 @@ jobs:
libtag1-dev libtag1-dev
qtbase5-dev qtbase5-dev
qtbase5-dev-tools qtbase5-dev-tools
qtbase5-private-dev
qttools5-dev qttools5-dev
qttools5-dev-tools
libqt5x11extras5-dev libqt5x11extras5-dev
libgstreamer1.0-dev libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev
@ -1194,8 +1194,8 @@ jobs:
libtag1-dev libtag1-dev
qtbase5-dev qtbase5-dev
qtbase5-dev-tools qtbase5-dev-tools
qtbase5-private-dev
qttools5-dev qttools5-dev
qttools5-dev-tools
libqt5x11extras5-dev libqt5x11extras5-dev
libgstreamer1.0-dev libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev
@ -1260,8 +1260,8 @@ jobs:
libtag1-dev libtag1-dev
qtbase5-dev qtbase5-dev
qtbase5-dev-tools qtbase5-dev-tools
qtbase5-private-dev
qttools5-dev qttools5-dev
qttools5-dev-tools
libqt5x11extras5-dev libqt5x11extras5-dev
libgstreamer1.0-dev libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev
@ -1323,11 +1323,11 @@ jobs:
libasound2-dev libasound2-dev
libpulse-dev libpulse-dev
libtag1-dev libtag1-dev
qtbase5-dev qt6-base-dev
qtbase5-dev-tools qt6-base-dev-tools
qtbase5-private-dev qt6-tools-dev
qttools5-dev qt6-tools-dev-tools
libqt5x11extras5-dev qt6-l10n-tools
libgstreamer1.0-dev libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev
libgstreamer-plugins-good1.0-dev libgstreamer-plugins-good1.0-dev

12
CMakeLists.txt
View File

@ -234,6 +234,18 @@ if(BUILD_WITH_QT5 AND Qt5Core_VERSION VERSION_LESS 5.15.0)
endmacro() endmacro()
endif() endif()
if(LINUX AND DPKG_BUILDPACKAGE)
if(BUILD_WITH_QT5)
set(DEBIAN_BUILD_DEPENDS_QT_PACKAGES qtbase5-dev,qtbase5-dev-tools,qttools5-dev,qttools5-dev-tools,libqt5x11extras5-dev,)
set(DEBIAN_DEPENDS_QT_PACKAGES libqt5sql5-sqlite,)
endif()
if(BUILD_WITH_QT6)
set(DEBIAN_BUILD_DEPENDS_QT_PACKAGES qt6-base-dev,qt6-base-dev-tools,qt6-tools-dev,qt6-tools-dev-tools,qt6-l10n-tools,)
set(DEBIAN_DEPENDS_QT_PACKAGES libqt6sql6-sqlite,)
endif()
configure_file(${CMAKE_SOURCE_DIR}/debian/control.in ${CMAKE_SOURCE_DIR}/debian/control @ONLY)
endif()
if(X11_FOUND) if(X11_FOUND)
find_path(KEYSYMDEF_H NAMES "keysymdef.h" PATHS "${X11_INCLUDE_DIR}" PATH_SUFFIXES "X11") find_path(KEYSYMDEF_H NAMES "keysymdef.h" PATHS "${X11_INCLUDE_DIR}" PATH_SUFFIXES "X11")
find_path(XF86KEYSYM_H NAMES "XF86keysym.h" PATHS "${XCB_INCLUDEDIR}" PATH_SUFFIXES "X11") find_path(XF86KEYSYM_H NAMES "XF86keysym.h" PATHS "${XCB_INCLUDEDIR}" PATH_SUFFIXES "X11")

8
debian/control → debian/control.in vendored
View File

@ -16,11 +16,7 @@ Build-Depends: debhelper (>= 11),
libasound2-dev, libasound2-dev,
libpulse-dev, libpulse-dev,
libtag1-dev, libtag1-dev,
qtbase5-dev, @DEBIAN_BUILD_DEPENDS_QT_PACKAGES@
qtbase5-private-dev,
qtbase5-dev-tools,
qttools5-dev,
libqt5x11extras5-dev,
libgstreamer1.0-dev, libgstreamer1.0-dev,
libgstreamer-plugins-base1.0-dev, libgstreamer-plugins-base1.0-dev,
libcdio-dev, libcdio-dev,
@ -35,7 +31,7 @@ Architecture: any
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
libsqlite3-0, libsqlite3-0,
libqt5sql5-sqlite, @DEBIAN_DEPENDS_QT_PACKAGES@
gstreamer1.0-plugins-base, gstreamer1.0-plugins-base,
gstreamer1.0-plugins-good, gstreamer1.0-plugins-good,
gstreamer1.0-alsa, gstreamer1.0-alsa,