Skip to content

Commit ade6974

Browse files
committed
Make this work with glib-2.84
1 parent 849d6cd commit ade6974

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ on macOS, or on Linux you should get something like:
107107

108108
### Gtk 3.22 or higher
109109

110-
The Swift wrappers have been tested with glib-2.56, 2.58, 2.60, 2.62, 2.64, 2.66, 2.68, 2.70, 2.72, 2.74, 2.76, 2.78, 2.80 and 2.82, and gdk/gtk 3.22, 3.24 as well as 4.0, 4.2, 4.4, 4.6, 4.8, 4.10, 4.12, 4.14, and 4.16 on the `gtk4` branch. They should work with higher versions, but YMMV. Also make sure you have `gobject-introspection` and its `.gir` files installed.
110+
The Swift wrappers have been tested with glib-2.56, 2.58, 2.60, 2.62, 2.64, 2.66, 2.68, 2.70, 2.72, 2.74, 2.76, 2.78, 2.80, 2.82 and 2.84, and gdk/gtk 3.22, 3.24 as well as 4.0, 4.2, 4.4, 4.6, 4.8, 4.10, 4.12, 4.14, and 4.16 on the `gtk4` branch. They should work with higher versions, but YMMV. Also make sure you have `gobject-introspection` and its `.gir` files installed.
111111

112112
#### Linux
113113

Sources/CGLib/glib_bridging.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extern int g_open(const char *, int, ...) __nonnull ((1));
1212
#include <glib/gversion.h>
1313
#include <glib/gversionmacros.h>
1414
#undef __GLIB_H_INSIDE__
15-
#if defined(__linux__) && defined(__aarch64__)
15+
#if defined(__linux__)
1616
#undef g_open
1717
#endif
1818

@@ -70,7 +70,9 @@ struct _GUnixSocketAddressPrivate {};
7070
struct _GUri {};
7171
struct _GVariant {};
7272
struct _GVariantType {};
73+
#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 84
7374
struct GMainContextPusher {};
75+
#endif
7476
struct GMutexLocker {};
7577
struct GTestCase {};
7678
struct GTestSuite {};

Sources/GLib/GLib-2.0-2.84.0.sed

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
s|UnsafeMutablePointer<GMainContextPusher>|UnsafeMutableRawPointer|g
2+
s|UnsafePointer<GMainContextPusher>|UnsafeRawPointer|g

Sources/GLib/GLib-2.0.exclude

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ String_autoptr
33
g_iconv
44
g_time_zone_new
55
macro__has_attribute___noreturn__
6+
macro__has_attribute_ifunc
7+
macro__has_attribute_no_sanitize_address
8+
MainContextPusher

0 commit comments

Comments
 (0)