<!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>[147870] trunk/dports/graphics/ipe</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/147870">147870</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-04-19 11:16:54 -0700 (Tue, 19 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ipe: apply numerous maintainer fixes for build on 10.9, 10.10.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsipePortfile">trunk/dports/graphics/ipe/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsipefilespatchipeolderosxversionsdiff">trunk/dports/graphics/ipe/files/patch-ipe-older-osx-versions.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsipefilespatchsrcipecanvasipeselector_cocoacppdiff">trunk/dports/graphics/ipe/files/patch-src-ipecanvas-ipeselector_cocoa.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsipePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/ipe/Portfile (147869 => 147870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/Portfile 2016-04-19 17:49:26 UTC (rev 147869)
+++ trunk/dports/graphics/ipe/Portfile 2016-04-19 18:16:54 UTC (rev 147870)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><span class="cx"> patchfiles patch-ipe-mainmenu.xib.diff \
</span><del>- patch-src-ipecanvas-ipeselector_cocoa.cpp.diff
</del><ins>+ patch-ipe-older-osx-versions.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchipeolderosxversionsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/ipe/files/patch-ipe-older-osx-versions.diff (0 => 147870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-ipe-older-osx-versions.diff (rev 0)
+++ trunk/dports/graphics/ipe/files/patch-ipe-older-osx-versions.diff 2016-04-19 18:16:54 UTC (rev 147870)
</span><span class="lines">@@ -0,0 +1,384 @@
</span><ins>+diff --git ipe/Makefile ipe/Makefile
+index 06e07ed..6ab7658 100644
+--- ipe/Makefile
++++ ipe/Makefile
+@@ -51,6 +51,7 @@ ifdef IPEUI_COCOA
+ nib = $(RESOURCEDIR)/mainmenu.nib
+
+ $(nib): mainmenu.xib
++ $(INSTALL_DIR) $(RESOURCEDIR)
+ ibtool --compile $(nib) mainmenu.xib
+
+ else
+diff --git ipe/appui_cocoa.cpp ipe/appui_cocoa.cpp
+index a26f7b8..6f7ecad 100644
+--- ipe/appui_cocoa.cpp
++++ ipe/appui_cocoa.cpp
+@@ -339,7 +339,7 @@ static NSImage *loadIcon(String action)
+ return t;
+ }
+
+-- (NSArray<NSString *> *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar
++- (NSArray *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar
+ {
+ return @[ @"copy", @"cut", @"paste", @"delete", @"undo", @"redo",
+ @"zoom_in", @"zoom_out", @"fit_objects", @"fit_page",
+@@ -357,7 +357,7 @@ static NSImage *loadIcon(String action)
+ ];
+ }
+
+-- (NSArray<NSString *> *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar
++- (NSArray *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar
+ {
+ return @[ @"mode_select", @"mode_translate", @"mode_rotate",
+ @"mode_stretch", @"mode_pan", @"mode_shredder",
+@@ -585,7 +585,7 @@ AppUi::AppUi(lua_State *L0, int model)
+ iLayerBox = [[NSBox alloc] initWithFrame:subRect];
+ iLayerBox.title = @"Layers";
+
+- NSRect layerFrame = iLayerBox.contentView.frame;
++ NSRect layerFrame = [iLayerBox.contentView frame];
+ iLayerView = [[IpeLayerView alloc] initWithFrame:layerFrame];
+ iLayerView.delegate = iDelegate;
+ iLayerView.toolTip = @"Layers of this page";
+@@ -921,9 +921,9 @@ void AppUi::setCheckMark(String name, String value)
+ NSString *prefix = I2N(name);
+ for (NSString *action in iActions) {
+ if ([action hasPrefix:prefix])
+- iActions[action].state = NO;
++ ((IpeAction *)iActions[action]).state = NO;
+ }
+- iActions[I2N(name + value)].state = YES;
++ ((IpeAction *)iActions[I2N(name + value)]).state = YES;
+ }
+
+ void AppUi::setLayers(const Page *page, int view)
+@@ -955,16 +955,16 @@ void AppUi::setNumbers(String vno, bool vm, String pno, bool pm)
+ BOOL AppUi::validateMenuItem(NSMenuItem *item, NSString *name)
+ {
+ if ([name isEqualToString:@"snapbar"]) {
+- item.title = iSnapBar.hidden ? @"Show Snap Toolbar" :
++ item.title = [iSnapBar isHidden] ? @"Show Snap Toolbar" :
+ @"Hide Snap Toolbar";
+ return YES;
+ }
+ IpeAction *s = findAction(name);
+ if (s) {
+ if ([name isEqualToString:@"toggle_notes"])
+- s.state = (iNotesPanel && iNotesPanel.visible);
++ s.state = (iNotesPanel && [iNotesPanel isVisible]);
+ else if ([name isEqualToString:@"toggle_bookmarks"])
+- s.state = (iBookmarksPanel && iBookmarksPanel.visible);
++ s.state = (iBookmarksPanel && [iBookmarksPanel isVisible]);
+ [item setState:(s.state ? NSOnState : NSOffState)];
+ return actionsEnabled() || s.alwaysOn;
+ }
+@@ -1024,8 +1024,8 @@ void AppUi::fillDynamicSubmenu(NSMenuItem *item)
+
+ void AppUi::toggleSnapbarShown()
+ {
+- iSnapBar.hidden = !iSnapBar.hidden;
+- if (iSnapBar.hidden) {
++ iSnapBar.hidden = ![iSnapBar isHidden];
++ if ([iSnapBar isHidden]) {
+ activateConstraint(iViewToSnapBar, NO);
+ activateConstraint(iViewToTop, YES);
+ } else {
+diff --git ipe/appui_cocoa.h ipe/appui_cocoa.h
+index 4305b86..fa25320 100644
+--- ipe/appui_cocoa.h
++++ ipe/appui_cocoa.h
+@@ -112,7 +112,7 @@ private:
+ virtual void setButtonColor(int sel, Color color) override;
+
+ private:
+- NSMutableDictionary <NSString *, IpeAction *> *iActions;
++ NSMutableDictionary *iActions; // <NSString *, IpeAction *>
+ bool iActionsEnabled;
+ bool iInUiUpdate;
+ NSWindow *iWindow;
+diff --git ipe/controls_cocoa.cpp ipe/controls_cocoa.cpp
+index d6d079c..1d1c582 100644
+--- ipe/controls_cocoa.cpp
++++ ipe/controls_cocoa.cpp
+@@ -229,7 +229,7 @@ extern CGContextRef ipeGetCGContext();
+
+ @implementation IpeLayerView {
+ NSTableView *iTV;
+- NSMutableArray <IpeLayerItem *> *iLayers;
++ NSMutableArray *iLayers; // <IpeLayerItem *>
+ }
+
+ - (instancetype) initWithFrame:(NSRect) rect
+@@ -283,20 +283,20 @@ extern CGContextRef ipeGetCGContext();
+ - (void) ipeLayerToggled:(id) sender
+ {
+ int row = [sender tag];
+- if (iLayers[row].checked)
+- [self.delegate layerAction:@"selectoff" forLayer:iLayers[row].name];
++ if (((IpeLayerItem *)iLayers[row]).checked)
++ [self.delegate layerAction:@"selectoff" forLayer:((IpeLayerItem *)iLayers[row]).name];
+ else
+- [self.delegate layerAction:@"selecton" forLayer:iLayers[row].name];
++ [self.delegate layerAction:@"selecton" forLayer:((IpeLayerItem *)iLayers[row]).name];
+ }
+
+ - (void) ipeLayerClicked:(int) row
+ {
+- [self.delegate layerAction:@"active" forLayer:iLayers[row].name];
++ [self.delegate layerAction:@"active" forLayer:((IpeLayerItem *)iLayers[row]).name];
+ }
+
+ - (void) ipeLayerMenuAt:(NSPoint) p forRow:(int) row
+ {
+- [self.delegate layerMenuAt:p forLayer:iLayers[row].name];
++ [self.delegate layerMenuAt:p forLayer:((IpeLayerItem *)iLayers[row]).name];
+ }
+
+ - (NSInteger) numberOfRowsInTableView:(NSTableView *) tv
+@@ -309,9 +309,9 @@ objectValueForTableColumn:(NSTableColumn *) col
+ row:(NSInteger)row
+ {
+ if ([[col identifier] isEqualToString:@"checks"])
+- return [NSNumber numberWithBool:iLayers[row].checked];
++ return [NSNumber numberWithBool:((IpeLayerItem *)iLayers[row]).checked];
+ else
+- return iLayers[row].name;
++ return ((IpeLayerItem *)iLayers[row]).name;
+ }
+
+ - (NSView *) tableView:(NSTableView *) tv
+@@ -328,7 +328,7 @@ objectValueForTableColumn:(NSTableColumn *) col
+ [result setAction:@selector(ipeLayerToggled:)];
+ [result setTarget:self];
+ [result setTag:row];
+- [result setState:iLayers[row].checked];
++ [result setState:((IpeLayerItem *)iLayers[row]).checked];
+ return result;
+ } else {
+ IpeLayerField *result = [tv makeViewWithIdentifier:@"LayerName" owner:self];
+@@ -349,7 +349,7 @@ objectValueForTableColumn:(NSTableColumn *) col
+
+ @implementation IpeBookmarksView {
+ NSTableView *iTV;
+- NSMutableArray <NSString *> *iBookmarks;
++ NSMutableArray *iBookmarks; // <NSString *>
+ }
+
+ - (instancetype) initWithFrame:(NSRect) rect
+diff --git ipe/main_cocoa.cpp ipe/main_cocoa.cpp
+index 132eaaa..4e00495 100644
+--- ipe/main_cocoa.cpp
++++ ipe/main_cocoa.cpp
+@@ -72,7 +72,7 @@ static void setup_globals(lua_State *L)
+ IPELIB_VERSION % 100);
+ lua_setfield(L, -2, "version");
+
+- NSArray <NSString *> *args = [[NSProcessInfo processInfo] arguments];
++ NSArray *args = [[NSProcessInfo processInfo] arguments];
+ int argc = [args count];
+ lua_createtable(L, 0, argc - 1);
+ for (int i = 1; i < argc; ++i) {
+diff --git ipe/pagesorter_cocoa.cpp ipe/pagesorter_cocoa.cpp
+index 3cb7500..4cbe980 100644
+--- ipe/pagesorter_cocoa.cpp
++++ ipe/pagesorter_cocoa.cpp
+@@ -131,7 +131,7 @@ extern NSSize thumbnail_size; // in ipeselector_cocoa.cpp
+ @interface IpePageSorterDelegate : NSObject <NSWindowDelegate,
+ NSCollectionViewDelegate>
+
+-@property NSMutableArray <IpeSelectorItem *> *pages;
++@property NSMutableArray *pages; // <IpeSelectorItem *>
+ @property (assign) NSCollectionView *cv;
+
+ - (void) ipeAccept;
+@@ -249,7 +249,7 @@ int AppUi::pageSorter(lua_State *L, Document *doc,
+ }
+
+ NSScrollView *scroll =
+- [[NSScrollView alloc] initWithFrame:panel.contentView.frame];
++ [[NSScrollView alloc] initWithFrame:[panel.contentView frame]];
+ scroll.autoresizingMask = NSViewWidthSizable|NSViewHeightSizable;
+ scroll.hasVerticalScroller = YES;
+
+@@ -326,7 +326,7 @@ int AppUi::pageSorter(lua_State *L, Document *doc,
+ int n = [delegate.pages count];
+ lua_createtable(L, n, 0);
+ for (int i = 1; i <= n; ++i) {
+- lua_pushinteger(L, delegate.pages[i-1].index + 1);
++ lua_pushinteger(L, ((IpeSelectorItem *)delegate.pages[i-1]).index + 1);
+ lua_rawseti(L, -2, i);
+ }
+ return 1;
+diff --git ipecanvas/ipecanvas_cocoa.cpp ipecanvas/ipecanvas_cocoa.cpp
+index 2af4ca7..966a12b 100644
+--- ipecanvas/ipecanvas_cocoa.cpp
++++ ipecanvas/ipecanvas_cocoa.cpp
+@@ -45,15 +45,20 @@ static CGContextRef gc_graphics_port()
+
+ static CGContextRef gc_cgcontext()
+ {
++ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+ return [[NSGraphicsContext currentContext] CGContext];
++ #else
++ return nil;
++ #endif
+ }
+
+ CGContextRef ipeGetCGContext()
+ {
++ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+ if ([NSGraphicsContext instancesRespondToSelector:@selector(CGContext)])
+- return gc_cgcontext();
+- else
+- return gc_graphics_port();
++ return [[NSGraphicsContext currentContext] CGContext];
++ #endif
++ return (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
+ }
+
+ // --------------------------------------------------------------------
+@@ -63,10 +68,11 @@ Canvas::Canvas(IpeCanvasView *view)
+ iView = view;
+ iLayer = NULL;
+
++ iGCGetter = gc_graphics_port;
++ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+ if ([NSGraphicsContext instancesRespondToSelector:@selector(CGContext)])
+ iGCGetter = gc_cgcontext;
+- else
+- iGCGetter = gc_graphics_port;
++ #endif
+ }
+
+ Canvas::~Canvas()
+diff --git ipecanvas/ipeselector_cocoa.cpp ipecanvas/ipeselector_cocoa.cpp
+index 9a5129b..7b2891d 100644
+--- ipecanvas/ipeselector_cocoa.cpp
++++ ipecanvas/ipeselector_cocoa.cpp
+@@ -241,7 +241,7 @@ int CanvasBase::selectPageOrView(Document *doc, int page, int startIndex,
+ }
+
+ NSScrollView *scroll =
+- [[NSScrollView alloc] initWithFrame:panel.contentView.frame];
++ [[NSScrollView alloc] initWithFrame:[panel.contentView frame]];
+ scroll.autoresizingMask = NSViewWidthSizable|NSViewHeightSizable;
+ scroll.hasVerticalScroller = YES;
+ panel.contentView = scroll;
+diff --git ipeui/ipeui_cocoa.cpp ipeui/ipeui_cocoa.cpp
+index 4ac1035..7918ca6 100644
+--- ipeui/ipeui_cocoa.cpp
++++ ipeui/ipeui_cocoa.cpp
+@@ -52,10 +52,11 @@ inline NSString *C2N(const char *s) {return [NSString stringWithUTF8String:s];}
+
+ CGContextRef ipeGetCGContext()
+ {
++ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+ if ([NSGraphicsContext instancesRespondToSelector:@selector(CGContext)])
+ return [[NSGraphicsContext currentContext] CGContext];
+- else
+- return (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
++ #endif
++ return (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
+ }
+
+ // --------------------------------------------------------------------
+@@ -83,6 +84,7 @@ void addToLayout(NSView *view, NSView *subview)
+
+ id layoutGuide(NSView *owner)
+ {
++ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
+ if ([owner respondsToSelector:@selector(addLayoutGuide:)]) {
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+@@ -90,11 +92,11 @@ id layoutGuide(NSView *owner)
+ [owner addLayoutGuide:g];
+ #pragma clang diagnostic pop
+ return g;
+- } else {
+- NSView *g = [[NSView alloc] initWithFrame:NSZeroRect];
+- addToLayout(owner, g);
+- return g;
+ }
++ #endif
++ NSView *g = [[NSView alloc] initWithFrame:NSZeroRect];
++ addToLayout(owner, g);
++ return g;
+ }
+
+ static NSLayoutAttribute layoutAttribute(char ch)
+@@ -138,40 +140,44 @@ static NSView *owner(id a)
+ {
+ if ([a respondsToSelector:@selector(superview)])
+ return [a superview];
++ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
+ if ([a respondsToSelector:@selector(owningView)])
+ return [a owningView]; // is a layout guide
++ #endif
+ return nil;
+ }
+
+ void activateConstraint(NSLayoutConstraint *c, BOOL active)
+ {
++ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+ if ([c respondsToSelector:@selector(setActive:)]) {
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ c.active = active;
++ return;
+ #pragma clang diagnostic pop
+- } else {
+- // need to figure out lowest common ancestor
+- id a = c.firstItem;
+- id b = c.secondItem;
+- NSView *lca = nil;
+- NSView *ao = owner(a);
+- NSView *bo = owner(b);
+- if (b == nil)
+- lca = a;
+- else if (ao == b)
+- lca = b;
+- else if (bo == a)
+- lca = a;
+- else {
+- assert(ao == bo);
+- lca = ao;
+- }
+- if (active)
+- [lca addConstraint:c];
+- else
+- [lca removeConstraint:c];
+ }
++ #endif
++ // need to figure out lowest common ancestor
++ id a = c.firstItem;
++ id b = c.secondItem;
++ NSView *lca = nil;
++ NSView *ao = owner(a);
++ NSView *bo = owner(b);
++ if (b == nil)
++ lca = a;
++ else if (ao == b)
++ lca = b;
++ else if (bo == a)
++ lca = a;
++ else {
++ assert(ao == bo);
++ lca = ao;
++ }
++ if (active)
++ [lca addConstraint:c];
++ else
++ [lca removeConstraint:c];
+ }
+
+ NSLayoutConstraint *layout(id a, id b, const char *rel, double gap,
+@@ -253,7 +259,7 @@ private:
+ private:
+ NSPanel *iPanel;
+ IpeDialogDelegate *iDelegate;
+- NSMutableArray <NSView *> *iViews;
++ NSMutableArray *iViews; // <NSView *>
+ };
+
+ // --------------------------------------------------------------------
</ins></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchsrcipecanvasipeselector_cocoacppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/ipe/files/patch-src-ipecanvas-ipeselector_cocoa.cpp.diff (147869 => 147870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-src-ipecanvas-ipeselector_cocoa.cpp.diff 2016-04-19 17:49:26 UTC (rev 147869)
+++ trunk/dports/graphics/ipe/files/patch-src-ipecanvas-ipeselector_cocoa.cpp.diff 2016-04-19 18:16:54 UTC (rev 147870)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- ipecanvas/ipeselector_cocoa.cpp.orig 2016-04-11 09:52:33.000000000 -0700
-+++ ipecanvas/ipeselector_cocoa.cpp 2016-04-11 09:54:10.000000000 -0700
-@@ -241,7 +241,7 @@
- }
-
- NSScrollView *scroll =
-- [[NSScrollView alloc] initWithFrame:panel.contentView.frame];
-+ [[NSScrollView alloc] initWithFrame:[panel.contentView frame]];
- scroll.autoresizingMask = NSViewWidthSizable|NSViewHeightSizable;
- scroll.hasVerticalScroller = YES;
- panel.contentView = scroll;
</del></span></pre>
</div>
</div>
</body>
</html>