kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +03:00
Code Issues Projects Releases Wiki Activity

Rename Qt5/KF5 to Qt6/KF6

Browse Source
This commit is contained in:
Fushan Wen 2023-09-30 07:30:56 +08:00
parent b41e9b4471
commit 2d62524ac5
No known key found for this signature in database
GPG Key ID: 2E48D1487C91DCAA
11 changed files with 93 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
CMakeLists.txt
View File

@ -1,22 +1,22 @@
project(lattedock)
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(VERSION 0.10.77)
set(VERSION 0.10.240)
set(AUTHOR "Michail Vourlakos, Smith Ar")
set(EMAIL "mvourlakos@gmail.com, audoban@openmailbox.org")
set(WEBSITE "https://userbase.kde.org/LatteDock")
set(BUG_ADDRESS "https://bugs.kde.org/enter_bug.cgi?product=lattedock")
set(FAQS "https://userbase.kde.org/LatteDock/FAQ")
set(QT_MIN_VERSION "5.15.0")
set(KF5_MIN_VERSION "5.88.0")
set(QT_MIN_VERSION "6.5.0")
set(KF6_MIN_VERSION "5.240.0")
set(KDE_COMPILERSETTINGS_LEVEL "5.84.0")
set(KF5_LOCALE_PREFIX "")
set(KF6_LOCALE_PREFIX "")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
@ -30,15 +30,15 @@ include(KDEPackageAppTemplates)
include(WriteBasicConfigVersionFile)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED NO_MODULE COMPONENTS DBus Gui Qml Quick)
find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED NO_MODULE COMPONENTS DBus Gui Qml Quick)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
Activities Archive CoreAddons GuiAddons Crash DBusAddons Declarative GlobalAccel Kirigami2
I18n IconThemes KIO NewStuff Notifications Plasma PlasmaQuick Wayland WindowSystem XmlGui)
find_package(LibTaskManager REQUIRED)
add_definitions(-DPLASMA_WORKSPACE_VERSION="${LibTaskManager_VERSION}")
find_package(X11 REQUIRED)
set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
URL "http://www.x.org"
@ -48,7 +48,6 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
if(X11_FOUND)
find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR SHAPE EVENT)
set_package_properties(XCB PROPERTIES TYPE REQUIRED)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
if(NOT X11_SM_FOUND)
message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.
@ -67,19 +66,14 @@ find_package(Qt${QT_MAJOR_VERSION}WaylandClient)
find_package(PlasmaWaylandProtocols 1.6 REQUIRED)
find_package(Wayland REQUIRED COMPONENTS Client)
string(REGEX MATCH "\\.([^]]+)\\." KF5_VERSION_MINOR ${KF5_VERSION})
string(REGEX REPLACE "\\." "" KF5_VERSION_MINOR ${KF5_VERSION_MINOR})
string(REGEX MATCH "\\.([^]]+)\\." KF6_VERSION_MINOR ${KF6_VERSION})
string(REGEX REPLACE "\\." "" KF6_VERSION_MINOR ${KF6_VERSION_MINOR})
message(STATUS "KF5 VERSION : ${KF5_VERSION}")
message(STATUS "KF5 VERSION MINOR : ${KF5_VERSION_MINOR}")
message(STATUS "KF6 VERSION : ${KF6_VERSION}")
message(STATUS "KF6 VERSION MINOR : ${KF6_VERSION_MINOR}")
include(ECMFindQmlModule)
ecm_find_qmlmodule(QtQuick 2.7)
ecm_find_qmlmodule(QtQuick.Layouts 1.3)
ecm_find_qmlmodule(QtQuick.Controls 1.4)
ecm_find_qmlmodule(QtQuick.Controls.Styles.Plasma 2.0)
ecm_find_qmlmodule(QtGraphicalEffects 1.0)
ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0)
ecm_find_qmlmodule(org.kde.plasma.core 2.0)
ecm_find_qmlmodule(org.kde.plasma.components 2.0)

51
README.md
View File

