-
Notifications
You must be signed in to change notification settings - Fork 7.6k
[many ports] Update existing KF5 frameworks to 5.75 #13467
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
75 commits
Select commit
Hold shift + click to select a range
e10a483
Update KF5 framework to 5.73
wrobelda 8703c24
Add kf5auth port
wrobelda 760bd50
Revert "Add kf5auth port"
wrobelda f1ac3db
Add kf5globalaccel port
wrobelda 0d9ca95
Revert "Add kf5globalaccel port"
wrobelda 26d8897
[ecm] use where possible
wrobelda 508b8c5
[kf5holidays] use PORT placeholder where possible
wrobelda 836bf71
[kf5syntaxhighlighting] use PORT placeholder where possible
wrobelda f2a9740
[kf5plotting] use PORT placeholder where possible
wrobelda 6ad1abd
[kf5crash] fix logical condition in the patch
wrobelda c3f6c72
[kf5crash] logical condition again, include other BSDs
wrobelda 92adab8
[kf5i18n] acquire python3
wrobelda 96a82ce
[kf5i18n] remove vcpk cmake wrapper added mistakenly
wrobelda 5d457b2
Update KF5 framework to 5.73
wrobelda 3bb88f9
Add kf5auth port
wrobelda 22e20ff
Revert "Add kf5auth port"
wrobelda 48070a3
Add kf5globalaccel port
wrobelda 00f8aff
Revert "Add kf5globalaccel port"
wrobelda b282482
[ecm] use where possible
wrobelda 010fe68
[kf5holidays] use PORT placeholder where possible
wrobelda f436e60
[kf5syntaxhighlighting] use PORT placeholder where possible
wrobelda 8f7fe1e
[kf5plotting] use PORT placeholder where possible
wrobelda f2817b4
[kf5crash] fix logical condition in the patch
wrobelda 978599a
[kf5crash] logical condition again, include other BSDs
wrobelda 105ee6f
[kf5i18n] acquire python3
wrobelda a864f8c
[kf5i18n] remove vcpk cmake wrapper added mistakenly
wrobelda afdcb84
Merge branch 'master' of github.com:wrobelda/vcpkg into master
wrobelda df06366
Merge branch 'master' of https://github.com/microsoft/vcpkg into HEAD
ras0219-msft 8246961
[ecm] Remove 'skip' from windows baseline
ras0219-msft 3748d85
Fixed KF5ItemModel for windows
hellozee 359e515
Merge branch 'master' of github.com:wrobelda/vcpkg into master
wrobelda d0b2579
[kf5syntaxhighlighting] fix Windows build
wrobelda 17d0f7f
Fixed k5syntaxhighlighting for windows
hellozee 8d2b80e
Merge remote-tracking branch 'origin/master'
wrobelda 7eadd5d
[kf5plotting] fix license files
wrobelda c8dac78
[kf5archive] fix license files
wrobelda 96f6102
[kf5*] update to 5.75.0
wrobelda 1fcdc95
[kf5holidays] fix sha sum
wrobelda 8db6de5
[kf5syntaxhighlighting] fix licensing
wrobelda e092534
[kf5itemviews] fix windows static build
wrobelda 0d737ab
[kf5widgetsaddons] fix windows static build
wrobelda 61b4b69
[kf5completion] fix windows static build
wrobelda be68bb2
[kf5*] fix windows static build
wrobelda a4c5bbe
[kf5i18n] fix windows static build
wrobelda ce87917
[kf5windowsystem] require libxcb-res0-dev
wrobelda ff5f07c
[kf5windowsystem] depend on qt5-x11extras
wrobelda 1e6d717
Merge remote-tracking branch 'origin/master'
wrobelda cd172c4
[qt5] fix brotli reference
wrobelda a3e9fa2
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal df399a8
Delete duplicate apt entries.
BillyONeal 7a52f9a
Merge remote-tracking branch 'origin/master'
wrobelda 2de3a7d
Merge branch 'master' of github.com:wrobelda/vcpkg
wrobelda 8a6977c
Merge remote-tracking branch 'origin/master'
wrobelda e0be66d
kf5crash: fix linux build
wrobelda a986ee2
kf5i18n: fix Linux build
wrobelda 4e403ee
ecm: do not override custom clang format files
wrobelda f36e1d6
kf5i18n: fix Windows build
wrobelda dc36293
[kf5*] update versions
wrobelda f32f60b
[kf5i18n] fix logical NOT
wrobelda d57868d
[kf5syntaxhighlighting] disable parallel configure
wrobelda c2be313
[kf5*] update versions
wrobelda 1f0752d
[kf5*] convert CONTROL to manifest
wrobelda 9407276
[kf5*] update versions
wrobelda c8cae02
Merge remote-tracking branch 'origin/master'
wrobelda 968eaf5
[kf5*] update versioning scheme
wrobelda 5e3c5aa
[ecm] syntax formatting
wrobelda f4a19f2
[kf5syntaxhighlighting] syntax formatting
wrobelda a0e0a4c
[kf5holidays] syntax formatting
wrobelda 3bac05c
[kf5archive] restore original line order
wrobelda cf054e0
[kf5holidays] restore CRLF
wrobelda d10df4e
[kf5archive] restore CRLF
wrobelda b144c5d
[kf5syntaxhighlighting] syntax formatting
wrobelda 5b7e011
[kf5syntaxhighlighting] quotations
wrobelda 514fe86
[kf5syntaxhighlighting] fix \bin removal redundancy
wrobelda bd31fe6
[kf5*] update versions
wrobelda File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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,33 @@ | ||
| From 0d5ed9bb9117f6526691b3572bf85090efbeed4a Mon Sep 17 00:00:00 2001 | ||
| From: Alexander Lohnau <alexander.lohnau@gmx.de> | ||
| Date: Sat, 30 Jan 2021 13:44:07 +0100 | ||
| Subject: [PATCH] KDEClangFormat: Do not override custom clang-format files | ||
|
|
||
| --- | ||
| kde-modules/KDEClangFormat.cmake | 13 ++++++++++++- | ||
| 1 file changed, 12 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/kde-modules/KDEClangFormat.cmake b/kde-modules/KDEClangFormat.cmake | ||
| index 6cdbd2b5..995f03ad 100644 | ||
| --- a/kde-modules/KDEClangFormat.cmake | ||
| +++ b/kde-modules/KDEClangFormat.cmake | ||
| @@ -35,7 +35,18 @@ find_program(KDE_CLANG_FORMAT_EXECUTABLE clang-format) | ||
|
|
||
| # instantiate our clang-format file, must be in source directory for tooling if we have the tool | ||
| if(KDE_CLANG_FORMAT_EXECUTABLE) | ||
| - configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format @ONLY) | ||
| + set(CLANG_FORMAT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format) | ||
| + if (EXISTS ${CLANG_FORMAT_FILE}) | ||
| + file(READ ${CLANG_FORMAT_FILE} CLANG_FORMAT_CONTENTS LIMIT 128) | ||
| + string(FIND "${CLANG_FORMAT_CONTENTS}" "SPDX-FileCopyrightText: 2019 Christoph Cullmann" matchres) | ||
| + if(${matchres} EQUAL -1) | ||
| + message(WARNING "The .clang-format file already exists. Please remove it in order to use the file provided by ECM") | ||
| + else() | ||
| + configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) | ||
| + endif() | ||
| + else() | ||
| + configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) | ||
| + endif() | ||
| endif() | ||
|
|
||
| # formatting target |
This file contains hidden or 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 hidden or 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,6 @@ | ||
| { | ||
| "name": "ecm", | ||
| "version": "5.75.0", | ||
| "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", | ||
| "homepage": "https://github.com/KDE/extra-cmake-modules" | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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,12 @@ | ||
| { | ||
| "name": "kf5archive", | ||
| "version": "5.75.0", | ||
| "description": "File compression", | ||
| "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", | ||
| "dependencies": [ | ||
| "bzip2", | ||
| "ecm", | ||
| "qt5-base", | ||
| "zlib" | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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,12 @@ | ||
| { | ||
| "name": "kf5completion", | ||
| "version": "5.75.0", | ||
| "description": "Text completion helpers and widgets", | ||
| "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", | ||
| "dependencies": [ | ||
| "ecm", | ||
| "kf5config", | ||
| "kf5widgetsaddons", | ||
| "qt5-tools" | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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,11 @@ | ||
| { | ||
| "name": "kf5config", | ||
| "version": "5.75.0", | ||
| "description": "Configuration system", | ||
| "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", | ||
| "dependencies": [ | ||
| "ecm", | ||
| "qt5-base", | ||
| "qt5-tools" | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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,11 @@ | ||
| { | ||
| "name": "kf5coreaddons", | ||
| "version": "5.75.0", | ||
| "description": "Addons to QtCore", | ||
| "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", | ||
| "dependencies": [ | ||
| "ecm", | ||
| "qt5-base", | ||
| "qt5-tools" | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 |
|---|---|---|
| @@ -1,13 +1,15 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 8a9d1c6..0d5fb3f 100644 | ||
| index 8c66d85..f2d89cb 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -12,7 +12,7 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA | ||
| set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) | ||
|
|
||
| set(REQUIRED_QT_VERSION 5.11.0) | ||
| -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) | ||
| +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core X11Extras) | ||
| include(KDEInstallDirs) | ||
| @@ -17,8 +17,9 @@ include(KDEInstallDirs) | ||
| include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) | ||
| include(KDECMakeSettings) | ||
|
|
||
| -if (NOT APPLE) | ||
| +if (UNIX AND NOT APPLE) | ||
| find_package(X11) | ||
| + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS X11Extras) | ||
| endif() | ||
|
|
||
| set(HAVE_X11 ${X11_FOUND}) |
This file contains hidden or 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 hidden or 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,16 @@ | ||
| { | ||
| "name": "kf5crash", | ||
| "version": "5.75.0", | ||
| "description": "KCrash provides support for intercepting and handling application crashes.", | ||
| "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", | ||
| "supports": "linux", | ||
| "dependencies": [ | ||
| "ecm", | ||
| "kf5coreaddons", | ||
| "kf5windowsystem", | ||
| { | ||
| "name": "qt5-x11extras", | ||
| "platform": "linux" | ||
| } | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 @@ | ||
| { | ||
| "name": "kf5guiaddons", | ||
| "version": "5.75.0", | ||
| "description": "Addons to QtGui", | ||
| "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", | ||
| "dependencies": [ | ||
| "ecm", | ||
| "qt5-tools", | ||
| { | ||
| "name": "qt5-winextras", | ||
| "platform": "windows" | ||
| }, | ||
| { | ||
| "name": "qt5-x11extras", | ||
| "platform": "linux" | ||
| } | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.