Skip to content

Commit f8afdb9

Browse files
authored
Merge pull request #1554 from wingtk/weekly-2025.3.20
Update to GTK 4.18.2
2 parents 2128d10 + 65c2cac commit f8afdb9

File tree

7 files changed

+40
-13
lines changed

7 files changed

+40
-13
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Subject: [PATCH] Fix #warning not defined with MSVC
2+
---
3+
Index: gsk/gl/gskglrenderer.h
4+
IDEA additional info:
5+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
6+
<+>UTF-8
7+
===================================================================
8+
diff --git a/gsk/gl/gskglrenderer.h b/gsk/gl/gskglrenderer.h
9+
--- a/gsk/gl/gskglrenderer.h (revision 132755d28682b98ecc699d31dd48605c040797e5)
10+
+++ b/gsk/gl/gskglrenderer.h (date 1742517146787)
11+
@@ -20,6 +20,12 @@
12+
13+
#pragma once
14+
15+
-#warning "#include <gsk/gsk.h> instead of <gsk/gl/gskglrenderer.h> to avoid this warning"
16+
+#define WARNING_MSG "#include <gsk/gsk.h> instead of <gsk/gl/gskglrenderer.h> to avoid this warning"
17+
+#ifdef _MSC_VER
18+
+#pragma message("WARNING: " WARNING_MSG)
19+
+#else
20+
+#warning WARNING_MSG
21+
+#endif
22+
+#undef WARNING_MSG
23+
24+
#include <gsk/gsk.h>

gvsbuild/projects/abseil.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def __init__(self):
2424
Project.__init__(
2525
self,
2626
"abseil-cpp",
27-
version="20250127.0",
27+
version="20250127.1",
2828
archive_url="https://github.com/abseil/abseil-cpp/releases/download/{version}/abseil-cpp-{version}.tar.gz",
29-
hash="16242f394245627e508ec6bb296b433c90f8d914f73b9c026fddb905e27276e8",
29+
hash="b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811",
3030
dependencies=[
3131
"cmake",
3232
"ninja",

gvsbuild/projects/gtk.py

Lines changed: 6 additions & 3 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.16.12",
125+
version="4.18.2",
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="ef31bdbd6f082c4401634a20c850b0050c9bf252ef1e079764ee95a2a0c4c95a",
130+
hash="cca5677be4c3e501b49f1c50bcafacba8dcf4bd3a2d016388f834eff274dc159",
131131
dependencies=[
132132
"gdk-pixbuf",
133133
"pango",
@@ -138,7 +138,10 @@ def __init__(self):
138138
"glib",
139139
"fribidi",
140140
],
141-
patches=[],
141+
patches=[
142+
# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8333
143+
"001-fix-warning-preprocessor.patch"
144+
],
142145
)
143146
if self.opts.enable_gi:
144147
self.add_dependency("gobject-introspection")

gvsbuild/projects/gtksourceview.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ def __init__(self):
4949
Project.__init__(
5050
self,
5151
"gtksourceview5",
52-
version="5.14.2",
52+
version="5.16.0",
5353
lastversion_major=5,
5454
lastversion_even=True,
5555
repository="https://gitlab.gnome.org/GNOME/gtksourceview",
5656
archive_url="https://download.gnome.org/sources/gtksourceview/{major}.{minor}/gtksourceview-{version}.tar.xz",
57-
hash="1a6d387a68075f8aefd4e752cf487177c4a6823b14ff8a434986858aeaef6264",
57+
hash="ab35d420102f3e8b055dd3b8642d3a48209f888189e6254d0ffb4b6a7e8c3566",
5858
dependencies=["meson", "ninja", "gtk4", "pkgconf", "libxml2"],
5959
patches=[],
6060
)

gvsbuild/projects/icu.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ def __init__(self):
2626
self,
2727
"icu",
2828
repository="https://github.com/unicode-org/icu",
29-
version="76.1",
29+
version="77.1",
3030
archive_url="https://github.com/unicode-org/icu/releases/download/release-{major}-{minor}/icu4c-{major}_{minor}-src.zip",
31-
hash="14a1942185dda2c5a07bd74f20a220954a7d94149fb5ef3cc782b52d9817fb3f",
31+
hash="d5cf533cf70cd49044d89eda3e74880328eb9426e6fd2b3cc8f9a963d2ad480e",
3232
patches=["0001-Fix-circular-include-on-MS-Visual-Studio.patch"],
3333
)
3434

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.6.4",
28+
version="1.7.0",
2929
archive_url="https://download.gnome.org/sources/libadwaita/{major}.{minor}/libadwaita-{version}.tar.xz",
30-
hash="1011a5a93dc3b87e82da19910d7fab01a3b9d7fcb0b09751babb476eedb3d9a3",
30+
hash="58bf99b8a9f8b0171964de0ae741d01d5a09db3662134fa67541c99a8ed7dec0",
3131
dependencies=[
3232
"ninja",
3333
"meson",

gvsbuild/projects/libarchive.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ def __init__(self):
2727
Project.__init__(
2828
self,
2929
"libarchive",
30-
version="3.7.7",
30+
version="3.7.8",
3131
archive_url="https://libarchive.org/downloads/libarchive-{version}.tar.xz",
32-
hash="879acd83c3399c7caaee73fe5f7418e06087ab2aaf40af3e99b9e29beb29faee",
32+
hash="32a51747527e01f50d0e06abad0fe0b95b6fa40b8fc173c48b8bd97d0f743330",
3333
dependencies=[
3434
"cmake",
3535
"ninja",

0 commit comments

Comments
 (0)