@ -30,7 +30,7 @@ We need to use at least:
- **Qt >= 5.15**
Minimum requirements:
**tools:**
```
bash
@ -38,33 +38,32 @@ Minimum requirements:
**development packages for:**
```
Qt5Core >= 5.15.0
Qt5Gui >= 5.15.0
Qt5Dbus >= 5.15.0
QtCore >= 6.5.0
QtGui >= 6.5.0
QtDbus >= 6.5.0
KF5Plasma >= 5.82.0
KF5PlasmaQuick >= 5.82.0
KF5Activities >= 5.82.0
KF5CoreAddons >= 5.82.0
KF5GuiAddons >= 5.82.0
KF5DBusAddons >= 5.82.0
KF5Declarative >= 5.82.0
KF5Kirigami2 >= 5.82.0
KF5Wayland >= 5.82.0
KF5Package >= 5.82.0
KF5XmlGui >= 5.82.0
KF5IconThemes >= 5.82.0
KF5KIO >= 5.82.0
KF5I18n >= 5.82.0
KF5Notifications >= 5.82.0
KF5NewStuff >= 5.82.0
KF5Archive >= 5.82.0
KF5GlobalAccel >= 5.82.0
KF5Crash >= 5.82.0
KF5Plasma >= 6.0
KF5PlasmaQuick >= 6.0
KF5Activities >= 6.0
KF5CoreAddons >= 6.0
KF5GuiAddons >= 6.0
KF5DBusAddons >= 6.0
KF5Declarative >= 6.0
KF5Kirigami2 >= 6.0
KF5Wayland >= 6.0
KF5Package >= 6.0
KF5XmlGui >= 6.0
KF5IconThemes >= 6.0
KF5KIO >= 6.0
KF5I18n >= 6.0
KF5Notifications >= 6.0
KF5NewStuff >= 6.0
KF5Archive >= 6.0
KF5GlobalAccel >= 6.0
KF5Crash >= 6.0
For X11 support:
KF5WindowSystem >= 5.82.0
Qt5X11Extras >= 5.7.0
KF6WindowSystem >= 6.0
libxcb
libxcb-randr
libxcb-shape
@ -109,7 +108,7 @@ See the [installation instruction](./INSTALLATION.md) for others Linux distribut
## Run Latte-Dock
Latte is now ready to be used by executing
Latte is now ready to be used by executing
```
latte-dock
```

57
app/CMakeLists.txt
View File

