From 5c6121add16c71ac5214addd4c5a20e08c47938c Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 30 Mar 2023 10:00:05 +0200 Subject: [PATCH] depends: qt: remove translations --- contrib/depends/packages/native_qt.mk | 8 -------- contrib/depends/packages/qt.mk | 8 -------- contrib/depends/patches/native_qt/root_CMakeLists.txt | 2 +- contrib/depends/patches/qt/root_CMakeLists.txt | 2 +- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk index 8b204cb..372f4f4 100644 --- a/contrib/depends/packages/native_qt.mk +++ b/contrib/depends/packages/native_qt.mk @@ -18,9 +18,6 @@ $(package)_patches += qtbase-moc-ignore-gcc-macro.patch $(package)_patches += rcc_hardcode_timestamp.patch $(package)_patches += root_CMakeLists.txt -$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) -$(package)_qttranslations_sha256_hash=a52911e58374c15f36c84697021c865ff148f380acc7b83a3db8fc5cfabc18ca - $(package)_qttools_file_name=qttools-$($(package)_suffix) $(package)_qttools_sha256_hash=f959d0e91616ee16ca8bb843307214c4c90ebcd1283854f24c7b33eb88bbb418 @@ -33,7 +30,6 @@ $(package)_qtmultimedia_sha256_hash=873473fe7150082993dad04bec4c993f7a24af944969 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix) $(package)_qtshadertools_sha256_hash=e238b3494e25db4841cfa06db27ddd30e8241f25cbeeface6d7916fb34d1ee51 -$(package)_extra_sources = $($(package)_qttranslations_file_name) $(package)_extra_sources += $($(package)_qttools_file_name) $(package)_extra_sources += $($(package)_qtsvg_file_name) $(package)_extra_sources += $($(package)_qtmultimedia_file_name) @@ -139,7 +135,6 @@ endef define $(package)_fetch_cmds $(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \ -$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttranslations_file_name),$($(package)_qttranslations_file_name),$($(package)_qttranslations_sha256_hash)) && \ $(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttools_file_name),$($(package)_qttools_file_name),$($(package)_qttools_sha256_hash)) && \ $(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtsvg_file_name),$($(package)_qtsvg_file_name),$($(package)_qtsvg_sha256_hash)) && \ $(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtmultimedia_file_name),$($(package)_qtmultimedia_file_name),$($(package)_qtmultimedia_sha256_hash)) && \ @@ -149,7 +144,6 @@ endef define $(package)_extract_cmds mkdir -p $($(package)_extract_dir) && \ echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \ - echo "$($(package)_qttranslations_sha256_hash) $($(package)_source_dir)/$($(package)_qttranslations_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ echo "$($(package)_qttools_sha256_hash) $($(package)_source_dir)/$($(package)_qttools_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ echo "$($(package)_qtsvg_sha256_hash) $($(package)_source_dir)/$($(package)_qtsvg_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ echo "$($(package)_qtmultimedia_sha256_hash) $($(package)_source_dir)/$($(package)_qtmultimedia_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ @@ -157,8 +151,6 @@ define $(package)_extract_cmds $(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \ mkdir qtbase && \ $(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source) -C qtbase && \ - mkdir qttranslations && \ - $(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttranslations_file_name) -C qttranslations && \ mkdir qttools && \ $(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools && \ mkdir qtsvg && \ diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk index a332089..f6fcc83 100644 --- a/contrib/depends/packages/qt.mk +++ b/contrib/depends/packages/qt.mk @@ -29,9 +29,6 @@ $(package)_patches += v4l2.patch $(package)_patches += windows_func_fix.patch $(package)_patches += WindowsToolchain.cmake -$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) -$(package)_qttranslations_sha256_hash=a52911e58374c15f36c84697021c865ff148f380acc7b83a3db8fc5cfabc18ca - $(package)_qttools_file_name=qttools-$($(package)_suffix) $(package)_qttools_sha256_hash=f959d0e91616ee16ca8bb843307214c4c90ebcd1283854f24c7b33eb88bbb418 @@ -47,7 +44,6 @@ $(package)_qtmultimedia_sha256_hash=873473fe7150082993dad04bec4c993f7a24af944969 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix) $(package)_qtshadertools_sha256_hash=e238b3494e25db4841cfa06db27ddd30e8241f25cbeeface6d7916fb34d1ee51 -$(package)_extra_sources = $($(package)_qttranslations_file_name) $(package)_extra_sources += $($(package)_qttools_file_name) $(package)_extra_sources += $($(package)_qtsvg_file_name) $(package)_extra_sources += $($(package)_qtwebsockets_file_name) @@ -211,7 +207,6 @@ endef define $(package)_fetch_cmds $(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \ -$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttranslations_file_name),$($(package)_qttranslations_file_name),$($(package)_qttranslations_sha256_hash)) && \ $(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttools_file_name),$($(package)_qttools_file_name),$($(package)_qttools_sha256_hash)) && \ $(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtsvg_file_name),$($(package)_qtsvg_file_name),$($(package)_qtsvg_sha256_hash)) && \ $(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtwebsockets_file_name),$($(package)_qtwebsockets_file_name),$($(package)_qtwebsockets_sha256_hash)) && \ @@ -222,7 +217,6 @@ endef define $(package)_extract_cmds mkdir -p $($(package)_extract_dir) && \ echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \ - echo "$($(package)_qttranslations_sha256_hash) $($(package)_source_dir)/$($(package)_qttranslations_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ echo "$($(package)_qttools_sha256_hash) $($(package)_source_dir)/$($(package)_qttools_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ echo "$($(package)_qtsvg_sha256_hash) $($(package)_source_dir)/$($(package)_qtsvg_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ echo "$($(package)_qtwebsockets_sha256_hash) $($(package)_source_dir)/$($(package)_qtwebsockets_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \ @@ -231,8 +225,6 @@ define $(package)_extract_cmds $(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \ mkdir qtbase && \ $(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source) -C qtbase && \ - mkdir qttranslations && \ - $(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttranslations_file_name) -C qttranslations && \ mkdir qttools && \ $(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools && \ mkdir qtsvg && \ diff --git a/contrib/depends/patches/native_qt/root_CMakeLists.txt b/contrib/depends/patches/native_qt/root_CMakeLists.txt index 2a7d35c..2c2d731 100644 --- a/contrib/depends/patches/native_qt/root_CMakeLists.txt +++ b/contrib/depends/patches/native_qt/root_CMakeLists.txt @@ -32,7 +32,7 @@ list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin") set(QT_NO_CREATE_TARGETS TRUE) set(QT_SUPERBUILD TRUE) -set(QT_BUILD_SUBMODULES "qtbase;qttranslations;qtsvg;qtshadertools;qtmultimedia" CACHE STRING "Submodules to build") +set(QT_BUILD_SUBMODULES "qtbase;qtsvg;qtshadertools;qtmultimedia" CACHE STRING "Submodules to build") foreach(module IN LISTS QT_BUILD_SUBMODULES) message(NOTICE "Configuring '${module}'") diff --git a/contrib/depends/patches/qt/root_CMakeLists.txt b/contrib/depends/patches/qt/root_CMakeLists.txt index 41247a6..a861c9b 100644 --- a/contrib/depends/patches/qt/root_CMakeLists.txt +++ b/contrib/depends/patches/qt/root_CMakeLists.txt @@ -32,7 +32,7 @@ list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin") set(QT_NO_CREATE_TARGETS TRUE) set(QT_SUPERBUILD TRUE) -set(QT_BUILD_SUBMODULES "qtbase;qttranslations;qtsvg;qtwebsockets;qtshadertools;qtmultimedia" CACHE STRING "Submodules to build") +set(QT_BUILD_SUBMODULES "qtbase;qtsvg;qtwebsockets;qtshadertools;qtmultimedia" CACHE STRING "Submodules to build") foreach(module IN LISTS QT_BUILD_SUBMODULES) message(NOTICE "Configuring '${module}'")