diff --git a/ports/gtk3/cairo-cpp-linkage.patch b/ports/gtk3/cairo-cpp-linkage.patch index e95bac7aeed2e0..b56e6ee352c6d1 100644 --- a/ports/gtk3/cairo-cpp-linkage.patch +++ b/ports/gtk3/cairo-cpp-linkage.patch @@ -57,6 +57,6 @@ index dd6b888..e60ad30 100644 @@ -1,4 +1,4 @@ -project('gtk', 'c', +project('gtk', 'c', 'cpp', - version: '3.24.51', + version: '3.24.52', default_options: [ 'buildtype=debugoptimized', diff --git a/ports/gtk3/egl-conditional.diff b/ports/gtk3/egl-conditional.diff deleted file mode 100644 index 304089e4137bf6..00000000000000 --- a/ports/gtk3/egl-conditional.diff +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/gdk/win32/gdkglcontext-win32.c b/gdk/win32/gdkglcontext-win32.c -index b1cbfa2c047dac8a73002120ffe4130f557cf82f..0021f8cdb5000d2ae0b70a22f6539c47e79a5e9d 100644 ---- a/gdk/win32/gdkglcontext-win32.c -+++ b/gdk/win32/gdkglcontext-win32.c -@@ -833,7 +833,7 @@ gdk_win32_gl_context_realize_wgl (GdkGLContext *context, - return TRUE; - } - --static gboolean -+gboolean - gdk_win32_display_is_wgl_context_current (GdkDisplay *display, - GdkGLContext *context) - { -@@ -1313,7 +1313,8 @@ gdk_win32_window_invalidate_egl_framebuffer (GdkWindow *window) - } - } - --static gboolean -+#ifdef GDK_WIN32_ENABLE_EGL -+gboolean - gdk_win32_display_is_egl_context_current (GdkDisplay *display, - GdkGLContext *context) - { -@@ -1321,6 +1322,9 @@ gdk_win32_display_is_egl_context_current (GdkDisplay *display, - - return context_egl->egl_context == eglGetCurrentContext (); - } -+#else -+#define gdk_win32_display_is_egl_context_current(disp,ctx) FALSE -+#endif - - static gboolean - gdk_win32_display_make_egl_context_current (GdkDisplay *display, -diff --git a/gdk/win32/gdkglcontext-win32.h b/gdk/win32/gdkglcontext-win32.h -index 793a3ef4ffaa1fa2ba3d46b5a0ecfdf2ccb576fa..69d5d63166287360115aeec5cafbce264653f04c 100644 ---- a/gdk/win32/gdkglcontext-win32.h -+++ b/gdk/win32/gdkglcontext-win32.h -@@ -61,6 +61,18 @@ gboolean - gdk_win32_display_is_gl_context_current (GdkDisplay *display, - GdkGLContext *context); - -+gboolean -+gdk_win32_display_is_wgl_context_current (GdkDisplay *display, -+ GdkGLContext *context); -+ -+#ifdef GDK_WIN32_ENABLE_EGL -+gboolean -+gdk_win32_display_is_egl_context_current (GdkDisplay *display, -+ GdkGLContext *context); -+#else -+#define gdk_win32_display_is_egl_context_current(disp,ctx) FALSE -+#endif -+ - gboolean - gdk_win32_display_make_gl_context_current (GdkDisplay *display, - GdkGLContext *context); diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake index 6ce063876f8262..ad418ebe8d49af 100644 --- a/ports/gtk3/portfile.cmake +++ b/ports/gtk3/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_download_distfile(ARCHIVE "https://download.gnome.org/sources/gtk/${VERSION_MAJOR_MINOR}/gtk-${VERSION}.tar.xz" "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/gtk/${VERSION_MAJOR_MINOR}/gtk-${VERSION}.tar.xz" FILENAME "GNOME-gtk-${VERSION}.tar.xz" - SHA512 f96ee1c586284af315709ec38e841bd1b2558d09e2162834a132ffc4bbcddca272a92a828550a3accaa3e4da1964ad32b3b48291e929a108a913bd18c61cd73b + SHA512 20c119cf1a8c390c9d572729f36215fe034731d9e741a0a30c96671f4606ef8b7cdbe5d5ebe986f6f6c9ac03b3ba5cddd8d63da0ebfc5341d179ec9dea5e82eb ) vcpkg_extract_source_archive(SOURCE_PATH @@ -20,7 +20,6 @@ vcpkg_extract_source_archive(SOURCE_PATH PATCHES 0001-build.patch cairo-cpp-linkage.patch - egl-conditional.diff # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9067 avoid-multiple-definition.diff ) diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json index c373f67c21e80c..1584ebba383675 100644 --- a/ports/gtk3/vcpkg.json +++ b/ports/gtk3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gtk3", - "version": "3.24.51", - "port-version": 3, + "version": "3.24.52", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 6f090fd869f408..a71155b39f813b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3605,8 +3605,8 @@ "port-version": 0 }, "gtk3": { - "baseline": "3.24.51", - "port-version": 3 + "baseline": "3.24.52", + "port-version": 0 }, "gtkmm": { "baseline": "4.22.0", diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json index 7ca48afebd1fd7..5ba027de1145e6 100644 --- a/versions/g-/gtk3.json +++ b/versions/g-/gtk3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85c5ba56dfbf47290085e87597a6507d75eabf02", + "version": "3.24.52", + "port-version": 0 + }, { "git-tree": "80ba3fba56fe848c4ee34ba92ba224281c9a1362", "version": "3.24.51",