<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141283] trunk/dports/gnome/gtk2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141283">141283</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-10-14 07:59:20 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gtk2: add patch to fix crasing on 10.11; is already integrated into the gtk2 repo and will be in the next release. Addresses ticket #49090.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtk2Portfile">trunk/dports/gnome/gtk2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtk2filespatchmodules_input_imquartzdiff">trunk/dports/gnome/gtk2/files/patch-modules_input_imquartz.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegtk2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gtk2/Portfile (141282 => 141283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtk2/Portfile 2015-10-14 14:21:49 UTC (rev 141282)
+++ trunk/dports/gnome/gtk2/Portfile 2015-10-14 14:59:20 UTC (rev 141283)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx">
</span><span class="cx"> name gtk2
</span><span class="cx"> version 2.24.28
</span><ins>+revision 1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories gnome x11
</span><span class="cx"> license LGPL-2+
</span><span class="lines">@@ -51,6 +52,11 @@
</span><span class="cx"> patchfiles-append patch-aliases.diff
</span><span class="cx"> patchfiles-append patch-gtk-builder-convert.diff
</span><span class="cx">
</span><ins>+# temporary patch before the next release
+# ticket #49090: "gtk2 crashing in 10.11"
+
+patchfiles-append patch-modules_input_imquartz.diff
+
</ins><span class="cx"> # autoreconf to deal with stupid issues during install (install: .libs/libferret.lai: No such file or directory)
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span></span></pre></div>
<a id="trunkdportsgnomegtk2filespatchmodules_input_imquartzdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gtk2/files/patch-modules_input_imquartz.diff (0 => 141283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtk2/files/patch-modules_input_imquartz.diff (rev 0)
+++ trunk/dports/gnome/gtk2/files/patch-modules_input_imquartz.diff 2015-10-14 14:59:20 UTC (rev 141283)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+--- modules/input/imquartz.c.orig
++++ modules/input/imquartz.c
+@@ -195,11 +195,7 @@ quartz_filter_keypress (GtkIMContext *context,
+ return FALSE;
+
+ nsview = gdk_quartz_window_get_nsview (qc->client_window);
+- if (GDK_IS_WINDOW (nsview))
+- /* it gets GDK_WINDOW in some cases */
+- return gtk_im_context_filter_keypress (qc->slave, event);
+- else
+- win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow];
++ win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow];
+ GTK_NOTE (MISC, g_print ("client_window: %p, win: %p, nsview: %p\n",
+ qc->client_window, win, nsview));
+
+@@ -251,9 +247,6 @@ discard_preedit (GtkIMContext *context)
+ if (!nsview)
+ return;
+
+- if (GDK_IS_WINDOW (nsview))
+- return;
+-
+ /* reset any partial input for this NSView */
+ [(GdkQuartzView *)nsview unmarkText];
+ NSInputManager *currentInputManager = [NSInputManager currentInputManager];
+@@ -334,9 +327,6 @@ quartz_set_cursor_location (GtkIMContext *context, GdkRectangle *area)
+ qc->cursor_rect->y = area->y + y;
+
+ nsview = gdk_quartz_window_get_nsview (qc->client_window);
+- if (GDK_IS_WINDOW (nsview))
+- /* it returns GDK_WINDOW in some cases */
+- return;
+
+ win = (GdkWindow *)[ (GdkQuartzView*)nsview gdkWindow];
+ g_object_set_data (G_OBJECT (win), GIC_CURSOR_RECT, qc->cursor_rect);
</ins></span></pre>
</div>
</div>
</body>
</html>