From 06b98c93927e938c12562f114205b7dace9a8512 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 26 Jan 2022 14:41:54 -0500
Subject: [PATCH] Inkscape: Fix crash on startup and enable!

---
 media-gfx/inkscape/inkscape-1.1.1.recipe      |  3 +-
 .../inkscape/patches/inkscape-1.1.1.patchset  | 48 +++++++++++++++++--
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.1.recipe b/media-gfx/inkscape/inkscape-1.1.1.recipe
index d6fe4cc5f..f2e17506b 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.recipe
+++ b/media-gfx/inkscape/inkscape-1.1.1.recipe
@@ -15,8 +15,7 @@ CHECKSUM_SHA256="aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978a
 SOURCE_DIR="inkscape-1.1.1_2021-09-20_3bf5ae0d25"
 PATCHES="inkscape-$portVersion.patchset"
 
-# disabled: crashes on startup for various reasons
-ARCHITECTURES="?all !x86_gcc2"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/media-gfx/inkscape/patches/inkscape-1.1.1.patchset b/media-gfx/inkscape/patches/inkscape-1.1.1.patchset
index 7b2f7edd6..715ad1c37 100644
--- a/media-gfx/inkscape/patches/inkscape-1.1.1.patchset
+++ b/media-gfx/inkscape/patches/inkscape-1.1.1.patchset
@@ -1,4 +1,4 @@
-From 97a13d23c93f83f32f734505dcd46e6ffe9d85de Mon Sep 17 00:00:00 2001
+From 4f9abbf12f8d63f0b5e03e4195fa441d1456257b Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Mon, 24 Jan 2022 17:27:43 -0500
 Subject: Fix build without Poppler.
@@ -27,7 +27,7 @@ index 4d77e4d..c1e33a5 100644
 2.30.2
 
 
-From 1c0fee9ec8c13b4f04fbace825a538a81d00f338 Mon Sep 17 00:00:00 2001
+From 1a8a3ec107603368cf0c40a986f36d90e9d972e0 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Mon, 24 Jan 2022 20:07:10 -0500
 Subject: tracedialog: Fix build under Haiku.
@@ -52,7 +52,7 @@ index 869510d..05f446d 100644
 2.30.2
 
 
-From 98493bef0d5329b8610fb7f704090a57b5ee8a0d Mon Sep 17 00:00:00 2001
+From fd79229a6a9875630ac595bc60b29b205ac309c6 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Mon, 24 Jan 2022 21:57:22 -0500
 Subject: Another no-Poppler fix.
@@ -92,3 +92,45 @@ index e02a575..d460ac1 100644
 -- 
 2.30.2
 
+
+From c86c492577876a99210437167adff470b7b05902 Mon Sep 17 00:00:00 2001
+From: Augustin Cavalier <waddlesplash@gmail.com>
+Date: Wed, 26 Jan 2022 12:17:06 -0500
+Subject: Add mechanism to get the program path under Haiku.
+
+
+diff --git a/src/path-prefix.cpp b/src/path-prefix.cpp
+index 1d61748..a8e8da1 100644
+--- a/src/path-prefix.cpp
++++ b/src/path-prefix.cpp
+@@ -31,6 +31,10 @@
+ #include <sys/sysctl.h>
+ #endif
+ 
++#ifdef __HAIKU__
++#include <kernel/image.h>
++#endif
++
+ #include <cassert>
+ #include <glib.h>
+ #include <glibmm.h>
+@@ -152,6 +156,16 @@ char const *get_program_name()
+        } else {
+            g_warning("get_program_name() - sysctl failed");
+        }      
++#elif defined(__HAIKU__)
++		int32 cookie = 0;
++		image_info info;
++		while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) {
++			if (info.type != B_APP_IMAGE)
++				continue;
++
++			program_name = realpath(info.name, nullptr);
++			break;
++		}
+ #else
+ #warning get_program_name() - no known way to obtain executable name on this platform
+         g_info("get_program_name() - no known way to obtain executable name on this platform");
+-- 
+2.30.2
+