Re: net/dino got broken

Stuart Henderson <stu@spacehopper.org> writes:

> Try https://github.com/dino/dino/commit/7cedb64d3f550908b85b776dc8db49746c55e291

Yep, it builds and works! Thanks!

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/dino/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 16 Jan 2021 21:08:39 -0000 1.2
+++ Makefile 29 Aug 2021 10:56:47 -0000
@@ -4,6 +4,7 @@ COMMENT= XMPP desktop client
VERSION= 0.2.0
DISTNAME= dino-${VERSION}
CATEGORIES= net x11
+REVISION= 0

SHARED_LIBS += dino 0.0 # 0.0
SHARED_LIBS += qlite 0.0 # 0.1
Index: patches/patch-main_src_emojichooser_c
===================================================================
RCS file: patches/patch-main_src_emojichooser_c
diff -N patches/patch-main_src_emojichooser_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-main_src_emojichooser_c 29 Aug 2021 10:54:42 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+"Fix custom emoji picker for gtk >= 3.24.30", backported from
+https://github.com/dino/dino/commit/7cedb64d3f550908b85b776dc8db49746c55e291
+
+Index: main/src/emojichooser.c
+--- main/src/emojichooser.c.orig
++++ main/src/emojichooser.c
+@@ -437,6 +437,9 @@ populate_emoji_chooser (gpointer data)
+ if (!chooser->data)
+ {
+ bytes = g_resources_lookup_data ("/org/gtk/libgtk/emoji/emoji.data", 0, NULL);
++ if (bytes == NULL) {
++ bytes = g_resources_lookup_data ("/org/gtk/libgtk/emoji/en.data", 0, NULL);
++ }
+ chooser->data = g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE ("a(auss)"), bytes, TRUE));
+ }
+