Skip to content

Commit 3dcd59d

Browse files
CyanoHaoCyanoHao
committed
bump versions
1 parent 17a9934 commit 3dcd59d

File tree

10 files changed

+122
-130
lines changed

10 files changed

+122
-130
lines changed

‎module/checksum.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
11

22
CHECKSUMS = {
3-
'binutils-2.43.1.tar.zst': 'ad1b625031099c8ac09c7864bf9d352f908510de4bd25cf50ff21022bc66f7ca',
3+
'binutils-2.45.1.tar.zst': '5249c7eb75aed113091aae5418903109e4651d81cb974d6aec274607dfe988bc',
44

5-
'dbus-1.14.10.tar.xz': 'ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f',
5+
'dbus-1.16.2.tar.xz': '0ba2a1a4b16afe7bceb2c07e9ce99a8c2c3508e5dec290dbb643384bd6beb7e2',
66

7-
'expat-2.6.4.tar.xz': 'a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee',
7+
'expat-2.7.3.tar.xz': '71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f',
88

9-
'fcitx5-qt-5.1.8.tar.gz': 'a09fb653ab855424a5a92c6a634c3726fa19ae85ca7c24716784b3ddd136f201',
9+
'fcitx5-qt-5.1.12.tar.gz': '1852a15635961a6b1d109f401fddf96d5cee0c8d45fe4ee73c585c6c53115c5a',
1010

11-
'fontconfig-2.15.0.tar.gz': 'f5f359d6332861bd497570848fcb42520964a9e83d5e3abe397b6b6db9bcaaf4',
11+
'fontconfig-2.17.1.tar.xz': '9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541',
1212

13-
'freetype-2.13.3.tar.xz': '0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289',
13+
'freetype-2.14.1.tar.xz': '32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc',
1414

15-
'fuse-3.16.2.tar.gz': 'f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87',
15+
'fuse-3.18.1.tar.gz': 'dd395c88f29c7540bbdd0b830260ab8092ccb241bb6e66f603643f715fb9322c',
1616

17-
'gcc-14.2.0.tar.xz': 'a7b39bc69cbf9e25826c5a60ab26477001f7c08d85cec04bc0e29cabed6f3cc9',
17+
'gcc-15.2.0.tar.xz': '438fd996826b0c82485a29da03a72d71d6e3541a83ec702df4271f6fe025d24e',
1818

1919
'gmp-6.3.0.tar.zst': '7f55d73f472c29cc14d7fa985f3654d48829415b649eaf61646b7b33f2a80e27',
2020

21-
'harfbuzz-10.1.0.tar.xz': '6ce3520f2d089a33cef0fc48321334b8e0b72141f6a763719aaaecd2779ecb82',
21+
'harfbuzz-12.3.0.tar.xz': '8660ebd3c27d9407fc8433b5d172bafba5f0317cb0bb4339f28e5370c93d42b7',
2222

23-
'libX11-1.8.10.tar.xz': '2b3b3dad9347db41dca56beb7db5878f283bde1142f04d9f8e478af435dfdc53',
23+
'libX11-1.8.12.tar.xz': 'fa026f9bb0124f4d6c808f9aef4057aad65e7b35d8ff43951cef0abe06bb9a9a',
2424

25-
'libXau-1.0.11.tar.xz': 'f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb',
25+
'libXau-1.0.12.tar.xz': '74d0e4dfa3d39ad8939e99bda37f5967aba528211076828464d2777d477fc0fb',
2626

27-
'libffi-3.4.6.tar.gz': 'b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e',
27+
'libffi-3.5.2.tar.gz': 'f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc',
2828

29-
'libpng-1.6.44.tar.xz': '60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e',
29+
'libpng-1.6.53.tar.xz': '1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4',
3030

3131
'libxcb-1.17.0.tar.xz': '599ebf9996710fea71622e6e184f3a8ad5b43d0e5fa8c4e407123c88a59a6d55',
3232

33-
'libxkbcommon-1.7.0.tar.xz': '65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247',
33+
'libxkbcommon-xkbcommon-1.13.1.tar.gz': 'aeb951964c2f7ecc08174cb5517962d157595e9e3f38fc4a130b91dc2f9fec18',
3434

35-
'libxml2-2.13.5.tar.xz': '74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6',
35+
'libxml2-2.15.1.tar.xz': 'c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c',
3636

37-
'linux-headers-4.19.88-2.tar.xz': 'dc7abf734487553644258a3822cfd429d74656749e309f2b25f09f4282e05588',
37+
'linux-6.18.3.tar.xz': '7a8879167b89c4bae077d6f39c4f2130769f05dbdad2aad914adab9afb7d7f9a',
3838

3939
'mimalloc-3.0.11.tar.gz': 'c2cadf7f0ff007f63be3b6cf99855abfc5aaff7f34bdd408b405d5f7b63f8561',
4040

4141
'mpc-1.3.1.tar.gz': 'ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8',
4242

43-
'mpfr-4.2.1.tar.xz': '277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2',
43+
'mpfr-4.2.2.tar.xz': 'b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01',
4444

4545
'musl-1.1.24.tar.gz': '1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3',
4646
'musl-1.2.5.tar.gz': 'a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4',
4747

4848
'pkgconf-pkgconf-2.5.1.tar.gz': '79721badcad1987dead9c3609eb4877ab9b58821c06bdacb824f2c8897c11f2a',
4949

50-
'qtbase-everywhere-src-6.8.1.tar.xz': '40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf',
50+
'qtbase-everywhere-src-6.9.2.tar.xz': '44be9c9ecfe04129c4dea0a7e1b36ad476c9cc07c292016ac98e7b41514f2440',
5151

52-
'qtsvg-everywhere-src-6.8.1.tar.xz': '3d0de73596e36b2daa7c48d77c4426bb091752856912fba720215f756c560dd0',
52+
'qtsvg-everywhere-src-6.9.2.tar.xz': 'd984cab8f26334aa1c15e5b8f0cd9f1b7c0c1289fe0b68c1c84ab469b75605a5',
5353

54-
'qttools-everywhere-src-6.8.1.tar.xz': '9d43d409be08b8681a0155a9c65114b69c9a3fc11aef6487bb7fdc5b283c432d',
54+
'qttools-everywhere-src-6.9.2.tar.xz': 'd8b7f7e8e970cc0b975205fd6d5832ea917ef3e751df69b97439c1cddd67a489',
5555

56-
'qttranslations-everywhere-src-6.8.1.tar.xz': '635a6093e99152243b807de51077485ceadd4786d4acb135b9340b2303035a4a',
56+
'qttranslations-everywhere-src-6.9.2.tar.xz': 'c73bb6281ed365c0f954f4b1b6e1b13e1b3fefd94854f46fcd9a412f641f7ed6',
5757

58-
'qtwayland-everywhere-src-6.8.1.tar.xz': '2226fbde4e2ddd12f8bf4b239c8f38fd706a54e789e63467dfddc77129eca203',
58+
'qtwayland-everywhere-src-6.9.2.tar.xz': 'cad79806565568f12f9983fed69219416abcee9d5deef4abdfcf94aa2eef7781',
5959

60-
'squashfuse-0.5.2.tar.gz': 'db0238c5981dabbd80ee09ae15387f390091668ca060a7bc38047912491443d3',
60+
'squashfuse-0.6.1.tar.gz': '7b18a58c40a3161b5c329ae925b72336b5316941f906b446b8ed6c5a90989f8c',
6161

62-
'type2-runtime-01164bfcbc8dd2bd0d7e3706f97035108d6b91ba.tar.gz': '175e196f22e143d0c9e012e1ae7fb0f638197d8c9220a19991083820ea81d8c3',
62+
'type2-runtime-caf24f9f712084686bfc24a70b75e50df0aefb9c.tar.gz': '944e9bb5c587818c54fec3231067ec03d67b8062c68278f4ca99d504216117be',
6363

64-
'wayland-1.23.1.tar.xz': '864fb2a8399e2d0ec39d56e9d9b753c093775beadc6022ce81f441929a81e5ed',
64+
'wayland-1.24.0.tar.xz': '82892487a01ad67b334eca83b54317a7c86a03a89cfadacfef5211f11a5d0536',
6565

6666
'xcb-proto-1.17.0.tar.xz': '2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c',
6767

6868
'xcb-util-0.4.1.tar.xz': '5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512',
6969

70-
'xcb-util-cursor-0.1.5.tar.xz': '0caf99b0d60970f81ce41c7ba694e5eaaf833227bb2cbcdb2f6dc9666a663c57',
70+
'xcb-util-cursor-0.1.6.tar.xz': 'fdeb8bd127873519be5cc70dcd0d3b5d33b667877200f9925a59fdcad8f7a933',
7171

7272
'xcb-util-image-0.4.1.tar.xz': 'ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d',
7373

@@ -77,11 +77,11 @@
7777

7878
'xcb-util-wm-0.4.2.tar.xz': '62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b',
7979

80-
'xorgproto-2024.1.tar.xz': '372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59',
80+
'xorgproto-2025.1.tar.xz': '56898c716c0578df8a2d828c9c3e5c528277705c0484381a81960fe1a67668e8',
8181

82-
'xtrans-1.5.2.tar.xz': '5c5cbfe34764a9131d048f03c31c19e57fb4c682d67713eab6a65541b4dff86c',
82+
'xtrans-1.6.0.tar.xz': 'faafea166bf2451a173d9d593352940ec6404145c5d1da5c213423ce4d359e92',
8383

8484
'zlib-1.3.1.tar.gz': '9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23',
8585

86-
'zstd-1.5.6.tar.zst': '4aa8dd1c1115c0fd6b6b66c35c7f6ce7bd58cc1dfd3e4f175b45b39e84b14352',
86+
'zstd-1.5.7.tar.zst': '5b331d961d6989dc21bb03397fc7a2a4d86bc65a14adc5ffbbce050354e30fd2',
8787
}

