Skip to content

Commit 9dac4c2

Browse files
authored
Merge pull request #1583 from wingtk/weekly-update-2025.5.6
GTK 4.18.5 and other updates
2 parents 44f0eb6 + 1899460 commit 9dac4c2

File tree

10 files changed

+286
-265
lines changed

10 files changed

+286
-265
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
From 1183292d4695300785b272532c1e02d68840e4b8 Mon Sep 17 00:00:00 2001
2+
From: PJK <me@pavelkalvoda.com>
3+
Date: Fri, 4 Apr 2025 23:19:13 +0200
4+
Subject: [PATCH] Set cmake_minimum_required to 3.5
5+
6+
Fixed https://github.com/PJK/libcbor/issues/351
7+
---
8+
CMakeLists.txt | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/CMakeLists.txt b/CMakeLists.txt
12+
index 815675ed..a9f9bd56 100644
13+
--- a/CMakeLists.txt
14+
+++ b/CMakeLists.txt
15+
@@ -1,4 +1,4 @@
16+
-cmake_minimum_required(VERSION 3.0)
17+
+cmake_minimum_required(VERSION 3.5)
18+
19+
project(libcbor)
20+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}

gvsbuild/projects/gtk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ def __init__(self):
122122
self,
123123
"gtk4",
124124
prj_dir="gtk4",
125-
version="4.18.4",
125+
version="4.18.5",
126126
lastversion_major=4,
127127
lastversion_even=True,
128128
repository="https://gitlab.gnome.org/GNOME/gtk",
129129
archive_url="https://download.gnome.org/sources/gtk/{major}.{minor}/gtk-{version}.tar.xz",
130-
hash="d4783ac15037c2c4275a8f1acc94f5fede28a516243fccb92ff54a11c15775ff",
130+
hash="bb5267a062f5936947d34c9999390a674b0b2b0d8aa3472fe0d05e2064955abc",
131131
dependencies=[
132132
"gdk-pixbuf",
133133
"pango",

gvsbuild/projects/libadwaita.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def __init__(self):
2525
self,
2626
"libadwaita",
2727
repository="https://gitlab.gnome.org/GNOME/libadwaita",
28-
version="1.7.1",
28+
version="1.7.2",
2929
archive_url="https://download.gnome.org/sources/libadwaita/{major}.{minor}/libadwaita-{version}.tar.xz",
30-
hash="8ae37033fc412d476951c324a82b04772b3b3a98638d9d74905e9bba385938b7",
30+
hash="28ee2ff589c6debe47af9da7a56e37c97d6849e003918a4b223f690d25f960be",
3131
dependencies=[
3232
"ninja",
3333
"meson",

gvsbuild/projects/libcbor.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def __init__(self):
2929
archive_filename="libcbor-{version}.tar.gz",
3030
hash="5368add109db559f546d7ed10f440f39a273b073daa8da4abffc83815069fa7f",
3131
dependencies=["cmake", "ninja"],
32+
patches=["001-fix-minimum-cmake-version.patch"],
3233
)
3334

3435
def build(self):

gvsbuild/projects/libfido2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ def __init__(self):
2626
Project.__init__(
2727
self,
2828
"libfido2",
29-
version="1.15.0",
29+
version="1.16.0",
3030
archive_url="https://developers.yubico.com/libfido2/Releases/libfido2-{version}.tar.gz",
31-
hash="abaab1318d21d262ece416fb8a7132fa9374bda89f6fa52b86a98a2f5712b61e",
31+
hash="8c2b6fb279b5b42e9ac92ade71832e485852647b53607c43baaafbbcecea04e4",
3232
dependencies=[
3333
"cmake",
3434
"ninja",

gvsbuild/projects/libpng.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ def __init__(self):
2424
Project.__init__(
2525
self,
2626
"libpng",
27-
version="1.6.47",
27+
version="1.6.48",
2828
repository="https://github.com/pnggroup/libpng",
2929
archive_url="https://github.com/pnggroup/libpng/archive/v{version}.tar.gz",
3030
archive_filename="libpng-{version}.tar.gz",
31-
hash="631a4c58ea6c10c81f160c4b21fa8495b715d251698ebc2552077e8450f30454",
31+
hash="b17e99026055727e8cba99160c3a9a7f9af788e9f786daeadded5a42243f1dd0",
3232
dependencies=["cmake", "ninja", "zlib"],
3333
)
3434

gvsbuild/projects/pixman.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def __init__(self):
2525
self,
2626
"pixman",
2727
repository="https://gitlab.freedesktop.org/pixman/pixman",
28-
version="0.44.2",
28+
version="0.46.0",
2929
archive_url="http://cairographics.org/releases/pixman-{version}.tar.gz",
30-
hash="6349061ce1a338ab6952b92194d1b0377472244208d47ff25bef86fc71973466",
30+
hash="02d9ff7b8458ef61731c3d355f854bbf461fd0a4d3563c51f1c1c7b00638050d",
3131
dependencies=["ninja", "meson"],
3232
)
3333

gvsbuild/tools.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ def __init__(self):
6666
Tool.__init__(
6767
self,
6868
"cmake",
69-
version="4.0.1",
69+
version="4.0.2",
7070
archive_url="https://github.com/Kitware/CMake/releases/download/v{version}/cmake-{version}-windows-x86_64.zip",
71-
hash="31742b9a264b36897e0c904ab3520baf00a5b5ac5bc801aeede28d0d217eec65",
71+
hash="109ec7de10416d6d78991bab9714d2cb1ccb71d1b436dff42ec978dd283c29fc",
7272
dir_part="cmake-{version}-windows-x86_64",
7373
)
7474

@@ -210,10 +210,10 @@ def __init__(self):
210210
Tool.__init__(
211211
self,
212212
"go",
213-
version="1.24.2",
213+
version="1.24.3",
214214
repository="https://github.com/golang/go",
215215
archive_url="https://go.dev/dl/go{version}.windows-amd64.zip",
216-
hash="29c553aabee0743e2ffa3e9fa0cda00ef3b3cc4ff0bc92007f31f80fd69892e1",
216+
hash="8c2b6fb279b5b42e9ac92ade71832e485852647b53607c43baaafbbcecea04e4",
217217
dir_part="go-{version}",
218218
)
219219

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
44

55
[project]
66
name = "gvsbuild"
7-
version = "2025.4.1"
7+
version = "2025.5.0"
88
description = "GTK stack for Windows"
99
readme = "README.md"
1010
requires-python = "<4.0,>=3.9"

0 commit comments

Comments
 (0)