Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ports/qtbase/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
list(APPEND ${PORT}_PATCHES env.patch)
endif()

if("shared-mime-info" IN_LIST FEATURES)
list(APPEND ${PORT}_PATCHES use-shared-mime-info.patch)
endif()

list(APPEND ${PORT}_PATCHES
dont_force_cmakecache_latest.patch
)
Expand Down
31 changes: 31 additions & 0 deletions ports/qtbase/use-shared-mime-info.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
src/corelib/mimetypes/mimetypes_resources.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/corelib/mimetypes/mimetypes_resources.cmake b/src/corelib/mimetypes/mimetypes_resources.cmake
index 1bec50e4..d4d54763 100644
--- a/src/corelib/mimetypes/mimetypes_resources.cmake
+++ b/src/corelib/mimetypes/mimetypes_resources.cmake
@@ -7,17 +7,17 @@
# file with the same information

set(corelib_mimetypes_resource_file
- "${CMAKE_CURRENT_LIST_DIR}/3rdparty/tika-mimetypes.xml"
+ "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/mime/packages/freedesktop.org.xml"
)

function(corelib_add_mimetypes_resources target)
set(source_file "${corelib_mimetypes_resource_file}")
set_source_files_properties("${source_file}"
- PROPERTIES QT_RESOURCE_ALIAS "tika-mimetypes.xml"
+ PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
qt_internal_add_resource(${target} "mimetypes"
PREFIX
- "/qt-project.org/qmime/tika/packages"
+ "/qt-project.org/qmime/packages"
FILES
"${source_file}"
)
--
2.34.1

8 changes: 7 additions & 1 deletion ports/qtbase/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qtbase",
"version": "6.8.2",
"port-version": 1,
"port-version": 2,
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down Expand Up @@ -403,6 +403,12 @@
"description": "Enable Secure Transport",
"supports": "ios | osx"
},
"shared-mime-info": {
"description": "Use GPL licensed shared-mime-info port from freedesktop.org",
"dependencies": [
"shared-mime-info"
]
},
"sql": {
"description": "Qt Sql",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7698,7 +7698,7 @@
},
"qtbase": {
"baseline": "6.8.2",
"port-version": 1
"port-version": 2
},
"qtcharts": {
"baseline": "6.8.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtbase.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a146d4ea52111f036f5c746695fc74df54ce4b5f",
"version": "6.8.2",
"port-version": 2
},
{
"git-tree": "744273bb84e2107bb024f6d32e5c03890b4c4f2d",
"version": "6.8.2",
Expand Down