Revision: 93867 https://trac.macports.org/changeset/93867 Author: jeremyhu@macports.org Date: 2012-06-01 10:54:13 -0700 (Fri, 01 Jun 2012) Log Message: ----------- quartz-wm: Fix a crash when minimizing windows with no title Modified Paths: -------------- trunk/dports/x11/quartz-wm/Portfile Added Paths: ----------- trunk/dports/x11/quartz-wm/files/no_title_crash.patch Modified: trunk/dports/x11/quartz-wm/Portfile =================================================================== --- trunk/dports/x11/quartz-wm/Portfile 2012-06-01 17:36:41 UTC (rev 93866) +++ trunk/dports/x11/quartz-wm/Portfile 2012-06-01 17:54:13 UTC (rev 93867) @@ -4,6 +4,7 @@ name quartz-wm version 1.3.1 +revision 1 categories x11 maintainers jeremyhu openmaintainer description Apple's Window Manager for X11 @@ -27,6 +28,10 @@ port:xorg-libAppleWM \ path:lib/pkgconfig/pixman-1.pc:libpixman +patch.pre_args -p1 +patchfiles \ + no_title_crash.patch + # http://trac.macports.org/ticket/33515 if {${os.arch} == "powerpc"} { # This is sub-optimal, but it will work for now Added: trunk/dports/x11/quartz-wm/files/no_title_crash.patch =================================================================== --- trunk/dports/x11/quartz-wm/files/no_title_crash.patch (rev 0) +++ trunk/dports/x11/quartz-wm/files/no_title_crash.patch 2012-06-01 17:54:13 UTC (rev 93867) @@ -0,0 +1,25 @@ +commit c28527b1340c51f2b492a31e49127106cebbfc5d +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Fri Jun 1 10:38:37 2012 -0700 + + Fix a crash when minimizing windows without titles + + <rdar://problem/11575791> + + Regression-from: 21f210c923aa5d79400ce46275084f2636c92bd9 + + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + +diff --git a/src/x-window.m b/src/x-window.m +index a210c6a..e3b9066 100644 +--- a/src/x-window.m ++++ b/src/x-window.m +@@ -2139,7 +2139,7 @@ - (void) do_collapse + if (wid == XP_NULL_NATIVE_WINDOW_ID) + return; + +- title_c = strdup([_title UTF8String]); ++ title_c = strdup([[self title] UTF8String]); + assert(title_c); + + err = qwm_dock_minimize_item_with_title_async (wid, title_c);