Skip to content

Commit b940f98

Browse files
chore: update craft shelf (#12435) (#12437)
* chore: update craft shelf * chore: pin some lib versions in .craft.ini * fix: pin cmake-base to 3.31.9 * fix: pin libxslt/1.1.42 to match pinned libxml2/1.6.45
1 parent 097812e commit b940f98

File tree

2 files changed

+41
-19
lines changed

2 files changed

+41
-19
lines changed

.craft.ini

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,25 @@ dev-utils/gtk-doc.ignored = True
6868
binary/mysql.ignored = True
6969
libs/dbus.ignored = True
7070
libs/icu.ignored = True
71-
libs/openssl.version = 3.4.3
7271

7372
libs/qt6.version = ${Variables:QtVersion}
7473
libs/qt6/qtbase.withDBus = False
7574
qt-libs/qtkeychain.buildWithQt6 = True
7675

76+
# pinning versions to fix security issues
77+
libs/libcurl.version = 7.84.0
78+
libs/openssl.version = 3.4.3
79+
libs/libpng.version = 1.6.45
80+
libs/freetype.version = 2.14.1
81+
82+
# pinning versions to have a stable cache
83+
dev-utils/cmake-base.version = 3.31.9
84+
libs/glib.version = 2.81.0
85+
libs/libxml2.version = 2.12.7
86+
libs/libxslt.version = 1.1.42
87+
# 78.1 causes cache misses - libxml2 requires 78.x
88+
libs/icu.version = 76.1
89+
7790
[windows-cl-msvc2022-x86_64]
7891
General/ABI = windows-cl-msvc2022-x86_64
7992

.craft.shelf

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ version = 2
33
blueprintrepositories = https://invent.kde.org/packaging/craft-blueprints-kde.git|master|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
44

55
[core/cacert]
6-
version = 2023-12-12
6+
version = 2025-09-09
77

88
[craft/craft-blueprints-kde]
99
version = master
10-
revision = 466fec8a
10+
revision = 0c688dfb7
1111

1212
[craft/craft-blueprints-owncloud]
1313
version = master
1414
revision = ba6feae
1515

1616
[craft/craft-core]
1717
version = master
18-
revision = 59ba2eecac262d0637e3ab40e601549114966ad9
18+
revision = 949d36244
1919

2020
[dev-utils/7zip-base]
21-
version = 24.09
21+
version = 25.01
2222

2323
[dev-utils/cmake]
2424
version = latest
2525

2626
[dev-utils/cmake-base]
27-
version = 3.30.0
27+
version = 3.31.9
2828

2929
[dev-utils/icoutils]
3030
version = 0.32.3
@@ -39,40 +39,46 @@ version = 0.6.1
3939
version = 2.16.03
4040

4141
[dev-utils/ninja]
42-
version = 1.12.1
42+
version = 1.13.1
4343

4444
[dev-utils/perl]
4545
version = 5.40.1
4646

4747
[dev-utils/pkgconf]
48-
version = 2.4.3
48+
version = 2.5.1
4949

5050
[dev-utils/symsorter]
5151
version = 0.7.0
5252

5353
[kde/frameworks/extra-cmake-modules]
54-
version = 6.17.0
54+
version = 6.20.0
5555

5656
[kde/frameworks/tier1/syntax-highlighting]
57-
version = 6.17.0
57+
version = 6.20.0
5858

5959
[libs/brotli]
6060
version = 1.1.0
6161

62+
[libs/cairo]
63+
version = 1.18.4
64+
6265
[libs/expat]
63-
version = 2.2.10
66+
version = 2.7.3
6467

6568
[libs/freetype]
66-
version = 2.12.1
69+
version = 2.14.1
6770

6871
[libs/gettext]
6972
version = 0.22.3
7073

7174
[libs/giflib]
7275
version = 5.2.1
7376

77+
[libs/glib]
78+
version = 2.81.0
79+
7480
[libs/harfbuzz]
75-
version = 2.7.2
81+
version = 11.2.0
7682

7783
[libs/kdsingleapplication]
7884
version = 1.2.0
@@ -81,7 +87,7 @@ version = 1.2.0
8187
version = 0.98.1
8288

8389
[libs/libbzip2]
84-
version = 1.0.6
90+
version = 1.0.8
8591

8692
[libs/libffi]
8793
version = 3.4.7
@@ -99,26 +105,29 @@ version = 1.6.45
99105
version = 1.0.4
100106

101107
[libs/libunistring]
102-
version = 1.2
108+
version = 1.4.1
103109

104110
[libs/libxml2]
105111
version = 2.12.7
106112

107113
[libs/libzstd]
108-
version = 1.5.6
114+
version = 1.5.7
109115

110116
[libs/llvm]
111-
version = 18.1.8
117+
version = 20.1.7
112118

113119
[libs/nlohmann-json]
114-
version = 3.11.2
120+
version = 3.12.0
115121

116122
[libs/openssl]
117123
version = 3.4.3
118124

119125
[libs/pcre2]
120126
version = 10.44
121127

128+
[libs/pixman]
129+
version = 0.46.4
130+
122131
[libs/python]
123132
version = 3.11.11
124133

@@ -153,7 +162,7 @@ version = 6.8.3
153162
version = 17
154163

155164
[libs/sqlite]
156-
version = 3.42.0
165+
version = 3.50.4
157166

158167
[libs/tiff]
159168
version = 4.4.0

0 commit comments

Comments
 (0)