From c98dd1afb9e68a85ce8a1c86973e2cdf041f0e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 6 May 2021 15:32:44 +0200
Subject: [PATCH 1/2] emoji: Use a portable and configuration-dependent path to
 load the data

Load the emojis data in all the platforms, respecting the configured
GTK_DATA_PREFIX
---
 gtk/gtkemojichooser.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index 646be90ed3..9a1e11b450 100644
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@ -627,11 +627,15 @@ get_emoji_data (void)
   if (g_error_matches (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND))
     {
       char *filename;
+      char *gresource_name;
       GMappedFile *file;
 
       g_clear_error (&error);
 
-      filename = g_strconcat ("/usr/share/gtk-4.0/emoji/", lang, ".gresource", NULL);
+      gresource_name = g_strconcat (lang, ".gresource", NULL);
+      filename = g_build_filename (_gtk_get_data_prefix (), "share", "gtk-4.0",
+                                   "emoji", gresource_name, NULL);
+      g_clear_pointer (&gresource_name, g_free);
       file = g_mapped_file_new (filename, FALSE, NULL);
 
       if (file)

From 4a4525a65d783251d69c0ce1e2493f8126817649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 6 May 2021 15:34:30 +0200
Subject: [PATCH 2/2] emoji: remove duplicated include

---
 gtk/gtkemojichooser.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index 9a1e11b450..97738b947c 100644
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@ -31,7 +31,6 @@
 #include "gtkpopover.h"
 #include "gtkscrolledwindow.h"
 #include "gtkintl.h"
-#include "gtkprivate.h"
 #include "gtksearchentryprivate.h"
 #include "gtktext.h"
 #include "gtknative.h"