Skip to content

Commit 248613e

Browse files
committed
depends: Factor out Qt modules' details
1 parent 0268f52 commit 248613e

File tree

3 files changed

+45
-21
lines changed

3 files changed

+45
-21
lines changed

depends/packages/qt.mk

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package=qt
2-
$(package)_version=6.7.3
3-
$(package)_download_path=https://download.qt.io/archive/qt/6.7/$($(package)_version)/submodules
4-
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
5-
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097
2+
include packages/qt_details.mk
3+
$(package)_version=$(qt_details_version)
4+
$(package)_download_path=$(qt_details_download_path)
5+
$(package)_file_name=$(qt_details_qtbase_file_name)
6+
$(package)_sha256_hash=$(qt_details_qtbase_sha256_hash)
77
$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_cursor libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
88
$(package)_patches := dont_hardcode_pwd.patch
99
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
@@ -15,26 +15,26 @@ $(package)_patches += qtbase_skip_tools.patch
1515
$(package)_patches += rcc_hardcode_timestamp.patch
1616
$(package)_patches += qttools_skip_dependencies.patch
1717

18-
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
19-
$(package)_qttranslations_sha256_hash=dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8
18+
$(package)_qttranslations_file_name=$(qt_details_qttranslations_file_name)
19+
$(package)_qttranslations_sha256_hash=$(qt_details_qttranslations_sha256_hash)
2020

21-
$(package)_qttools_file_name=qttools-$($(package)_suffix)
22-
$(package)_qttools_sha256_hash=f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f
21+
$(package)_qttools_file_name=$(qt_details_qttools_file_name)
22+
$(package)_qttools_sha256_hash=$(qt_details_qttools_sha256_hash)
2323

2424
$(package)_extra_sources := $($(package)_qttranslations_file_name)
2525
$(package)_extra_sources += $($(package)_qttools_file_name)
2626

27-
$(package)_top_download_path=https://code.qt.io/cgit/qt/qt5.git/plain
28-
$(package)_top_cmakelists_file_name=CMakeLists.txt
29-
$(package)_top_cmakelists_download_file=$($(package)_top_cmakelists_file_name)?h=$($(package)_version)
30-
$(package)_top_cmakelists_sha256_hash=9fb720a633c0c0a21c31fe62a34bf617726fed72480d4064f29ca5d6973d513f
31-
$(package)_top_cmake_download_path=$($(package)_top_download_path)/cmake
32-
$(package)_top_cmake_ecmoptionaladdsubdirectory_file_name=ECMOptionalAddSubdirectory.cmake
33-
$(package)_top_cmake_ecmoptionaladdsubdirectory_download_file=$($(package)_top_cmake_ecmoptionaladdsubdirectory_file_name)?h=$($(package)_version)
34-
$(package)_top_cmake_ecmoptionaladdsubdirectory_sha256_hash=97ee8bbfcb0a4bdcc6c1af77e467a1da0c5b386c42be2aa97d840247af5f6f70
35-
$(package)_top_cmake_qttoplevelhelpers_file_name=QtTopLevelHelpers.cmake
36-
$(package)_top_cmake_qttoplevelhelpers_download_file=$($(package)_top_cmake_qttoplevelhelpers_file_name)?h=$($(package)_version)
37-
$(package)_top_cmake_qttoplevelhelpers_sha256_hash=5ac2a7159ee27b5b86d26ecff44922e7b8f319aa847b7b5766dc17932fd4a294
27+
$(package)_top_download_path=$(qt_details_top_download_path)
28+
$(package)_top_cmakelists_file_name=$(qt_details_top_cmakelists_file_name)
29+
$(package)_top_cmakelists_download_file=$(qt_details_top_cmakelists_download_file)
30+
$(package)_top_cmakelists_sha256_hash=$(qt_details_top_cmakelists_sha256_hash)
31+
$(package)_top_cmake_download_path=$(qt_details_top_cmake_download_path)
32+
$(package)_top_cmake_ecmoptionaladdsubdirectory_file_name=$(qt_details_top_cmake_ecmoptionaladdsubdirectory_file_name)
33+
$(package)_top_cmake_ecmoptionaladdsubdirectory_download_file=$(qt_details_top_cmake_ecmoptionaladdsubdirectory_download_file)
34+
$(package)_top_cmake_ecmoptionaladdsubdirectory_sha256_hash=$(qt_details_top_cmake_ecmoptionaladdsubdirectory_sha256_hash)
35+
$(package)_top_cmake_qttoplevelhelpers_file_name=$(qt_details_top_cmake_qttoplevelhelpers_file_name)
36+
$(package)_top_cmake_qttoplevelhelpers_download_file=$(qt_details_top_cmake_qttoplevelhelpers_download_file)
37+
$(package)_top_cmake_qttoplevelhelpers_sha256_hash=$(qt_details_top_cmake_qttoplevelhelpers_sha256_hash)
3838