‎module/cross_toolchain.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ def _cmake(ver: BranchProfile, paths: ProjectPaths, config: argparse.Namespace):
1919
shutil.copy(paths.cmake_cross_file, cmake_cross_file)
2020

2121
def _linux_headers(ver: BranchProfile, paths: ProjectPaths, config: argparse.Namespace):
22-
make_custom(paths.src_dir.linux_headers, [
22+
prefix = paths.layer_x.linux / f'usr/local/{ver.target}'
23+
24+
make_custom(paths.src_dir.linux, [
25+
'headers_install',
2326
f'ARCH={ver.kernel_arch}',
24-
f'prefix={paths.layer_x.linux}/usr/local/{ver.target}',
25-
'install',
26-
], jobs = 1)
27+
f'INSTALL_HDR_PATH={prefix}',
28+
], config.jobs)
2729

2830
def _binutils(ver: BranchProfile, paths: ProjectPaths, config: argparse.Namespace):
2931
build_dir = paths.src_dir.binutils / 'build-x'

‎module/host_lib.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ def _dbus(ver: BranchProfile, paths: ProjectPaths, config: argparse.Namespace):
9494
with overlayfs_ro('/usr/local', [
9595
paths.layer_host.expat / 'usr/local',
9696
]):
97-
configure(build_dir, [
98-
'--prefix=/usr/local',
99-
'--disable-shared',
100-
'--enable-static',
101-
*cflags_host(),
97+
meson_config(paths.src_dir.dbus, build_dir, [
98+
'--prefix', '/usr/local',
99+
'-Dmessage_bus=false',
100+
'-Dmodular_tests=disabled',
101+
'-Dtools=false',
102102
])
103-
make_default(build_dir, config.jobs)
104-
make_destdir_install(build_dir, paths.layer_host.dbus)
103+
meson_build(build_dir, config.jobs)
104+
meson_destdir_install(build_dir, paths.layer_host.dbus)
105105

106106
def _wayland(ver: BranchProfile, paths: ProjectPaths, config: argparse.Namespace):
107107
build_dir = paths.src_dir.wayland / 'build-host'

‎module/path.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class SourcePaths(NamedTuple):
1717
gcc: Path
1818
gmp: Path
1919
harfbuzz: Path
20-
linux_headers: Path
20+
linux: Path
2121
mimalloc: Path
2222
mpc: Path
2323
mpfr: Path
@@ -163,7 +163,7 @@ def __init__(
163163
gcc = self.build_dir / f'gcc-{ver.gcc}',
164164
gmp = self.build_dir / f'gmp-{ver.gmp}',
165165
harfbuzz = self.build_dir / f'harfbuzz-{ver.harfbuzz}',
166-
linux_headers = self.build_dir / f'linux-headers-{ver.linux_headers}',
166+
linux = self.build_dir / f'linux-{ver.linux}',
167167
mimalloc = self.build_dir / f'mimalloc-{ver.mimalloc}',
168168
mpc = self.build_dir / f'mpc-{ver.mpc}',
169169
mpfr = self.build_dir / f'mpfr-{ver.mpfr}',
@@ -187,7 +187,7 @@ def __init__(
187187
xcb_util_keysyms = self.build_dir / f'xcb-util-keysyms-{ver.xcb_util_keysyms}',
188188
xcb_util_renderutil = self.build_dir / f'xcb-util-renderutil-{ver.xcb_util_renderutil}',
189189
xcb_util_wm = self.build_dir / f'xcb-util-wm-{ver.xcb_util_wm}',
190-
xkbcommon = self.build_dir / f'libxkbcommon-{ver.xkbcommon}',
190+
xkbcommon = self.build_dir / f'libxkbcommon-xkbcommon-{ver.xkbcommon}',
191191
xml = self.build_dir / f'libxml2-{ver.xml}',
192192
xorg_proto = self.build_dir / f'xorgproto-{ver.xorg_proto}',
193193
xtrans = self.build_dir / f'xtrans-{ver.xtrans}',
@@ -202,13 +202,13 @@ def __init__(
202202
expat = self.assets_dir / f'expat-{ver.expat}.tar.xz',
203203
fcitx_qt = self.assets_dir / f'fcitx5-qt-{ver.fcitx_qt}.tar.gz',
204204
ffi = self.assets_dir / f'libffi-{ver.ffi}.tar.gz',
205-
fontconfig = self.assets_dir / f'fontconfig-{ver.fontconfig}.tar.gz',
205+
fontconfig = self.assets_dir / f'fontconfig-{ver.fontconfig}.tar.xz',
206206
freetype = self.assets_dir / f'freetype-{ver.freetype}.tar.xz',
207207
fuse = self.assets_dir / f'fuse-{ver.fuse}.tar.gz',
208208
gcc = self.assets_dir / f'gcc-{ver.gcc}.tar.xz',
209209
gmp = self.assets_dir / f'gmp-{ver.gmp}.tar.zst',
210210
harfbuzz = self.assets_dir / f'harfbuzz-{ver.harfbuzz}.tar.xz',
211-
linux_headers = self.assets_dir / f'linux-headers-{ver.linux_headers}.tar.xz',
211+
linux = self.assets_dir / f'linux-{ver.linux}.tar.xz',
212212
mimalloc = self.assets_dir / f'mimalloc-{ver.mimalloc}.tar.gz',
213213
mpc = self.assets_dir / f'mpc-{ver.mpc}.tar.gz',
214214
mpfr = self.assets_dir / f'mpfr-{ver.mpfr}.tar.xz',
@@ -232,7 +232,7 @@ def __init__(
232232
xcb_util_keysyms = self.assets_dir / f'xcb-util-keysyms-{ver.xcb_util_keysyms}.tar.xz',
233233
xcb_util_renderutil = self.assets_dir / f'xcb-util-renderutil-{ver.xcb_util_renderutil}.tar.xz',
234234
xcb_util_wm = self.assets_dir / f'xcb-util-wm-{ver.xcb_util_wm}.tar.xz',
235-
xkbcommon = self.assets_dir / f'libxkbcommon-{ver.xkbcommon}.tar.xz',
235+
xkbcommon = self.assets_dir / f'libxkbcommon-xkbcommon-{ver.xkbcommon}.tar.gz',
236236
xml = self.assets_dir / f'libxml2-{ver.xml}.tar.xz',
237237
xorg_proto = self.assets_dir / f'xorgproto-{ver.xorg_proto}.tar.xz',
238238
xtrans = self.assets_dir / f'xtrans-{ver.xtrans}.tar.xz',

‎module/prepare_source.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,8 @@ def _patch_done(path: Path):
121121
def _appimage_runtime(ver: BranchProfile, paths: ProjectPaths):
122122
url = f'https://github.com/AppImage/type2-runtime/archive/{ver.appimage_runtime}.tar.gz'
123123
_validate_and_download(paths.src_arx.appimage_runtime, url)
124-
if _check_and_extract(paths.src_dir.appimage_runtime, paths.src_arx.appimage_runtime):
125-
_patch(paths.src_dir.appimage_runtime, paths.patch_dir / 'appimage-runtime-trunk-squashfs.patch')
126-
_patch_done(paths.src_dir.appimage_runtime)
124+
_check_and_extract(paths.src_dir.appimage_runtime, paths.src_arx.appimage_runtime)
125+
_patch_done(paths.src_dir.appimage_runtime)
127126

128127
def _binutils(ver: BranchProfile, paths: ProjectPaths):
129128
url = f'https://ftpmirror.gnu.org/gnu/binutils/{paths.src_arx.binutils.name}'
@@ -157,7 +156,7 @@ def _ffi(ver: BranchProfile, paths: ProjectPaths):
157156
_patch_done(paths.src_dir.ffi)
158157

159158
def _fontconfig(ver: BranchProfile, paths: ProjectPaths):
160-
url = f'https://www.freedesktop.org/software/fontconfig/release/{paths.src_arx.fontconfig.name}'
159+
url = f'https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/{ver.fontconfig}/{paths.src_arx.fontconfig.name}'
161160
_validate_and_download(paths.src_arx.fontconfig, url)
162161
_check_and_extract(paths.src_dir.fontconfig, paths.src_arx.fontconfig)
163162
_patch_done(paths.src_dir.fontconfig)
@@ -195,11 +194,12 @@ def _harfbuzz(ver: BranchProfile, paths: ProjectPaths):
195194
_check_and_extract(paths.src_dir.harfbuzz, paths.src_arx.harfbuzz)
196195
_patch_done(paths.src_dir.harfbuzz)
197196

198-
def _linux_headers(ver: BranchProfile, paths: ProjectPaths):
199-
url = f'https://github.com/sabotage-linux/kernel-headers/releases/download/v{ver.linux_headers}/{paths.src_arx.linux_headers.name}'
200-
_validate_and_download(paths.src_arx.linux_headers, url)
201-
_check_and_extract(paths.src_dir.linux_headers, paths.src_arx.linux_headers)
202-
_patch_done(paths.src_dir.linux_headers)
197+
def _linux(ver: BranchProfile, paths: ProjectPaths):
198+
v = Version(ver.linux)
199+
url = f'https://cdn.kernel.org/pub/linux/kernel/v{v.major}.x/linux-{ver.linux}.tar.xz'
200+
_validate_and_download(paths.src_arx.linux, url)
201+
_check_and_extract(paths.src_dir.linux, paths.src_arx.linux)
202+
_patch_done(paths.src_dir.linux)
203203

204204
def _mimalloc(ver: BranchProfile, paths: ProjectPaths):
205205
url = f'https://github.com/microsoft/mimalloc/archive/refs/tags/v{ver.mimalloc}.tar.gz'
@@ -278,7 +278,7 @@ def _qtwayland(ver: BranchProfile, paths: ProjectPaths):
278278
_patch_done(paths.src_dir.qtwayland)
279279

280280
def _squashfuse(ver: BranchProfile, paths: ProjectPaths):
281-
url = f'https://github.com/vasi/squashfuse/archive/{ver.squashfuse}.tar.gz'
281+
url = f'https://github.com/vasi/squashfuse/releases/download/{ver.squashfuse}/{paths.src_arx.squashfuse.name}'
282282
_validate_and_download(paths.src_arx.squashfuse, url)
283283
if _check_and_extract(paths.src_dir.squashfuse, paths.src_arx.squashfuse):
284284
_autoreconf(paths.src_dir.squashfuse)
@@ -351,7 +351,7 @@ def _xcb_util_wm(ver: BranchProfile, paths: ProjectPaths):
351351
_patch_done(paths.src_dir.xcb_util_wm)
352352

353353
def _xkbcommon(ver: BranchProfile, paths: ProjectPaths):
354-
url = f'https://xkbcommon.org/download/{paths.src_arx.xkbcommon.name}'
354+
url = f'https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-{ver.xkbcommon}.tar.gz'
355355
_validate_and_download(paths.src_arx.xkbcommon, url)
356356
_check_and_extract(paths.src_dir.xkbcommon, paths.src_arx.xkbcommon)
357357
_patch_done(paths.src_dir.xkbcommon)
@@ -401,7 +401,7 @@ def download_and_patch(ver: BranchProfile, paths: ProjectPaths):
401401
_gcc(ver, paths)
402402
_gmp(ver, paths)
403403
_harfbuzz(ver, paths)
404-
_linux_headers(ver, paths)
404+
_linux(ver, paths)
405405
_mimalloc(ver, paths)
406406
_mpc(ver, paths)
407407
_mpfr(ver, paths)

‎module/profile.py‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
11
import argparse
22

33
class BranchVersions:
4-
appimage_runtime: str = '01164bfcbc8dd2bd0d7e3706f97035108d6b91ba'
5-
binutils: str = '2.43.1'
6-
dbus: str = '1.14.10'
7-
expat: str = '2.6.4'
8-
fcitx_qt: str = '5.1.8'
9-
ffi: str = '3.4.6'
10-
fontconfig: str = '2.15.0'
11-
freetype: str = '2.13.3'
12-
fuse: str = '3.16.2'
13-
gcc: str = '14.2.0'
4+
musl: str
5+
6+
appimage_runtime: str = 'caf24f9f712084686bfc24a70b75e50df0aefb9c'
7+
binutils: str = '2.45.1'
8+
dbus: str = '1.16.2'
9+
expat: str = '2.7.3'
10+
fcitx_qt: str = '5.1.12'
11+
ffi: str = '3.5.2'
12+
fontconfig: str = '2.17.1'
13+
freetype: str = '2.14.1'
14+
fuse: str = '3.18.1'
15+
gcc: str = '15.2.0'
1416
gmp: str = '6.3.0'
15-
harfbuzz: str = '10.1.0'
16-
linux_headers: str = '4.19.88-2'
17+
harfbuzz: str = '12.3.0'
18+
linux: str = '6.18.3'
1719
mimalloc: str = '3.0.11'
1820
mpc: str = '1.3.1'
19-
mpfr: str = '4.2.1'
20-
musl: str = '1.2.5'
21+
mpfr: str = '4.2.2'
2122
pkgconf: str = '2.5.1'
22-
png: str = '1.6.44'
23-
qt: str = '6.8.1'
24-
squashfuse: str = '0.5.2'
25-
wayland: str = '1.23.1'
26-
x: str = '1.8.10'
27-
xau: str = '1.0.11'
23+
png: str = '1.6.53'
24+
qt: str = '6.9.2'
25+
squashfuse: str = '0.6.1'
26+
wayland: str = '1.24.0'
27+
x: str = '1.8.12'
28+
xau: str = '1.0.12'
2829
xcb: str = '1.17.0'
2930
xcb_proto: str = '1.17.0'
3031
xcb_util: str = '0.4.1'
31-
xcb_util_cursor: str = '0.1.5'
32+
xcb_util_cursor: str = '0.1.6'
3233
xcb_util_image: str = '0.4.1'
3334
xcb_util_keysyms: str = '0.4.1'
3435
xcb_util_renderutil: str = '0.3.10'
3536
xcb_util_wm: str = '0.4.2'
36-
xkbcommon: str = '1.7.0'
37-
xml: str = '2.13.5'
38-
xorg_proto: str = '2024.1'
39-
xtrans: str = '1.5.2'
37+
xkbcommon: str = '1.13.1'
38+
xml: str = '2.15.1'
39+
xorg_proto: str = '2025.1'
40+
xtrans: str = '1.6.0'
4041
z: str = '1.3.1'
41-
zstd: str = '1.5.6'
42+
zstd: str = '1.5.7'
4243

4344
def __init__(
4445
self,
@@ -106,7 +107,7 @@ def __init__(
106107
'loong64': ProfileInfo(
107108
arch = 'loong64',
108109
triplet_arch = 'loongarch64',
109-
kernel_arch = 'riscv',
110+
kernel_arch = 'loongarch',
110111
),
111112
'i686': ProfileInfo(
112113
arch = 'i686',

‎module/target_lib.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ def _dbus(ver: BranchProfile, paths: ProjectPaths, config: argparse.Namespace):
157157
*toolchain_layers(paths),
158158
paths.layer_target.expat / 'usr/local',
159159
]):
160-
configure(build_dir, [
161-
f'--prefix=/usr/local/{ver.target}',
162-
f'--host={ver.target}',
163-
'--disable-shared',
164-
'--enable-static',
165-
*cflags_target(),
160+
meson_config(paths.src_dir.dbus, build_dir, [
161+
'--cross-file', paths.meson_cross_file,
162+
'--prefix', f'/usr/local/{ver.target}',
163+
'-Dmessage_bus=false',
164+
'-Dmodular_tests=disabled',
165+
'-Dtools=false',
166166
])
167-
make_default(build_dir, config.jobs)
168-
make_destdir_install(build_dir, paths.layer_target.dbus)
167+
meson_build(build_dir, config.jobs)
168+
meson_destdir_install(build_dir, paths.layer_host.dbus)
169169

170170
def _png(ver: BranchProfile, paths: ProjectPaths, config: argparse.Namespace):
171171
build_dir = paths.src_dir.png / 'build-target'

0 commit comments

Comments
 (0)