forked from KDE/kdevelop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
appimage: bump kf/krs/plasma versions to 5.69.0/20.04.0/5.18.4
GIT_SILENT
- Loading branch information
Showing
7 changed files
with
109 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| diff --git a/kstyle/breezehelper.h b/kstyle/breezehelper.h | ||
| index 3b6320dc..ab42981c 100644 | ||
| --- a/kstyle/breezehelper.h | ||
| +++ b/kstyle/breezehelper.h | ||
| @@ -314,11 +314,11 @@ namespace Breeze | ||
| //@} | ||
|
|
||
| //* frame radius | ||
| - constexpr qreal frameRadius( const int penWidth = PenWidth::NoPen, const qreal bias = 0 ) const | ||
| + qreal frameRadius( const int penWidth = PenWidth::NoPen, const qreal bias = 0 ) const | ||
| { return qMax( Metrics::Frame_FrameRadius - (0.5 * penWidth) + bias, 0.0 ); } | ||
|
|
||
| //* frame radius with new pen width | ||
| - constexpr qreal frameRadiusForNewPenWidth( const qreal oldRadius, const int penWidth ) const | ||
| + qreal frameRadiusForNewPenWidth( const qreal oldRadius, const int penWidth ) const | ||
| { return qMax( oldRadius - (0.5 * penWidth), 0.0 ); } | ||
|
|
||
| //* return a QRectF with the appropriate size for a rectangle with a pen stroke |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 7f649eb5..19661a2f 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -39,6 +39,13 @@ function(generate_binary_resource target outfile) | ||
| set(RESOURCE_FILE ${RESOURCES_WORKING_DIR}/breeze-${target}.qrc) | ||
| set(BINARY_RESOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/breeze-${target}.rcc) | ||
|
|
||
| + # Use $<IF:$<BOOL:${MSVC}>,PATH,LD_LIBRARY_PATH> instead of ${pathVarName} once CMake 3.8 is minimum | ||
| + if(MSVC) | ||
| + set(pathVarName PATH) | ||
| + else() | ||
| + set(pathVarName LD_LIBRARY_PATH) | ||
| + endif() | ||
| + | ||
| get_target_property(QT_RCC_EXECUTABLE Qt5::rcc LOCATION) | ||
|
|
||
| add_custom_target(breeze-${target}-mkdir | ||
| @@ -53,7 +60,7 @@ function(generate_binary_resource target outfile) | ||
| ${RESOURCES_WORKING_DIR}/CMakeLists.txt | ||
| COMMAND ${QT_RCC_EXECUTABLE} --project -o ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc | ||
| COMMAND ${CMAKE_COMMAND} -E env | ||
| - $<IF:$<BOOL:${MSVC}>,PATH,LD_LIBRARY_PATH>=$<TARGET_FILE_DIR:Qt5::Core> | ||
| + ${pathVarName}=$<TARGET_FILE_DIR:Qt5::Core> | ||
| $<TARGET_FILE:qrcAlias> -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE} | ||
|
|
||
| WORKING_DIRECTORY ${RESOURCES_WORKING_DIR} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 155422d..59b6768 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -35,15 +35,16 @@ find_package(Canberra) | ||
| set_package_properties(Canberra PROPERTIES | ||
| PURPOSE "Needed to preview notification sounds" | ||
| TYPE OPTIONAL) | ||
| +set(Canberra_FOUND FALSE) | ||
| if (Canberra_FOUND) | ||
| add_definitions(-DHAVE_CANBERRA) | ||
| else() | ||
| # This is REQUIRED since you cannot tell CMake "either one of those two optional ones are required" | ||
| - find_package(Phonon4Qt5 4.6.60 NO_MODULE REQUIRED) | ||
| - set_package_properties(Phonon4Qt5 PROPERTIES | ||
| - DESCRIPTION "Qt-based audio library" | ||
| - PURPOSE "Needed to preview notification sounds when Canberra isn't available") | ||
| - add_definitions(-DHAVE_PHONON4QT5) | ||
| +# find_package(Phonon4Qt5 4.6.60 NO_MODULE REQUIRED) | ||
| +# set_package_properties(Phonon4Qt5 PROPERTIES | ||
| +# DESCRIPTION "Qt-based audio library" | ||
| +# PURPOSE "Needed to preview notification sounds when Canberra isn't available") | ||
| +# add_definitions(-DHAVE_PHONON4QT5) | ||
| endif() | ||
|
|
||
| # Includes | ||
| diff --git a/src/knotify-config.h.cmake b/src/knotify-config.h.cmake | ||
| index 1794afc..7917612 100644 | ||
| --- a/src/knotify-config.h.cmake | ||
| +++ b/src/knotify-config.h.cmake | ||
| @@ -1,7 +1,7 @@ | ||
| #ifndef KNOTIFY_CONFIG_H | ||
| #define KNOTIFY_CONFIG_H | ||
|
|
||
| -#cmakedefine01 HAVE_PHONON | ||
| +#cmakedefine HAVE_PHONON | ||
|
|
||
| #endif /* KNOTIFY_CONFIG_H */ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/src/Filter.h b/src/Filter.h | ||
| index 0dd98151..527e8540 100644 | ||
| --- a/src/Filter.h | ||
| +++ b/src/Filter.h | ||
| @@ -34,9 +34,6 @@ | ||
| // Konsole | ||
| #include "Character.h" | ||
|
|
||
| -// std | ||
| -#include <optional> | ||
| - | ||
| class QAction; | ||
|
|
||
| namespace Konsole { |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.