-
Notifications
You must be signed in to change notification settings - Fork 7.5k
[kf6syntaxhighlighting] New port #50696
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
Draft
drdanz
wants to merge
1
commit into
microsoft:master
Choose a base branch
from
drdanz:kf6syntaxhighlighting
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
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
46 changes: 46 additions & 0 deletions
46
ports/kf6syntaxhighlighting/001_fix_lnk2005_windows_static.patch
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,46 @@ | ||
| diff --git a/examples/codeeditor/CMakeLists.txt b/examples/codeeditor/CMakeLists.txt | ||
| --- a/examples/codeeditor/CMakeLists.txt | ||
| +++ b/examples/codeeditor/CMakeLists.txt | ||
| @@ -1,4 +1,7 @@ | ||
| if(TARGET Qt6::Widgets) | ||
| add_executable(codeeditor codeeditor.cpp main.cpp) | ||
| target_link_libraries(codeeditor Qt6::Widgets KF6SyntaxHighlighting) | ||
| + if(MSVC AND NOT BUILD_SHARED_LIBS) | ||
| + target_link_options(codeeditor PRIVATE /FORCE:MULTIPLE) | ||
| + endif() | ||
| endif() | ||
| diff --git a/examples/codepdfprinter/CMakeLists.txt b/examples/codepdfprinter/CMakeLists.txt | ||
| --- a/examples/codepdfprinter/CMakeLists.txt | ||
| +++ b/examples/codepdfprinter/CMakeLists.txt | ||
| @@ -1,4 +1,7 @@ | ||
| if(TARGET Qt6::Widgets AND TARGET Qt6::PrintSupport) | ||
| add_executable(codepdfprinter codepdfprinter.cpp main.cpp) | ||
| target_link_libraries(codepdfprinter Qt6::Widgets Qt6::PrintSupport KF6SyntaxHighlighting) | ||
| + if(MSVC AND NOT BUILD_SHARED_LIBS) | ||
| + target_link_options(codepdfprinter PRIVATE /FORCE:MULTIPLE) | ||
| + endif() | ||
| endif() | ||
| diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt | ||
| --- a/src/cli/CMakeLists.txt | ||
| +++ b/src/cli/CMakeLists.txt | ||
| @@ -2,4 +2,8 @@ | ||
| ecm_mark_nongui_executable(ksyntaxhighlighter6) | ||
| target_link_libraries(ksyntaxhighlighter6 KF6SyntaxHighlighting) | ||
|
|
||
| +if(MSVC AND NOT BUILD_SHARED_LIBS) | ||
| + target_link_options(ksyntaxhighlighter6 PRIVATE /FORCE:MULTIPLE) | ||
| +endif() | ||
| + | ||
| install(TARGETS ksyntaxhighlighter6 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) | ||
| diff --git a/src/indexer/CMakeLists.txt b/src/indexer/CMakeLists.txt | ||
| --- a/src/indexer/CMakeLists.txt | ||
| +++ b/src/indexer/CMakeLists.txt | ||
| @@ -33,4 +33,8 @@ | ||
| else() | ||
| target_link_libraries(katehighlightingindexer Qt6::Core) | ||
| endif() | ||
| + | ||
| + if(MSVC AND NOT BUILD_SHARED_LIBS) | ||
| + target_link_options(katehighlightingindexer PRIVATE /FORCE:MULTIPLE) | ||
| + endif() | ||
| endif() | ||
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,45 @@ | ||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO KDE/syntax-highlighting | ||
| REF "v${VERSION}" | ||
| SHA512 a1ff5ae92624000baee9eea8e5d48040a967fd085482e6648c913d343a1d9d67b142c0867ad308100f0b7645237de15e78889b480d76ca25fad44b228aa0d957 | ||
| HEAD_REF master | ||
| PATCHES | ||
| 001_fix_lnk2005_windows_static.patch | ||
| ) | ||
|
|
||
| # Prevent KDEClangFormat from writing to source effectively blocking parallel configure | ||
| file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") | ||
|
|
||
| vcpkg_check_features( | ||
| OUT_FEATURE_OPTIONS FEATURE_OPTIONS | ||
| INVERTED_FEATURES | ||
| translations KF_SKIP_PO_PROCESSING | ||
| ) | ||
|
|
||
| vcpkg_find_acquire_program(PERL) | ||
| get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) | ||
| vcpkg_add_to_path("${PERL_EXE_PATH}") | ||
|
|
||
| vcpkg_cmake_configure( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS | ||
| -DBUILD_TESTING=OFF | ||
| -DKDE_INSTALL_QMLDIR=qml | ||
| ${FEATURE_OPTIONS} | ||
| ) | ||
|
|
||
| vcpkg_cmake_install(ADD_BIN_TO_PATH) | ||
| vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF6SyntaxHighlighting) | ||
| vcpkg_copy_pdbs() | ||
|
|
||
| vcpkg_copy_tools( | ||
| TOOL_NAMES ksyntaxhighlighter6 | ||
| AUTO_CLEAN | ||
| ) | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") | ||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") | ||
|
|
||
| file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") | ||
| vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) |
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,45 @@ | ||
| { | ||
| "name": "kf6syntaxhighlighting", | ||
| "version": "6.23.0", | ||
| "description": "Syntax highlighting engine for Kate syntax definitions", | ||
| "homepage": "https://invent.kde.org/frameworks/syntax-highlighting", | ||
| "documentation": "https://api.kde.org/ksyntaxhighlighting-index.html", | ||
| "supports": "!android & !(windows & arm64)", | ||
| "dependencies": [ | ||
| "ecm", | ||
| { | ||
| "name": "qtbase", | ||
| "default-features": false | ||
| }, | ||
| { | ||
| "name": "qttools", | ||
| "host": true, | ||
| "default-features": false, | ||
| "features": [ | ||
| "linguist" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| } | ||
| ], | ||
| "features": { | ||
| "translations": { | ||
| "description": "Build and install translation files", | ||
| "dependencies": [ | ||
| { | ||
| "name": "qttools", | ||
| "host": true, | ||
| "features": [ | ||
| "linguist" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
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,9 @@ | ||
| { | ||
| "versions": [ | ||
| { | ||
| "git-tree": "c3530a130de8f576a35391554f42a36b730bce78", | ||
| "version": "6.23.0", | ||
| "port-version": 0 | ||
| } | ||
| ] | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems almost certainly incorrect. Can you describe the linker error that this is trying to work around and why this attempt is safe?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From my understanding, Qt changed something in some recent version, and the functions in removed_api.cpp, are not inlined in windows static builds, so this causes LNK2005 duplicate symbol errors. I think that's a bug in the qt, I'm trying to see if I can fix it in the qtbase port instead, see #50859.