mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 04:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[qtbase] fix glib2 not found (#30379)

Browse Source 
* fix glib2 no found

* update version

* update version

* update version

* update version

* update version

* update version

* update version

* update version

* update verion

* update verion

* merge master

* version

* fix new error

* update version

* update version

* update version

* Update qtbase.json

---------

Co-authored-by: Jim Wang (Beyondsoft Corporation) <v-wangjim@microsoft.com>
This commit is contained in:
jim wang 2023-05-09 07:40:12 +08:00 committed by GitHub
parent 9a5e44fcc1
commit 4746870785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ports/qtbase/GLIB2-static.patch
View File

@ -73,3 +73,31 @@ index 24a194c..91c8e41 100644
include(FeatureSummary)
set_package_properties(GLIB2 PROPERTIES
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 7d52f48..2b1b221 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -25,7 +25,7 @@ endif()
qt_find_package(WrapSystemDoubleConversion
PROVIDED_TARGETS WrapSystemDoubleConversion::WrapSystemDoubleConversion
MODULE_NAME core QMAKE_LIB doubleconversion)
-qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib)
+qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE MODULE_NAME core QMAKE_LIB glib)
qt_find_package(ICU 50.1 COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data
MODULE_NAME core QMAKE_LIB icu)
diff --git a/src/network/configure.cmake b/src/network/configure.cmake
index aef7f15..21b0c1d 100644
--- a/src/network/configure.cmake
+++ b/src/network/configure.cmake
@@ -10,8 +10,8 @@
qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli)
qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy)
qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI MODULE_NAME network QMAKE_LIB gssapi)
-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE_NAME core QMAKE_LIB gobject)
-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio)
+qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE MODULE_NAME core QMAKE_LIB gobject)
+qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE MODULE_NAME core QMAKE_LIB gio)
#### Tests

10
ports/qtbase/cmake/qt_install_submodule.cmake
View File

@ -192,6 +192,16 @@ function(qt_cmake_configure)
QT_SYNCQT
QT_NO_FORCE_SET_CMAKE_BUILD_TYPE
${_qarg_OPTIONS_MAYBE_UNUSED}
INPUT_bundled_xcb_xinput
INPUT_freetype
INPUT_harfbuzz
INPUT_libjpeg
INPUT_libmd4c
INPUT_libpng
INPUT_opengl
INPUT_openssl
INPUT_xcb
INPUT_xkbcommon
)
set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE)
endfunction()

2
ports/qtbase/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "qtbase",
"version": "6.5.0",
"port-version": 1,
"port-version": 2,
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,

2
versions/baseline.json
View File

@ -6654,7 +6654,7 @@
},
"qtbase": {
"baseline": "6.5.0",
"port-version": 1
"port-version": 2
},
"qtcharts": {
"baseline": "6.5.0",

5
versions/q-/qtbase.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8a00cef259fdf1a9198f95e0618c98b7f1b21527",
"version": "6.5.0",
"port-version": 2
},
{
"git-tree": "a66d81c3d9432499f24c76df346a4daf5725f90b",
"version": "6.5.0",