Commit 2dfc85fc authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

appimage: bump plasma/kapps/kf deps to v5.17.0/v19.08.2/v5.63.0

parent 7117c37a
Pipeline #9286 passed with stage
in 58 minutes and 36 seconds
......@@ -27,9 +27,9 @@ fi
if [ -z "$KDEV_PG_QT_VERSION" ]; then
KDEV_PG_QT_VERSION=v2.2.0
fi
KF5_VERSION=v5.62.0
PLASMA_VERSION=v5.16.5
KDE_APPLICATIONS_VERSION=v19.08.1
KF5_VERSION=v5.63.0
PLASMA_VERSION=v5.17.0
KDE_APPLICATIONS_VERSION=v19.08.2
GRANTLEE_VERSION=v5.1.0
OKTETA_VERSION=v0.26.2
......@@ -177,7 +177,7 @@ build_framework kglobalaccel
build_framework kxmlgui -DBUILD_DESIGNERPLUGIN=OFF
build_framework kbookmarks
build_framework solid
build_framework kio -DBUILD_DESIGNERPLUGIN=OFF
(PATCH_FILE=$SCRIPT_DIR/kio_cmake_no_greaterless.patch build_framework kio -DBUILD_DESIGNERPLUGIN=OFF)
build_framework kparts
build_framework kitemmodels
build_framework threadweaver
......@@ -197,7 +197,7 @@ build_framework kinit
fi
# KDE Plasma
build_project libksysguard $PLASMA_VERSION
(PATCH_FILE=$SCRIPT_DIR/libksysguard_link_rt.patch build_project libksysguard $PLASMA_VERSION)
build_project kdecoration $PLASMA_VERSION # needed by breeze
build_project breeze $PLASMA_VERSION
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d42bbb7d..3a2e4ec6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,7 @@ if (HAVE_X11)
endif()
# Qt 5.13 deprecated QComboBox::currentIndexChanged(QString) and Qt 5.14 undid that...
-if (Qt5Widgets_VERSION VERSION_GREATER_EQUAL 5.14.0)
+if (NOT Qt5Widgets_VERSION VERSION_LESS 5.14.0)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
endif()
diff --git a/processcore/CMakeLists.txt b/processcore/CMakeLists.txt
index 3042cda..bd07f6f 100644
--- a/processcore/CMakeLists.txt
+++ b/processcore/CMakeLists.txt
@@ -36,6 +36,10 @@ if( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
target_link_libraries(processcore kvm)
endif()
+if(NOT HAVE_CLOCK_GETTIME_C)
+ target_link_libraries(processcore PRIVATE rt)
+endif()
+
target_include_directories(processcore
PUBLIC
"$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment