<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/34f7c48e8248144276611584a2e5fde2472cdbce">https://github.com/macports/macports-ports/commit/34f7c48e8248144276611584a2e5fde2472cdbce</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 34f7c48e824 ipe: update to version 7.2.29
</span>34f7c48e824 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 34f7c48e8248144276611584a2e5fde2472cdbce
</span>Author: Jonathan Stickel <jjstickel@gmail.com>
AuthorDate: Mon Aug 26 15:12:31 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> ipe: update to version 7.2.29
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 7.2.29
</span><span style='display:block; white-space:pre;color:#404040;'> * update ipe-tools to 7.2.24.1
</span><span style='display:block; white-space:pre;color:#404040;'> * remove qt variants
</span><span style='display:block; white-space:pre;color:#404040;'> * add ipetoipe to $prefix/bin
</span><span style='display:block; white-space:pre;color:#404040;'> * add jjstickel to maintainer
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64422
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60911
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68666
</span>---
graphics/ipe-tools/Portfile | 27 ++++---
.../files/patch-svgtoipe-svgtoipe.py.diff | 2 +-
graphics/ipe-tools/files/pdftoipe-c++20.patch | 13 ++++
.../files/pdftoipe-fix-building-with-poppler.patch | 36 +++++++++
.../files/pdftoipe-fix-poppler-xmloutput.patch | 24 ++++++
graphics/ipe/Portfile | 87 +++++++---------------
graphics/ipe/files/fix-missing-cstdlib.patch | 11 ---
graphics/ipe/files/ipetoipe.in | 2 +
8 files changed, 119 insertions(+), 83 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe-tools/Portfile b/graphics/ipe-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f69faa76e8..4caebeac81f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ipe-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,12 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup otfried ipe-tools e5b23399a83d69fd5bb5d4645ef7325b4b57435b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20151202
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup otfried ipe-tools 7.2.24.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
maintainers {gmx.de:Torsten.Maehne @maehne} \
openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license {GPL-2 GPL-3}
description Tools for the Ipe extensible drawing editor
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,20 +17,26 @@ long_description The following tools for the Ipe extensible drawing \
</span> editor are provided: \
svgtoipe, pdftoipe, figtoipe, ipe5toxml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://ipe.otfried.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://ipe.otfried.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0d86d01aa3e6d3038bab29e385342d2d98303892 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1cf2f639c434f2239fd7ecd4e059f4c8912109e65d81bf7fbb1c34b71aeb708e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 239310
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 a650856f7123fe68499f20bbe66695cb040306f7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9ee6d4eb84455d55a36d24e2233de9f6a25a21f7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pdftoipe patches from https://aur.archlinux.org/packages/ipe-tools-git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-svgtoipe-svgtoipe.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdftoipe-c++20.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdftoipe-fix-building-with-poppler.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdftoipe-fix-poppler-xmloutput.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-svgtoipe-svgtoipe.py.diff
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MP_PYTHON_BIN__|${prefix}/bin/python2.7|" ${worksrcpath}/svgtoipe/svgtoipe.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MP_PYTHON_BIN__|${prefix}/bin/python3|" ${worksrcpath}/svgtoipe/svgtoipe.py
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.pkgd ${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.pkgd ${frameworks_dir}/Python.framework/Versions/3.12/lib/python3.12/site-packages
</span> depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/poppler.pc:poppler \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${python.pkgd}/PIL:py27-Pillow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${python.pkgd}/PIL:py312-Pillow
</span>
use_configure no
use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe-tools/files/patch-svgtoipe-svgtoipe.py.diff b/graphics/ipe-tools/files/patch-svgtoipe-svgtoipe.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ef8442e490..c221355ec9f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ipe-tools/files/patch-svgtoipe-svgtoipe.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe-tools/files/patch-svgtoipe-svgtoipe.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ index 45f3e98..9f2b5ed 100644
</span> --- svgtoipe/svgtoipe.py
+++ svgtoipe/svgtoipe.py
@@ -1,4 +1,4 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span> +#!__MP_PYTHON_BIN__
# --------------------------------------------------------------------
# convert SVG to Ipe format
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe-tools/files/pdftoipe-c++20.patch b/graphics/ipe-tools/files/pdftoipe-c++20.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ac14c12eb6e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe-tools/files/pdftoipe-c++20.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git pdftoipe/Makefile pdftoipe/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 349285d..d2e6f40 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pdftoipe/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pdftoipe/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET = pdftoipe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXXFLAGS += -Wno-write-strings -std=c++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS += -Wno-write-strings -std=c++20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: $(TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe-tools/files/pdftoipe-fix-building-with-poppler.patch b/graphics/ipe-tools/files/pdftoipe-fix-building-with-poppler.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..392ed04dd04
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe-tools/files/pdftoipe-fix-building-with-poppler.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git pdftoipe/pdftoipe.cpp pdftoipe/pdftoipe.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2e6ce77..bd2d86d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pdftoipe/pdftoipe.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pdftoipe/pdftoipe.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,22 +87,20 @@ int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (quiet)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ globalParams->setErrQuiet(quiet);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GooString *ownerPW, *userPW;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::optional<GooString> ownerPW, userPW;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ownerPassword[0]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ownerPW = new GooString(ownerPassword);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ownerPW = GooString(ownerPassword);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ownerPW = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ownerPW = std::nullopt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (userPassword[0]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- userPW = new GooString(userPassword);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ userPW = GooString(userPassword);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- userPW = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ userPW = std::nullopt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // open PDF file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PDFDoc *doc = new PDFDoc(fileName, ownerPW, userPW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- delete userPW;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- delete ownerPW;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PDFDoc *doc = new PDFDoc(std::make_unique<GooString>(fileName), ownerPW, userPW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!doc->isOk())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.36.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe-tools/files/pdftoipe-fix-poppler-xmloutput.patch b/graphics/ipe-tools/files/pdftoipe-fix-poppler-xmloutput.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cdf8a9cf70c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe-tools/files/pdftoipe-fix-poppler-xmloutput.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git pdftoipe/xmloutputdev.cpp pdftoipe/xmloutputdev.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 291eb5f..17bac2a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pdftoipe/xmloutputdev.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pdftoipe/xmloutputdev.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,15 +149,15 @@ void XmlOutputDev::stroke(GfxState *state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ writeColor("<path stroke=", rgb, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ writePSFmt(" pen=\"%g\"", state->getTransformedLineWidth());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *dash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int length, i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::vector<double> dash = state->getLineDash(&start);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int length = dash.size();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- state->getLineDash(&dash, &length, &start);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (length) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ writePS(" dash=\"[");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < length; ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- writePSFmt("%g%s", state->transformWidth(dash[i]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ writePSFmt("%g%s", state->transformWidth(dash.at(i)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (i == length-1) ? "" : " ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ writePSFmt("] %g\"", state->transformWidth(start));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe/Portfile b/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c0e8145e86..e7e8d51fdff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,14 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name ipe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.2.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup otfried ipe 7.2.29 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:jjstickel @jjstickel} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span> description The Ipe extensible drawing editor
long_description \
Ipe is a drawing editor for creating figures in PDF or \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,45 +17,28 @@ long_description \
</span> multi-page PDF presentations that can be shown on-line with \
Acrobat Reader.
license GPL-3+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://ipe.otfried.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://ipe.otfried.org
</span> platforms macosx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://dl.bintray.com/otfried/generic/ipe/${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> worksrcdir ${name}-${version}/src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 eaa2b9fc1a923a78b14e1c1c27f8ffc139febe0e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a22dcae9cb660f466678a6b568e9fed1b12a3830e49465594d65fc789b0ba725 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1950071
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3aab1c281c938f10c80d29d23c46df963c645b8c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2d7e87ad8a2a84c33bca16dd2cc6c91b4aa931500a6ad0b7970bc7d2d7955e1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 932128
</span>
depends_build-append port:pkgconfig
depends_lib-append port:freetype \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsl \
</span> path:lib/pkgconfig/cairo.pc:cairo \
port:lua \
port:libpng \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libspiro \
</span> port:zlib
use_configure no
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args-replace -p0 -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix missing cstdlib include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/otfried/ipe-issues/issues/240
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles fix-missing-cstdlib.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt4 conflicts qt5 description {Build using Qt4 based gui} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append QT_CFLAGS="`pkg-config --cflags QtGui QtCore`" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_LIBS="`pkg-config --libs QtGui QtCore`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 conflicts qt4 description {Build using Qt5 based gui} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant qvoronoi description {Add qvoronoi ipelet} {
depends_lib-append port:qhull
build.args-append IPEQVORONOI=1 QHULL_CFLAGS=-I${prefix}/include/libqhull_r
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,45 +54,28 @@ pre-build {
</span> CXX=${configure.cxx} \
LUA_PACKAGE="lua" \
JPEG_LIBS="-framework ApplicationServices" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- IPECONFIGMAK="config.mak"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:${qt_pkg_config_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append IPEUI="QT" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOC=${qt_moc_cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append IPEBUNDLE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IPECONFIGMAK="config.mak" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IPEBUNDLE=1
</span> }
use_parallel_build no
destroot.args-append IPEPREFIX=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- IPECONFIGMAK="config.mak"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append IPEUI="QT"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append IPEBUNDLE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IPECONFIGMAK="config.mak" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IPEBUNDLE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
platform macosx {
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set app Ipe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/${app}.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${filespath}/Info.plist.in ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/ipe ${destroot}${applications_dir}/${app}.app/Contents/MacOS/${app}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/ipe/ipe.icns ${destroot}${applications_dir}/${app}.app/Contents/Resources/ipe.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/../build/Ipe.app ${destroot}${applications_dir}/Ipe.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/local/bin|/usr/local/bin:${prefix}/bin|g" ${destroot}${applications_dir}/Ipe.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/ipe.in ${destroot}${prefix}/bin/ipe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@APPLICATIONSDIR@|${applications_dir}|g" ${destroot}${prefix}/bin/ipe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/../build/Ipe.app ${destroot}${applications_dir}/Ipe.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/local/bin|/usr/local/bin:${prefix}/bin|g" ${destroot}${applications_dir}/Ipe.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/ipe.in ${destroot}${prefix}/bin/ipe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@APPLICATIONSDIR@|${applications_dir}|g" ${destroot}${prefix}/bin/ipe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/ipetoipe.in ${destroot}${prefix}/bin/ipetoipe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@APPLICATIONSDIR@|${applications_dir}|g" ${destroot}${prefix}/bin/ipetoipe
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe/files/fix-missing-cstdlib.patch b/graphics/ipe/files/fix-missing-cstdlib.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3d300030fdd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ipe/files/fix-missing-cstdlib.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/ipelua/ipeluaipelet.cpp.orig 2019-04-17 11:57:38.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/ipelua/ipeluaipelet.cpp 2019-04-17 11:58:24.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,6 +36,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace ipe;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace ipelua;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe/files/ipetoipe.in b/graphics/ipe/files/ipetoipe.in
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..766a711742a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe/files/ipetoipe.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec @APPLICATIONSDIR@/Ipe.app/Contents/MacOS/ipetoipe "$@"
</span></pre><pre style='margin:0'>
</pre>