diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 87d68ac329a29f..a989671108ee7d 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -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 ) diff --git a/ports/qtbase/use-shared-mime-info.patch b/ports/qtbase/use-shared-mime-info.patch new file mode 100644 index 00000000000000..3bd2724f18836a --- /dev/null +++ b/ports/qtbase/use-shared-mime-info.patch @@ -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 + diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index f1381f933f6ece..18bf5a2835c107 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -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, @@ -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": [ diff --git a/versions/baseline.json b/versions/baseline.json index a84004f4e278fe..f380513b7456f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7698,7 +7698,7 @@ }, "qtbase": { "baseline": "6.8.2", - "port-version": 1 + "port-version": 2 }, "qtcharts": { "baseline": "6.8.2", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 2793d66702f6ff..266b1bec3eb60f 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a146d4ea52111f036f5c746695fc74df54ce4b5f", + "version": "6.8.2", + "port-version": 2 + }, { "git-tree": "744273bb84e2107bb024f6d32e5c03890b4c4f2d", "version": "6.8.2",