<!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>[145862] 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/145862">145862</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2016-02-19 07:20:55 -0800 (Fri, 19 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ipe: update to 7.2.2; use cxx11; add qt4/5 variants; fix livecheck #50666</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="#trunkdportsgraphicsipefilesipein">trunk/dports/graphics/ipe/files/ipe.in</a></li>
<li><a href="#trunkdportsgraphicsipefilespatchipemainmenuxibdiff">trunk/dports/graphics/ipe/files/patch-ipe-mainmenu.xib.diff</a></li>
</ul>
<h3>Removed 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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsipePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/ipe/Portfile (145861 => 145862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/Portfile 2016-02-19 14:47:08 UTC (rev 145861)
+++ trunk/dports/graphics/ipe/Portfile 2016-02-19 15:20:55 UTC (rev 145862)
</span><span class="lines">@@ -2,10 +2,10 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup qt4 1.0
</del><ins>+PortGroup cxx11 1.0
</ins><span class="cx">
</span><span class="cx"> name ipe
</span><del>-version 7.1.10
</del><ins>+version 7.2.2
</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">@@ -18,32 +18,40 @@
</span><span class="cx"> Acrobat Reader.
</span><span class="cx"> license GPL-3+
</span><span class="cx"> homepage http://ipe.otfried.org
</span><del>-platforms darwin
</del><ins>+platforms macosx
</ins><span class="cx"> master_sites https://dl.bintray.com/otfried/generic/ipe/${branch}
</span><span class="cx"> distname ${name}-${version}-src
</span><span class="cx"> worksrcdir ${name}-${version}/src
</span><span class="cx">
</span><del>-checksums sha1 1fec414df0ce63fe7da2694a56ab808224c37288 \
- rmd160 6a2c3404a3673d901728f09f902601b9a3ba6947
</del><ins>+checksums sha1 a0934e9c01487219ae4726ab1cac42cc6fd27e96 \
+ rmd160 12fdc48bf37a477b5f6dddd2f18cbdafa1dd8ca0
</ins><span class="cx">
</span><ins>+depends_build-append path:bin/pkg-config:pkgconfig
+
</ins><span class="cx"> depends_lib-append port:freetype \
</span><span class="cx"> path:lib/pkgconfig/cairo.pc:cairo \
</span><span class="cx"> port:lua \
</span><del>- path:lib/libjpeg.dylib:jpeg \
</del><span class="cx"> port:libpng \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-patchfiles patch-ipelib-ipebitmap_unix.cpp.diff \
- patch-common.mak.diff \
- patch-ipelets-lua-Makefile.diff
</del><ins>+patchfiles patch-ipe-mainmenu.xib.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><ins>+universal_variant no
</ins><span class="cx">
</span><del>-variant universal {}
</del><ins>+variant qt4 conflicts qt5 description {Build using Qt4 based gui} {
+ PortGroup qt4 1.0
+ build.args-append QT_CFLAGS="`pkg-config --cflags QtGui QtCore`" \
+ QT_LIBS="`pkg-config --libs QtGui QtCore`"
+}
</ins><span class="cx">
</span><ins>+variant qt5 conflicts qt4 description {Build using Qt5 based gui} {
+ PortGroup qt5 1.0
+}
+
</ins><span class="cx"> variant qvoronoi description {Add qvoronoi ipelet} {
</span><span class="cx"> depends_lib-append port:qhull
</span><del>- build.post_args IPEQVORONOI=1 QHULL_CFLAGS=-I${prefix}/include/qhull
</del><ins>+ build.args-append IPEQVORONOI=1 QHULL_CFLAGS=-I${prefix}/include/qhull
</ins><span class="cx"> destroot.post_args IPEQVORONOI=1
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -51,43 +59,52 @@
</span><span class="cx">
</span><span class="cx"> pre-build {
</span><span class="cx"> build.env CXXFLAGS="[get_canonical_archflags cxx]" \
</span><del>- LDFLAGS="[get_canonical_archflags ld]" \
- PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:${qt_pkg_config_dir}
-
- build.args IPEPREFIX=${prefix} \
- ZLIB_CFLAGS="`pkg-config --cflags zlib`" \
- ZLIB_LIBS="`pkg-config --libs zlib`" \
- JPEG_LIBS="-ljpeg" \
- PNG_CFLAGS="`pkg-config --cflags libpng`" \
- PNG_LIBS="`pkg-config --libs libpng`" \
- FREETYPE_CFLAGS="`pkg-config --cflags freetype2`" \
- FREETYPE_LIBS="`pkg-config --libs freetype2`" \
- CAIRO_CFLAGS="`pkg-config --cflags cairo`" \
- CAIRO_LIBS="`pkg-config --libs cairo`" \
- LUA_CFLAGS="`pkg-config --cflags lua`" \
- LUA_LIBS="`pkg-config --libs lua`" \
- QT_CFLAGS="`pkg-config --cflags QtGui QtCore`" \
- QT_LIBS="`pkg-config --libs QtGui QtCore`" \
- MOC=${qt_moc_cmd} \
- CXX=${configure.cxx}
</del><ins>+ LDFLAGS="[get_canonical_archflags ld]"
+ build.args-append IPEPREFIX=${prefix} \
+ CXX=${configure.cxx} \
+ LUA_PACKAGE="lua" \
+ JPEG_LIBS="-framework ApplicationServices" \
+ IPECONFIGMAK="config.mak"
+ if {[variant_isset qt4] || [variant_isset qt5]} {
+ build.env-append PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:${qt_pkg_config_dir}
+ build.args-append IPEUI="QT" \
+ MOC=${qt_moc_cmd}
+ } else {
+ build.args-append IPEBUNDLE=1
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-destroot.args-append IPEPREFIX=${prefix}
-
</del><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><ins>+destroot.args-append IPEPREFIX=${prefix} \
+ IPECONFIGMAK="config.mak"
+if {[variant_isset qt4] || [variant_isset qt5]} {
+ destroot.args-append IPEUI="QT"
+} else {
+ destroot.args-append IPEBUNDLE=1
+ destroot.target app
+}
+
</ins><span class="cx"> platform macosx {
</span><del>- depends_build-append port:makeicns
</del><span class="cx"> post-destroot {
</span><del>- set app Ipe
- xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \
- ${destroot}${applications_dir}/${app}.app/Contents/Resources
- xinstall -m 644 ${filespath}/Info.plist.in ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
- reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
- reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
- ln -s ${prefix}/bin/ipe ${destroot}${applications_dir}/${app}.app/Contents/MacOS/${app}
- system "${prefix}/bin/makeicns -in ${worksrcpath}/ipe/icons/ipe.png -out ${destroot}${applications_dir}/${app}.app/Contents/Resources/${name}.icns"
</del><ins>+ if {[variant_isset qt4] || [variant_isset qt5]} {
+ set app Ipe
+ xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \
+ ${destroot}${applications_dir}/${app}.app/Contents/Resources
+ xinstall -m 644 ${filespath}/Info.plist.in ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+ reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+ reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+ ln -s ${prefix}/bin/ipe ${destroot}${applications_dir}/${app}.app/Contents/MacOS/${app}
+ xinstall -m 644 ${worksrcpath}/ipe/ipe.icns ${destroot}${applications_dir}/${app}.app/Contents/Resources/ipe.icns
+ } else {
+ copy ${worksrcpath}/../build/Ipe.app ${destroot}${applications_dir}/Ipe.app
+ reinplace "s|/usr/local/bin|/usr/local/bin:${prefix}/bin|g" ${destroot}${applications_dir}/Ipe.app/Contents/Info.plist
+ xinstall -m 755 ${filespath}/ipe.in ${destroot}${prefix}/bin/ipe
+ reinplace "s|@APPLICATIONSDIR@|${applications_dir}|g" ${destroot}${prefix}/bin/ipe
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.regex "/${name}-(\\d+(?:\\.\\d+)*)-src"
</del><ins>+livecheck.type regex
+livecheck.url ${homepage}
+livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)-src"
</ins></span></pre></div>
<a id="trunkdportsgraphicsipefilesipein"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/ipe/files/ipe.in (0 => 145862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/ipe.in (rev 0)
+++ trunk/dports/graphics/ipe/files/ipe.in 2016-02-19 15:20:55 UTC (rev 145862)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+#!/bin/sh
+exec @APPLICATIONSDIR@/Ipe.app/Contents/MacOS/ipe "$@"
</ins></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchcommonmakdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/ipe/files/patch-common.mak.diff (145861 => 145862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-common.mak.diff 2016-02-19 14:47:08 UTC (rev 145861)
+++ trunk/dports/graphics/ipe/files/patch-common.mak.diff 2016-02-19 15:20:55 UTC (rev 145862)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- 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)
</del></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchipemainmenuxibdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/ipe/files/patch-ipe-mainmenu.xib.diff (0 => 145862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-ipe-mainmenu.xib.diff (rev 0)
+++ trunk/dports/graphics/ipe/files/patch-ipe-mainmenu.xib.diff 2016-02-19 15:20:55 UTC (rev 145862)
</span><span class="lines">@@ -0,0 +1,176 @@
</span><ins>+--- /dev/null 2016-02-18 23:10:00.000000000 +0100
++++ ipe/mainmenu.xib 2016-02-18 23:07:52.000000000 +0100
+@@ -0,0 +1,173 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
++ toolsVersion="9060" systemVersion="15B42"
++ targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
++ useAutolayout="YES" customObjectInstantitationMethod="direct">
++ <dependencies>
++ <deployment identifier="macosx"/>
++ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
++ version="9060"/>
++ </dependencies>
++ <objects>
++ <customObject id="-2" userLabel="File's Owner"
++ customClass="NSApplication">
++ <connections>
++ <outlet property="delegate" destination="appdel" id="appdel-outlet"/>
++ </connections>
++ </customObject>
++ <customObject id="-1" userLabel="First Responder"
++ customClass="FirstResponder"/>
++ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
++ <customObject id="appdel" customClass="AppDelegate"/>
++ <menu title="Main Menu" systemMenu="main" id="main-menu">
++ <items>
++ <menuItem title="Ipe" id="apple-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Ipe" systemMenu="apple">
++ <items>
++ <menuItem title="About Ipe" id="about">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <connections>
++ <action selector="aboutIpe:" target="-1" id="about-action"/>
++ </connections>
++ </menuItem>
++ <menuItem isSeparatorItem="YES"/>
++ <menuItem title="Preferences…" keyEquivalent=","
++ id="preferences"/>
++ <menuItem isSeparatorItem="YES"/>
++ <menuItem title="Services" id="services">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Services"
++ systemMenu="services" id="services-submenu"/>
++ </menuItem>
++ <menuItem isSeparatorItem="YES"/>
++ <menuItem title="Hide Ipe" keyEquivalent="h" id="hide">
++ <connections>
++ <action selector="hide:" target="-1" id="hide-action"/>
++ </connections>
++ </menuItem>
++ <menuItem title="Hide Others" keyEquivalent="h"
++ id="hide-others">
++ <modifierMask key="keyEquivalentModifierMask"
++ option="YES" command="YES"/>
++ <connections>
++ <action selector="hideOtherApplications:"
++ target="-1" id="hide-others-action"/>
++ </connections>
++ </menuItem>
++ <menuItem title="Show All" id="show-all">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <connections>
++ <action selector="unhideAllApplications:"
++ target="-1" id="show-all-action"/>
++ </connections>
++ </menuItem>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="File" id="file-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="File">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Edit" id="edit-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Edit">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Properties" id="properties-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Properties">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Snap" id="snap-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Snap">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Mode" id="mode-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Mode">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Zoom" id="zoom-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Zoom">
++ <items>
++ <menuItem title="Show Toolbar" keyEquivalent="t"
++ id="show-toolbar">
++ <modifierMask key="keyEquivalentModifierMask"
++ option="YES" command="YES"/>
++ <connections>
++ <action selector="toggleToolbarShown:" target="-1"
++ id="show-toolbar-action"/>
++ </connections>
++ </menuItem>
++ <menuItem title="Show Snap Toolbar" keyEquivalent="s"
++ id="show-snapbar">
++ <modifierMask key="keyEquivalentModifierMask"
++ option="YES" command="YES"/>
++ <connections>
++ <action selector="toggleSnapbarShown:" target="-1"
++ id="show-snapbar-action"/>
++ </connections>
++ </menuItem>
++ <menuItem title="Customize Toolbar…" id="customize-toolbar">
++ <connections>
++ <action selector="runToolbarCustomizationPalette:"
++ target="-1" id="customize-toolbar-action"/>
++ </connections>
++ </menuItem>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Layers" id="layers-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Layers">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Views" id="views-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Views">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Pages" id="pages-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Pages">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Ipelets" id="ipelets-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Ipelets">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ <menuItem title="Help" id="help-menu">
++ <modifierMask key="keyEquivalentModifierMask"/>
++ <menu key="submenu" title="Help">
++ <items>
++ </items>
++ </menu>
++ </menuItem>
++ </items>
++ </menu>
++ </objects>
++ </document>
++
</ins></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchipeletsluaMakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff (145861 => 145862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff 2016-02-19 14:47:08 UTC (rev 145861)
+++ trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff 2016-02-19 15:20:55 UTC (rev 145862)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>---- 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
-
- # --------------------------------------------------------------------
</del></span></pre></div>
<a id="trunkdportsgraphicsipefilespatchipelibipebitmap_unixcppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff (145861 => 145862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff 2016-02-19 14:47:08 UTC (rev 145861)
+++ trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff 2016-02-19 15:20:55 UTC (rev 145862)
</span><span class="lines">@@ -1,75 +0,0 @@
</span><del>---- 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
-
- // --------------------------------------------------------------------
-
</del></span></pre>
</div>
</div>
</body>
</html>