Grab patch from upstream to fix the build.
One of the patches cherry picked to the 3.14 branch depends on a glib API added in the 2.44 series. Add a patch from upstream to allow build with glib 2.42 in ports. PR: 201951 [1] Reported by: Walter Schwarzenfeld, Gary <freebsd-bugzilla@in-addr.com> [1] Obtained from: upstream gtk+ 3.14 branch
This commit is contained in:
parent
7fd5d8e4f4
commit
065d1b2cb3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=393105
28
x11-toolkits/gtk30/files/patch-34e6e1a
Normal file
28
x11-toolkits/gtk30/files/patch-34e6e1a
Normal file
@ -0,0 +1,28 @@
|
||||
From 34e6e1a599375da5665f4829faedf4c640f031a6 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Tue, 21 Jul 2015 12:03:52 -0400
|
||||
Subject: Avoid g_set_object
|
||||
|
||||
One of the backported fixes brought in a dependency on new glib
|
||||
that I didn't mean to introduce here. Avoid it.
|
||||
|
||||
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
|
||||
index 364c382..8ff85ce 100644
|
||||
--- gtk/gtkdnd.c
|
||||
+++ gtk/gtkdnd.c
|
||||
@@ -3258,7 +3258,11 @@ set_icon_helper (GdkDragContext *context,
|
||||
|
||||
info = gtk_drag_get_source_info (context, FALSE);
|
||||
|
||||
- g_set_object (&info->icon_helper, helper);
|
||||
+ if (helper)
|
||||
+ g_object_ref (helper);
|
||||
+ if (info->icon_helper)
|
||||
+ g_object_unref (info->icon_helper);
|
||||
+ info->icon_helper = helper;
|
||||
gtk_drag_set_icon_window (context, NULL, hot_x, hot_y, TRUE);
|
||||
}
|
||||
else
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
Loading…
Reference in New Issue
Block a user