3939
$(package)_extra_sources += $($(package)_top_cmakelists_file_name)-$($(package)_version)
4040
$(package)_extra_sources += $($(package)_top_cmake_ecmoptionaladdsubdirectory_file_name)-$($(package)_version)

depends/packages/qt_details.mk

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
qt_details_version := 6.7.3
2+
qt_details_download_path := https://download.qt.io/archive/qt/6.7/$(qt_details_version)/submodules
3+
qt_details_suffix := everywhere-src-$(qt_details_version).tar.xz
4+
5+
qt_details_qtbase_file_name := qtbase-$(qt_details_suffix)
6+
qt_details_qtbase_sha256_hash := 8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097
7+
8+
qt_details_qttranslations_file_name := qttranslations-$(qt_details_suffix)
9+
qt_details_qttranslations_sha256_hash := dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8
10+
11+
qt_details_qttools_file_name := qttools-$(qt_details_suffix)
12+
qt_details_qttools_sha256_hash := f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f
13+
14+
qt_details_top_download_path := https://code.qt.io/cgit/qt/qt5.git/plain
15+
qt_details_top_cmakelists_file_name := CMakeLists.txt
16+
qt_details_top_cmakelists_download_file := $(qt_details_top_cmakelists_file_name)?h=$(qt_details_version)
17+
qt_details_top_cmakelists_sha256_hash := 9fb720a633c0c0a21c31fe62a34bf617726fed72480d4064f29ca5d6973d513f
18+
qt_details_top_cmake_download_path := $(qt_details_top_download_path)/cmake
19+
qt_details_top_cmake_ecmoptionaladdsubdirectory_file_name := ECMOptionalAddSubdirectory.cmake
20+
qt_details_top_cmake_ecmoptionaladdsubdirectory_download_file := $(qt_details_top_cmake_ecmoptionaladdsubdirectory_file_name)?h=$(qt_details_version)
21+
qt_details_top_cmake_ecmoptionaladdsubdirectory_sha256_hash := 97ee8bbfcb0a4bdcc6c1af77e467a1da0c5b386c42be2aa97d840247af5f6f70
22+
qt_details_top_cmake_qttoplevelhelpers_file_name := QtTopLevelHelpers.cmake
23+
qt_details_top_cmake_qttoplevelhelpers_download_file := $(qt_details_top_cmake_qttoplevelhelpers_file_name)?h=$(qt_details_version)
24+
qt_details_top_cmake_qttoplevelhelpers_sha256_hash := 5ac2a7159ee27b5b86d26ecff44922e7b8f319aa847b7b5766dc17932fd4a294

src/qt/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This directory contains the source code for the Bitcoin Core graphical user interface (GUI). It uses the [Qt](https://www1.qt.io/developers/) cross-platform framework.
22

3-
The current precise version for Qt is specified in [qt.mk](/depends/packages/qt.mk).
3+
The current precise version for Qt is specified in [qt_details.mk](/depends/packages/qt_details.mk).
44

55
## Compile and run
66

0 commit comments

Comments
 (0)