<!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>[143827] 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/143827">143827</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-12-22 20:48:08 -0800 (Tue, 22 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ipe: maintainer update to version 7.1.10 (#50116).</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="#trunkdportsgraphicsipefilespatchcommonmakdiff">trunk/dports/graphics/ipe/files/patch-common.mak.diff</a></li>
<li><a href="#trunkdportsgraphicsipefilespatchipeletsluaMakefilediff">trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff</a></li>
<li><a href="#trunkdportsgraphicsipefilespatchipelibipebitmap_unixcppdiff">trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsipefilespatchipecanvasipecanvas_qtcppdiff">trunk/dports/graphics/ipe/files/patch-ipecanvas-ipecanvas_qt.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 (143826 => 143827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/Portfile 2015-12-23 01:45:53 UTC (rev 143826)
+++ trunk/dports/graphics/ipe/Portfile 2015-12-23 04:48:08 UTC (rev 143827)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><span class="cx"> name ipe
</span><del>-version 7.1.9
</del><ins>+version 7.1.10
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers gmail.com:m7.thon openmaintainer
</span><span class="lines">@@ -19,12 +19,12 @@
</span><span class="cx"> license GPL-3+
</span><span class="cx"> homepage http://ipe.otfried.org
</span><span class="cx"> platforms darwin
</span><del>-master_sites https://github.com/otfried/ipe/raw/master/releases/${branch}
</del><ins>+master_sites https://dl.bintray.com/otfried/generic/ipe/${branch}
</ins><span class="cx"> distname ${name}-${version}-src
</span><span class="cx"> worksrcdir ${name}-${version}/src
</span><span class="cx">
</span><del>-checksums sha1 ec213ad86393ab2e0de8581a50ce63a09b83186d \
- rmd160 03d4425b2b7cee4309d363ecc90bb3ddaab48542
</del><ins>+checksums sha1 1fec414df0ce63fe7da2694a56ab808224c37288 \
+ rmd160 6a2c3404a3673d901728f09f902601b9a3ba6947
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:freetype \
</span><span class="cx"> path:lib/pkgconfig/cairo.pc:cairo \
</span><span class="lines">@@ -33,7 +33,9 @@
</span><span class="cx"> port:libpng \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-patchfiles patch-ipecanvas-ipecanvas_qt.cpp.diff
</del><ins>+patchfiles patch-ipelib-ipebitmap_unix.cpp.diff \
+ patch-common.mak.diff \
+ patch-ipelets-lua-Makefile.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="lines">@@ -71,6 +73,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> destroot.args-append IPEPREFIX=${prefix}
</span><ins>+
</ins><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><span class="cx"> platform macosx {
</span></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchcommonmakdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/ipe/files/patch-common.mak.diff (0 => 143827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-common.mak.diff (rev 0)
+++ trunk/dports/graphics/ipe/files/patch-common.mak.diff 2015-12-23 04:48:08 UTC (rev 143827)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- common.mak.orig 2015-12-23 04:16:35.000000000 +0100
++++ common.mak 2015-12-23 04:20:02.000000000 +0100
+@@ -38,11 +38,7 @@
+ # Read configuration options (not used on Win32)
+
+ ifndef WIN32
+-ifdef MACOS
+- include $(IPESRCDIR)/macos.mak
+-else
+ include $(IPESRCDIR)/config.mak
+-endif
+ BUILDDIR = $(IPESRCDIR)/../build
+ ifdef IPECXX
+ CXX = $(IPECXX)
</ins></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchipecanvasipecanvas_qtcppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/ipe/files/patch-ipecanvas-ipecanvas_qt.cpp.diff (143826 => 143827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-ipecanvas-ipecanvas_qt.cpp.diff 2015-12-23 01:45:53 UTC (rev 143826)
+++ trunk/dports/graphics/ipe/files/patch-ipecanvas-ipecanvas_qt.cpp.diff 2015-12-23 04:48:08 UTC (rev 143827)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- ipecanvas/ipecanvas_qt.cpp.orig 2015-10-24 20:31:16.000000000 +0200
-+++ ipecanvas/ipecanvas_qt.cpp 2015-10-24 20:31:53.000000000 +0200
-@@ -239,7 +239,7 @@
- void Canvas::tabletEvent(QTabletEvent *ev)
- {
- Vector globalPos(ev->hiResGlobalX(), ev->hiResGlobalY());
-- QPointF hiPos = ev->posF();
-+ QPointF hiPos = ev->hiResGlobalPos() - (ev->globalPos() - ev->pos());
- ev->accept();
-
- switch (ev->type()) {
</del></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchipeletsluaMakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff (0 => 143827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff (rev 0)
+++ trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff 2015-12-23 04:48:08 UTC (rev 143827)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+--- ipelets/lua/Makefile.orig 2015-12-23 04:46:41.000000000 +0100
++++ ipelets/lua/Makefile 2015-12-23 04:46:52.000000000 +0100
+@@ -14,14 +14,5 @@
+ $(INSTALL_DIR) $(INSTALL_ROOT)$(IPELETDIR)
+ $(INSTALL_FILES) $(LUASCRIPTS) $(INSTALL_ROOT)$(IPELETDIR)
+
+-ifdef MACOS
+-
+-IPELETDIR = $(BUILDDIR)/Ipe.app/Contents/Resources/ipelets
+-
+-app:
+- $(INSTALL_DIR) $(IPELETDIR)
+- $(INSTALL_FILES) $(LUASCRIPTS) $(IPELETDIR)
+-
+-endif
+
+ # --------------------------------------------------------------------
</ins></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchipelibipebitmap_unixcppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff (0 => 143827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff (rev 0)
+++ trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff 2015-12-23 04:48:08 UTC (rev 143827)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+--- ipelib/ipebitmap_unix.cpp.orig 2015-12-23 04:02:26.000000000 +0100
++++ ipelib/ipebitmap_unix.cpp 2015-12-23 04:03:35.000000000 +0100
+@@ -32,64 +32,13 @@
+
+ #include <png.h>
+
+-#ifdef __APPLE__
+-#include <CoreGraphics.h>
+-#else
+ #include <csetjmp>
+ #include <jpeglib.h>
+-#endif
+
+ using namespace ipe;
+
+ // --------------------------------------------------------------------
+
+-#ifdef __APPLE__
+-
+-bool dctDecode(Buffer dctData, Buffer pixelData, int components)
+-{
+- CGDataProviderRef source =
+- CGDataProviderCreateWithData(NULL, dctData.data(),
+- dctData.size(), NULL);
+- CGImageRef bitmap =
+- CGImageCreateWithJPEGDataProvider(source, NULL, false,
+- kCGRenderingIntentDefault);
+-
+- if (CGImageGetBitsPerComponent(bitmap) != 8)
+- return false;
+-
+- int w = CGImageGetWidth(bitmap);
+- int h = CGImageGetHeight(bitmap);
+- int bytes = CGImageGetBitsPerPixel(bitmap) / 8;
+- int stride = CGImageGetBytesPerRow(bitmap);
+-
+- CGBitmapInfo info = CGImageGetBitmapInfo(bitmap);
+- // TODO: check for alpha channel, float pixel values, and byte order?
+- ipeDebug("dctDecode: %d x %d x %d, stride %d, info %x",
+- w, h, bytes, stride, info);
+-
+- // TODO: Is it necessary to copy the data?
+- CFDataRef pixels = CGDataProviderCopyData(CGImageGetDataProvider(bitmap));
+- const uchar *inRow = CFDataGetBytePtr(pixels);
+-
+- uchar *q = (uchar *) pixelData.data();
+- for (int y = 0; y < h; ++y) {
+- const uchar *p = inRow;
+- for (int x = 0; x < w; ++x) {
+- *q++ = p[0];
+- *q++ = p[1];
+- *q++ = p[2];
+- p += bytes;
+- }
+- inRow += stride;
+- }
+- CFRelease(pixels);
+- CGImageRelease(bitmap);
+- CGDataProviderRelease(source);
+- return true;
+-}
+-
+-#else
+-
+ // Decode jpeg image using libjpeg API with error handling
+ // Code contributed by Michael Thon, 2015.
+
+@@ -139,7 +88,6 @@
+ jpeg_destroy_decompress(&cinfo);
+ return true;
+ }
+-#endif
+
+ // --------------------------------------------------------------------
+
</ins></span></pre>
</div>
</div>
</body>
</html>