@ -5,7 +5,7 @@ set(lattedock-app_SRCS
lattecorona.cpp
screenpool.cpp
primaryoutputwatcher.cpp
main.cpp
main.cpp
coretypes.h
)
@ -41,7 +41,7 @@ add_subdirectory(wm)
add_subdirectory(wm/tracker)
set(latte_dbusXML dbus/org.kde.LatteDock.xml)
qt5_add_dbus_adaptor(lattedock-app_SRCS ${latte_dbusXML} lattecorona.h Latte::Corona lattedockadaptor)
qt_add_dbus_adaptor(lattedock-app_SRCS ${latte_dbusXML} lattecorona.h Latte::Corona lattedockadaptor)
ki18n_wrap_ui(lattedock-app_SRCS settings/actionsdialog/actionsdialog.ui)
ki18n_wrap_ui(lattedock-app_SRCS settings/detailsdialog/detailsdialog.ui)
@ -50,45 +50,42 @@ ki18n_wrap_ui(lattedock-app_SRCS settings/screensdialog/screensdialog.ui)
ki18n_wrap_ui(lattedock-app_SRCS settings/settingsdialog/settingsdialog.ui)
ki18n_wrap_ui(lattedock-app_SRCS settings/viewsdialog/viewsdialog.ui)
ecm_add_qtwayland_client_protocol(lattedock-app_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-primary-output-v1.xml
BASENAME kde-primary-output-v1
)
add_executable(latte-dock ${lattedock-app_SRCS})
include(FakeTarget.cmake)
qt6_generate_wayland_protocol_client_sources(latte-dock FILES
${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-primary-output-v1.xml)
target_link_libraries(latte-dock
Qt5::DBus
Qt5::Quick
Qt5::Qml
KF5::Activities
KF5::Archive
KF5::CoreAddons
KF5::Crash
KF5::DBusAddons
KF5::Declarative
KF5::GuiAddons
KF5::GlobalAccel
KF5::I18n
KF5::IconThemes
KF5::KIOWidgets
KF5::Notifications
KF5::NewStuff
KF5::QuickAddons
KF5::Plasma
KF5::PlasmaQuick
KF5::WaylandClient
KF5::XmlGui
Qt::DBus
Qt::Quick
Qt::Qml
KF6::Activities
KF6::Archive
KF6::CoreAddons
KF6::Crash
KF6::DBusAddons
KF6::GuiAddons
KF6::GlobalAccel
KF6::I18n
KF6::IconThemes
KF6::KIOWidgets
KF6::Notifications
KF6::NewStuffWidgets
KF6::Plasma
KF6::PlasmaQuick
KF6::WaylandClient
KF6::XmlGui
Wayland::Client
)
if(HAVE_X11)
target_link_libraries(latte-dock
Qt5::X11Extras
KF5::WindowSystem
Qt::GuiPrivate
KF6::WindowSystem
${X11_LIBRARIES}
${XCB_LIBRARIES}
)
@ -101,7 +98,7 @@ install(TARGETS latte-dock ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.latte-dock.desktop DESTINATION ${KDE_INSTALL_APPDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.latte-dock.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
install(FILES dbus/org.kde.LatteDock.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
install(FILES lattedock.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
install(FILES lattedock.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
install(FILES latte-layouts.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
install(FILES latte-indicators.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})

2
app/config-latte.h.cmake
View File

@ -3,7 +3,7 @@
#cmakedefine01 HAVE_X11
#cmakedefine KF5_VERSION_MINOR @KF5_VERSION_MINOR@
#cmakedefine KF6_VERSION_MINOR @KF6_VERSION_MINOR@
#cmakedefine VERSION "@VERSION@"

7
app/packageplugins/indicator/CMakeLists.txt
View File

@ -2,9 +2,6 @@ kcoreaddons_add_plugin(latte_packagestructure_indicator SOURCES indicatorpackage
set_target_properties(latte_packagestructure_indicator PROPERTIES OUTPUT_NAME latte_indicator)
target_link_libraries(latte_packagestructure_indicator
KF5::Declarative
KF5::I18n
KF5::Package
KF6::I18n
KF6::Package
)
install(FILES latte-indicator.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})

11
containment/CMakeLists.txt
View File

@ -12,12 +12,11 @@ set(containment_SRCS
add_library(lattecontainmentplugin SHARED ${containment_SRCS})
target_link_libraries(lattecontainmentplugin
Qt5::Core
Qt5::Qml
Qt5::Quick
KF5::Declarative
KF5::Plasma
KF5::PlasmaQuick)
Qt::Core
Qt::Qml
Qt::Quick
KF6::Plasma
KF6::PlasmaQuick)
install(TARGETS lattecontainmentplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/private/containment)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/private/containment)

10
containmentactions/contextmenu/CMakeLists.txt
View File

@ -9,10 +9,10 @@ set(contextmenu_SRCS
add_library(plasma_containmentactions_lattecontextmenu MODULE ${contextmenu_SRCS})
target_link_libraries(plasma_containmentactions_lattecontextmenu
Qt5::DBus
Qt5::Widgets
KF5::I18n
KF5::XmlGui
KF5::Plasma)
Qt::DBus
Qt::Widgets
KF6::I18n
KF6::XmlGui
KF6::Plasma)
install(TARGETS plasma_containmentactions_lattecontextmenu DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/containmentactions)

15
declarativeimports/core/CMakeLists.txt
View File

@ -13,17 +13,16 @@ set(lattecoreplugin_SRCS
add_library(lattecoreplugin SHARED ${lattecoreplugin_SRCS})
target_link_libraries(lattecoreplugin
Qt5::Quick
Qt5::Qml
KF5::CoreAddons
KF5::Plasma
KF5::PlasmaQuick
KF5::QuickAddons
KF5::IconThemes
Qt::Quick
Qt::Qml
KF6::CoreAddons
KF6::Plasma
KF6::PlasmaQuick
KF6::IconThemes
)
if(HAVE_X11)
target_link_libraries(lattecoreplugin KF5::WindowSystem)
target_link_libraries(lattecoreplugin KF6::WindowSystem)
endif()
install(TARGETS lattecoreplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/core)

2
declarativeimports/core/config-latte-lib.h.cmake
View File

@ -5,7 +5,7 @@
#cmakedefine01 HAVE_X11
#cmakedefine KF5_VERSION_MINOR @KF5_VERSION_MINOR@
#cmakedefine KF6_VERSION_MINOR @KF6_VERSION_MINOR@
#cmakedefine VERSION "@VERSION@"

4
icons/CMakeLists.txt
View File

@ -8,6 +8,6 @@ ecm_install_icons(ICONS
48-apps-latte-dock.svg
sc-apps-latte-dock.svg
THEME hicolor
DESTINATION ${ICON_INSTALL_DIR})
DESTINATION ${KDE_INSTALL_ICONDIR})
install(FILES org.kde.latte.plasmoid.svg DESTINATION ${ICON_INSTALL_DIR}/breeze/applets/256)
install(FILES org.kde.latte.plasmoid.svg DESTINATION ${KDE_INSTALL_ICONDIR}/breeze/applets/256)

10
plasmoid/CMakeLists.txt
View File

@ -10,10 +10,10 @@ set(tasks_SRCS
add_library(lattetasksplugin SHARED ${tasks_SRCS})
target_link_libraries(lattetasksplugin
Qt5::Core
Qt5::Qml
KF5::Plasma
KF5::PlasmaQuick)
Qt::Core
Qt::Qml
KF6::Plasma
KF6::PlasmaQuick)
install(TARGETS lattetasksplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/private/tasks)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/private/tasks)