Import an upstream commit fixing a crash due to newer gtk3 version
7cedb64d3f
commit suggested by sthen@ , thanks!
diff ready to apply sent by Omar Polo, thanks too!
This commit is contained in:
parent
b20b5e87f2
commit
4bfa34b8b0
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2021/01/16 21:08:39 kn Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2021/08/29 12:59:17 solene Exp $
|
||||
|
||||
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
|
||||
|
18
net/dino/patches/patch-main_src_emojichooser_c
Normal file
18
net/dino/patches/patch-main_src_emojichooser_c
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-main_src_emojichooser_c,v 1.1 2021/08/29 12:59:17 solene Exp $
|
||||
|
||||
"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));
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user