From 78aee2ace976c248e6929bd00d25bfb4227ad487 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Sat, 24 Feb 2024 04:56:07 +0000 Subject: [PATCH] Fix #877: Switch to Qt 6.6.2 for macOS and Windows With this commit macOS and Windows builds switch to Qt 6.6.2. Here is the release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md PiperOrigin-RevId: 609914103 --- docs/build_mozc_in_osx.md | 2 +- docs/build_mozc_in_windows.md | 2 +- src/build_tools/build_qt.py | 4 ++-- src/build_tools/update_deps.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/build_mozc_in_osx.md b/docs/build_mozc_in_osx.md index 1cf361327..a4cc2b21c 100644 --- a/docs/build_mozc_in_osx.md +++ b/docs/build_mozc_in_osx.md @@ -71,7 +71,7 @@ python build_tools/update_deps.py In this step, additional build dependencies will be downloaded. * [Ninja 1.11.0](https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-mac.zip) - * [Qt 6.6.1](https://download.qt.io/archive/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz) + * [Qt 6.6.2](https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz) * [git submodules](../.gitmodules) You can specify `--noqt` option if you would like to use your own Qt binaries. diff --git a/docs/build_mozc_in_windows.md b/docs/build_mozc_in_windows.md index 32e4670a9..6bb0846bc 100644 --- a/docs/build_mozc_in_windows.md +++ b/docs/build_mozc_in_windows.md @@ -67,7 +67,7 @@ python build_tools/update_deps.py In this step, additional build dependencies will be downloaded. * [Ninja 1.11.0](https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-win.zip) - * [Qt 6.6.1](https://download.qt.io/archive/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz) + * [Qt 6.6.2](https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz) * [WiX 3.14](https://github.com/wixtoolset/wix3/releases/download/wix314rtm/wix314-binaries.zip) * [git submodules](../.gitmodules) diff --git a/src/build_tools/build_qt.py b/src/build_tools/build_qt.py index 5408dc0f2..ad6977a31 100755 --- a/src/build_tools/build_qt.py +++ b/src/build_tools/build_qt.py @@ -37,7 +37,7 @@ By default, this script assumes that Qt archives are stored as - src/third_party_cache/qtbase-everywhere-src-6.6.1.tar.xz + src/third_party_cache/qtbase-everywhere-src-6.6.2.tar.xz and Qt src files that are necessary to build Mozc will be checked out into @@ -69,7 +69,7 @@ ABS_QT_DEST_DIR = ABS_MOZC_SRC_DIR.joinpath('third_party', 'qt') # The archive filename should be consistent with update_deps.py. ABS_QT6_ARCHIVE_PATH = ABS_MOZC_SRC_DIR.joinpath( - 'third_party_cache', 'qtbase-everywhere-src-6.6.1.tar.xz') + 'third_party_cache', 'qtbase-everywhere-src-6.6.2.tar.xz') ABS_DEFAULT_NINJA_DIR = ABS_MOZC_SRC_DIR.joinpath('third_party', 'ninja') diff --git a/src/build_tools/update_deps.py b/src/build_tools/update_deps.py index 01d5f0373..07f261e32 100644 --- a/src/build_tools/update_deps.py +++ b/src/build_tools/update_deps.py @@ -81,9 +81,9 @@ def __hash__(self): QT6 = ArchiveInfo( - url='https://download.qt.io/archive/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz', - size=48370760, - sha256='450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7', + url='https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz', + size=48689304, + sha256='b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b', ) WIX = ArchiveInfo(