--- giscanner/ccompiler.py.orig	2023-05-23 14:17:59.000000000 -0400
+++ giscanner/ccompiler.py	2023-05-23 14:22:01.000000000 -0400
@@ -228,7 +228,7 @@
 
-            if not libtool:
+
                 # https://bugzilla.gnome.org/show_bug.cgi?id=625195
-                args.append('-Wl,-rpath,.')
+#               args.append('-Wl,-rpath,.')
 
                 # Ensure libraries are always linked as we are going to use ldd to work
                 # out their names later
@@ -243,12 +243,12 @@
                 args.append('-libpath:' + library_path)
             else:
                 args.append('-L' + library_path)
-                if os.name != 'nt' and os.path.isabs(library_path):
-                    if libtool:
-                        args.append('-rpath')
-                        args.append(library_path)
-                    else:
-                        args.append('-Wl,-rpath,' + library_path)
+#                if os.name != 'nt' and os.path.isabs(library_path):
+#                    if libtool:
+#                        args.append('-rpath')
+#                        args.append(library_path)
+#                    else:
+#                        args.append('-Wl,-rpath,' + library_path)
 
             runtime_paths.append(library_path)
 
--- meson.build.orig
+++ meson.build
@@ -50,7 +50,8 @@
 else
       '-Wmissing-noreturn',
       '-Wmissing-prototypes',
       '-Wnested-externs',
+      '-Wno-error=incompatible-pointer-types',
       '-Wnull-dereference',
       '-Wold-style-definition',
       '-Wpacked',
--- gir/meson.build.orig
+++ gir/meson.build
@@ -64,6 +64,9 @@
   '--no-libtool',
   '--quiet',
   '--reparse-validate',
+  '--cflags-begin',
+  '-Wno-error=incompatible-pointer-types',
+  '--cflags-end',
   '--add-include-path', join_paths(meson.current_build_dir()),
   '--add-include-path', join_paths(meson.current_source_dir()),
 ]

--- girepository/gdump.c.orig
+++ girepository/gdump.c
@@ -67,7 +67,7 @@
 /* Analogue of g_data_input_stream_read_line(). */
 static char *
 read_line (FILE   *input,
-           size_t *len_out)
+           unsigned int *len_out)
 {
   GByteArray *buffer = g_byte_array_new ();
   const guint8 nul = '\0';