cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove cherry-picked gtk+3 crash fix (Makefile r1.3)

Browse Source 
The 0.22 release contains this commit but the update didn't remove the
patch, causing it to apply reversed and thus reintroducing the crash...
This commit is contained in:
kn 2021-10-11 09:31:25 +00:00
parent 021999c56b
commit dccd9e7616
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/dino/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2021/10/04 16:32:34 paco Exp $
# $OpenBSD: Makefile,v 1.6 2021/10/11 09:31:25 kn Exp $
COMMENT= XMPP desktop client
VERSION= 0.2.2
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
View File

@ -1,18 +0,0 @@
$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));
}