From 26fb448bbc7257d412c4d4ecb60d9339ca5b5a61 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Thu, 30 Nov 2023 00:30:22 +0000 Subject: [PATCH] Fix #846: Switch to Qt 6.6.1 for macOS and Windows With this commit macOS and Windows builds switch to Qt 6.6.1. Here is the release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md PiperOrigin-RevId: 586486141 --- 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 1d57542cd..1cf361327 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.0](https://download.qt.io/archive/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz) + * [Qt 6.6.1](https://download.qt.io/archive/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.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 814f2480f..1c596dfcc 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.0](https://download.qt.io/archive/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz) + * [Qt 6.6.1](https://download.qt.io/archive/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz) * [WiX 3.14.0.6526](https://wixtoolset.org/downloads/v3.14.0.6526/wix314-binaries.zip) * [git submodules](../.gitmodules) diff --git a/src/build_tools/build_qt.py b/src/build_tools/build_qt.py index a13be2141..5408dc0f2 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.0.tar.xz + src/third_party_cache/qtbase-everywhere-src-6.6.1.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.0.tar.xz') + 'third_party_cache', 'qtbase-everywhere-src-6.6.1.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 cb410e475..2bed02796 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.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz', - size=48350308, - sha256='039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e', + 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', ) WIX = ArchiveInfo(