From 75d32c87834687cb07b49fe0bfca48a492bff0d6 Mon Sep 17 00:00:00 2001 From: Rene Hexel Date: Sun, 21 Apr 2024 14:14:21 +1000 Subject: [PATCH] Update for gtk-4.14 --- README.md | 4 ++-- Sources/CGdk/gdk_bridging.h | 8 ++++++++ Sources/CGsk/gsk_bridging.h | 15 +++++++++++++-- Sources/CGtk/gtk_bridging.h | 5 +++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 725a6d38..4dc6a0e2 100644 --- a/README.md +++ b/README.md @@ -97,13 +97,13 @@ After that, use the (usual) Build and Test buttons to build/test this package. To build, download Swift from https://swift.org/download/ -- if you are using macOS, make sure you have the command line tools installed as well). Test that your compiler works using `swift --version`, which should give you something like $ swift --version - swift-driver version: 1.87.1 Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1) + swift-driver version: 1.90.11.1 Apple Swift version 5.10 (swiftlang-5.10.0.13 clang-1500.3.9.4) Target: arm64-apple-macosx14.0 on macOS, or on Linux you should get something like: $ swift --version - Swift version 5.9 (swift-5.9-RELEASE) + Swift version 5.10 (swift-5.10-RELEASE) Target: x86_64-unknown-linux-gnu ### Gtk 3.22 or higher diff --git a/Sources/CGdk/gdk_bridging.h b/Sources/CGdk/gdk_bridging.h index f40c418e..5f8c9dfe 100644 --- a/Sources/CGdk/gdk_bridging.h +++ b/Sources/CGdk/gdk_bridging.h @@ -20,6 +20,14 @@ struct _GdkDeviceManager {}; struct _GdkDeviceType {}; struct _GdkDisplay {}; struct _GdkDisplayManager {}; +struct _GdkDmabufFormats {}; +struct _GdkDmabufTexture {}; +struct _GdkDmabufTextureBuilder {}; +typedef struct _GdkDmabufTextureBuilder GdkDmabufTextureBuilder; +struct _GdkDmabufTextureBuilderClass {}; +typedef struct _GdkDmabufTextureBuilderClass GdkDmabufTextureBuilderClass; +struct _GdkDmabufTextureClass {}; +typedef struct _GdkDmabufTextureClass GdkDmabufTextureClass; struct _GdkDrag {}; struct _GdkDragAction {}; struct _GdkDragContext {}; diff --git a/Sources/CGsk/gsk_bridging.h b/Sources/CGsk/gsk_bridging.h index 57038c5c..24082548 100644 --- a/Sources/CGsk/gsk_bridging.h +++ b/Sources/CGsk/gsk_bridging.h @@ -13,12 +13,16 @@ struct _GskConicGradientNode {}; struct _GskContainerNode {}; struct _GskCrossFadeNode {}; struct _GskDebugNode {}; +struct _GskFillNode {}; struct _GskGLShaderNode {}; struct _GskInsetShadowNode {}; struct _GskLinearGradientNode {}; struct _GskMaskNode {}; struct _GskOpacityNode {}; struct _GskOutsetShadowNode {}; +struct _GskPath {}; +struct _GskPathBuilder {}; +struct _GskPathMeasure {}; struct _GskRadialGradientNode {}; struct _GskRenderNode {}; struct _GskRenderer {}; @@ -29,6 +33,9 @@ struct _GskRepeatingRadialGradientNode {}; struct _GskRoundedClipNode {}; struct _GskShaderArgsBuilder {}; struct _GskShadowNode {}; +struct _GskStroke {}; +struct _GskStrokeNode {}; +struct _GskSubsurfaceNode {}; struct _GskTextNode {}; struct _GskTextureNode {}; struct _GskTextureScaleNode {}; @@ -39,10 +46,14 @@ struct _GskGLRendererClass {}; struct _GskGLShader {}; struct _GskNglRenderer {}; struct _GskNglRendererClass {}; +struct _GskVulkanRenderer {}; +struct _GskVulkanRendererClass {}; typedef struct _GskGLRenderer GskGLRenderer; typedef struct _GskGLRendererClass GskGLRendererClass; typedef struct _GskGLShader GskGLShader; typedef struct _GskNglRenderer GskNglRenderer; +typedef struct _GskVulkanRenderer GskVulkanRenderer; +typedef struct _GskVulkanRendererClass GskVulkanRendererClass; #include #include @@ -54,5 +65,5 @@ typedef struct _GskNglRenderer GskNglRenderer; #include #endif -extern gpointer gsk_gl_renderer_new(); -extern GType gsk_gl_renderer_get_type(); +extern GskRenderer *gsk_gl_renderer_new(void); +extern GType gsk_gl_renderer_get_type(void); diff --git a/Sources/CGtk/gtk_bridging.h b/Sources/CGtk/gtk_bridging.h index 54e4e5e4..fe5ba180 100644 --- a/Sources/CGtk/gtk_bridging.h +++ b/Sources/CGtk/gtk_bridging.h @@ -3,7 +3,9 @@ struct _GtkAccelGroupPrivate {}; struct _GtkAccelLabelPrivate {}; struct _GtkAccelMap {}; struct _GtkAccelMapClass {}; +struct _GtkAccessibleList {}; struct _GtkAccessiblePrivate {}; +struct _GtkAccessibleText {}; struct _GtkActionBarPrivate {}; struct _GtkActionGroupPrivate {}; struct _GtkActionPrivate {}; @@ -123,6 +125,7 @@ struct _GtkGestureStylusClass {}; struct _GtkGestureZoom {}; struct _GtkGestureZoomClass {}; struct _GtkGradient {}; +struct _GtkGraphicsOffload {}; struct _GtkGridPrivate {}; struct _GtkHSVPrivate {}; struct _GtkHandleBoxPrivate {}; @@ -191,10 +194,12 @@ struct _GtkPopoverMenu {}; struct _GtkPopoverPrivate {}; struct _GtkPrintBackend {}; struct _GtkPrintContext {}; +struct _GtkPrintDialog {}; struct _GtkPrintJob {}; struct _GtkPrintOperationPreview {}; struct _GtkPrintOperationPrivate {}; struct _GtkPrintSettings {}; +struct _GtkPrintSetup {}; struct _GtkPrintUnixDialog {}; struct _GtkPrinter {}; struct _GtkProgressBarAccessiblePrivate {};