mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-29 11:38:52 +02:00
127 lines
3.3 KiB
Plaintext
127 lines
3.3 KiB
Plaintext
From 66c89a205627625e3951d0cd4c3d1c02f13054eb Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Fri, 12 Feb 2021 21:02:06 +1000
|
|
Subject: Disable introspection
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 83976fd..5653225 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -70,7 +70,7 @@ m4_define([gtk_required_version], [3.22.29])
|
|
m4_define([gtkdoc_required_version], [1.0])
|
|
m4_define([harfbuzz_required_version], [1.0.5])
|
|
m4_define([intltool_required_version], [0.40.1])
|
|
-m4_define([introspection_required_version], [1.32.0])
|
|
+#m4_define([introspection_required_version], [1.32.0])
|
|
m4_define([json_glib_required_version], [1.2.6])
|
|
m4_define([lcms_required_version], [2.8])
|
|
m4_define([libgudev_required_version], [167])
|
|
@@ -2309,7 +2309,7 @@ AM_CONDITIONAL(WITH_PDBGEN, test "x$with_pdbgen" = xyes)
|
|
# Check for GObject Introspection
|
|
#################################
|
|
|
|
-GOBJECT_INTROSPECTION_REQUIRE(introspection_required_version)
|
|
+#GOBJECT_INTROSPECTION_REQUIRE(introspection_required_version)
|
|
|
|
#####################
|
|
# Check for json-glib
|
|
--
|
|
2.30.2
|
|
|
|
|
|
From ff2801623aa28357e1175080b1c590f8a5f2740c Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Fri, 12 Feb 2021 21:59:05 +1000
|
|
Subject: Fix build
|
|
|
|
|
|
diff --git a/libgimpbase/gimputils.c b/libgimpbase/gimputils.c
|
|
index 03892e0..63e3a2e 100644
|
|
--- a/libgimpbase/gimputils.c
|
|
+++ b/libgimpbase/gimputils.c
|
|
@@ -50,7 +50,9 @@
|
|
|
|
/* For thread IDs. */
|
|
#include <sys/types.h>
|
|
+#ifndef __HAIKU__
|
|
#include <sys/syscall.h>
|
|
+#endif
|
|
|
|
#ifdef HAVE_SYS_PRCTL_H
|
|
#include <sys/prctl.h>
|
|
--
|
|
2.30.2
|
|
|
|
|
|
From e2dcf70dd7840fa38f2ff0d2feb6defbe85c4548 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Fri, 12 Feb 2021 22:47:59 +1000
|
|
Subject: Remove introspection files
|
|
|
|
|
|
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
|
|
index ce60e05..8aa3dd9 100644
|
|
--- a/libgimp/Makefile.am
|
|
+++ b/libgimp/Makefile.am
|
|
@@ -392,10 +392,10 @@ GimpUi_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_SCANNERFLAGS = \
|
|
|
|
|
|
girdir = $(datadir)/gir-1.0
|
|
-gir_DATA = $(INTROSPECTION_GIRS)
|
|
+gir_DATA =
|
|
|
|
typelibdir = $(libdir)/girepository-1.0
|
|
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
|
|
+typelib_DATA =
|
|
|
|
CLEANFILES += $(gir_DATA) $(typelib_DATA)
|
|
|
|
--
|
|
2.30.2
|
|
|
|
|
|
From 80faf9d9a51e2cb29abfb238592599537dae0205 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Sat, 29 Jan 2022 23:06:39 +1000
|
|
Subject: Use posix_spawn instead g_spawn_async
|
|
|
|
|
|
diff --git a/app/core/gimp-spawn.c b/app/core/gimp-spawn.c
|
|
index bfa08e8..eb0e7bb 100644
|
|
--- a/app/core/gimp-spawn.c
|
|
+++ b/app/core/gimp-spawn.c
|
|
@@ -166,6 +166,21 @@ gimp_spawn_async (gchar **argv,
|
|
{
|
|
g_return_val_if_fail (argv != NULL, FALSE);
|
|
g_return_val_if_fail (argv[0] != NULL, FALSE);
|
|
+
|
|
+#ifdef __HAIKU__
|
|
+
|
|
+ int status = posix_spawn(child_pid, argv[0], NULL, NULL, argv, envp);
|
|
+ if (status == 0)
|
|
+ return TRUE;
|
|
+
|
|
+ g_set_error (error,
|
|
+ G_SPAWN_ERROR,
|
|
+ G_SPAWN_ERROR_FORK,
|
|
+ _("Failed to spawn (%s)"),
|
|
+ g_strerror (status));
|
|
+ return FALSE;
|
|
+
|
|
+#else
|
|
|
|
#ifdef HAVE_VFORK
|
|
if (flags == (G_SPAWN_LEAVE_DESCRIPTORS_OPEN |
|
|
@@ -235,6 +250,7 @@ gimp_spawn_async (gchar **argv,
|
|
#endif /* HAVE_VFORK */
|
|
|
|
return g_spawn_async (NULL, argv, envp, flags, NULL, NULL, child_pid, error);
|
|
+#endif /* __HAIKU__ */
|
|
}
|
|
|
|
void
|
|
--
|
|
2.30.2
|
|
|