-
Notifications
You must be signed in to change notification settings - Fork 7.5k
[kf6widgetsaddons] New port #50698
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:kf6widgetsaddons
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
[kf6widgetsaddons] New port #50698
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
12 changes: 12 additions & 0 deletions
12
ports/kf6widgetsaddons/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,12 @@ | ||
| diff --git a/src/designer/CMakeLists.txt b/src/designer/CMakeLists.txt | ||
| index 1111111..2222222 100644 | ||
| --- a/src/designer/CMakeLists.txt | ||
| +++ b/src/designer/CMakeLists.txt | ||
| @@ -206,3 +206,7 @@ ecm_add_qtdesignerplugin(kwidgetsaddonswidgets | ||
| INSTALL_DESTINATION "${KDE_INSTALL_QTPLUGINDIR}/designer" | ||
| COMPONENT Devel | ||
| ) | ||
| + | ||
| +if(MSVC AND NOT BUILD_SHARED_LIBS) | ||
| + target_link_options(kwidgetsaddonswidgets PRIVATE /FORCE:MULTIPLE) | ||
| +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,40 @@ | ||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO KDE/kwidgetsaddons | ||
| REF "v${VERSION}" | ||
| SHA512 431705b493cab8247e61a10f0e57db26142adfdc96665fc37f2effc54953f6a58effd72a0ad371e519b12c910c1719f3193e51079b8b3543877bf2e1aa0ac336 | ||
| 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 | ||
| FEATURES | ||
| designerplugin BUILD_DESIGNERPLUGIN | ||
| INVERTED_FEATURES | ||
| translations KF_SKIP_PO_PROCESSING | ||
| ) | ||
|
|
||
| vcpkg_cmake_configure( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS | ||
| -DBUILD_TESTING=OFF | ||
| -DBUILD_PYTHON_BINDINGS=OFF | ||
| -DKDE_INSTALL_PLUGINDIR=plugins | ||
| -DKDE_INSTALL_QTPLUGINDIR=plugins | ||
| ${FEATURE_OPTIONS} | ||
| ) | ||
|
|
||
| vcpkg_cmake_install() | ||
| vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF6WidgetsAddons) | ||
| vcpkg_copy_pdbs() | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") | ||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") | ||
|
|
||
| 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,49 @@ | ||
| { | ||
| "name": "kf6widgetsaddons", | ||
| "version": "6.23.0", | ||
| "description": "Addons to QtWidgets", | ||
| "homepage": "https://invent.kde.org/frameworks/kwidgetsaddons", | ||
| "documentation": "https://api.kde.org/kwidgetsaddons-index.html", | ||
| "dependencies": [ | ||
| "ecm", | ||
| { | ||
| "name": "qtbase", | ||
| "default-features": false | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| } | ||
| ], | ||
| "features": { | ||
| "designerplugin": { | ||
| "description": "Build Qt Designer plugin", | ||
| "dependencies": [ | ||
| { | ||
| "name": "qttools", | ||
| "default-features": false, | ||
| "features": [ | ||
| "designer" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "translations": { | ||
| "description": "Build and install translations", | ||
| "dependencies": [ | ||
| { | ||
| "name": "qttools", | ||
| "host": true, | ||
| "default-features": false, | ||
| "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": "bcf8fd8afa48f8b11c42c91f50de45cfc818b91c", | ||
| "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 is almost certainly unsafe. Can you describe the linker error this is trying to mitigate and why this is acceptable?
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.