[138777] trunk/dports/graphics/ipe
khindenburg at macports.org
khindenburg at macports.org
Sat Jul 18 15:34:40 PDT 2015
Revision: 138777
https://trac.macports.org/changeset/138777
Author: khindenburg at macports.org
Date: 2015-07-18 15:34:40 -0700 (Sat, 18 Jul 2015)
Log Message:
-----------
ipe: update to 7.1.8; remove unneeded patches; update homepage; maintainer #48323
Modified Paths:
--------------
trunk/dports/graphics/ipe/Portfile
trunk/dports/graphics/ipe/files/Info.plist.in
Removed Paths:
-------------
trunk/dports/graphics/ipe/files/ipe-cstdlib.patch
trunk/dports/graphics/ipe/files/patch-ipelets-qvoronoi-qvoronoi.cpp.diff
trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap.cpp.diff
trunk/dports/graphics/ipe/files/patch-ipelua-ipeluaipelet.cpp.diff
Modified: trunk/dports/graphics/ipe/Portfile
===================================================================
--- trunk/dports/graphics/ipe/Portfile 2015-07-18 22:19:54 UTC (rev 138776)
+++ trunk/dports/graphics/ipe/Portfile 2015-07-18 22:34:40 UTC (rev 138777)
@@ -5,7 +5,7 @@
PortGroup qt4 1.0
name ipe
-version 7.1.7
+version 7.1.8
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
maintainers gmail.com:m7.thon openmaintainer
@@ -17,16 +17,15 @@
multi-page PDF presentations that can be shown on-line with \
Acrobat Reader.
license GPL-3+
-homepage http://ipe7.sourceforge.net/
+homepage http://ipe.otfried.org
platforms darwin
-master_sites sourceforge:project/ipe7/ipe/${branch}
+master_sites https://github.com/otfried/ipe/raw/master/releases/${branch}
distname ${name}-${version}-src
worksrcdir ${name}-${version}/src
-checksums sha1 ace0628f9e8a1d752f4a1837ac705e0457498a00 \
- rmd160 e77099d2d24d195d4ef541311b6114dc38580dc8
+checksums sha1 52894af0493fbc8a9115effb6f4c82dd5d2f0c23 \
+ rmd160 ace0e161ac0ff0cd8ed79c154f0adc195b74dd1f
-
depends_lib-append port:freetype \
path:lib/pkgconfig/cairo.pc:cairo \
path:lib/pkgconfig/lua.pc:lua \
@@ -35,21 +34,14 @@
port:libpng \
port:zlib
-patchfiles patch-ipelib-ipebitmap.cpp.diff \
- patch-ipelets-qvoronoi-qvoronoi.cpp.diff \
- patch-ipelua-ipeluaipelet.cpp.diff
-
use_configure no
variant universal {}
variant qvoronoi description {Add qvoronoi ipelet} {
depends_lib-append port:qhull
- build.post_args subdirs="ipelib ipelets/lua ipelets/qvoronoi ipetoipe ipe6upgrade \
- ipeextract ipescript ipecairo iperender ipecanvas ipeview ipelua ipeui ipe" \
- QHULL_CFLAGS=-I${prefix}/include/qhull
- destroot.post_args subdirs="ipelib ipelets/lua ipelets/qvoronoi ipetoipe ipe6upgrade \
- ipeextract ipescript ipecairo iperender ipecanvas ipeview ipelua ipeui ipe"
+ build.post_args IPEQVORONOI=1 QHULL_CFLAGS=-I${prefix}/include/qhull
+ destroot.post_args IPEQVORONOI=1
}
default_variants +qvoronoi
Modified: trunk/dports/graphics/ipe/files/Info.plist.in
===================================================================
--- trunk/dports/graphics/ipe/files/Info.plist.in 2015-07-18 22:19:54 UTC (rev 138776)
+++ trunk/dports/graphics/ipe/files/Info.plist.in 2015-07-18 22:34:40 UTC (rev 138777)
@@ -25,7 +25,7 @@
<key>CFBundleTypeIconFile</key>
<string>ipe.icns</string>
<key>LSHandlerRank</key>
- <string>Altpoernate</string>
+ <string>Alternate</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleTypeExtensions</key>
@@ -57,7 +57,7 @@
<key>LSEnvironment</key>
<dict>
<key>PATH</key>
- <string>/usr/texbin:@PREFIX@/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin</string>
+ <string>@PREFIX@/bin:/bin:/usr/bin:/usr/local/bin:/usr/texbin:/usr/local/texbin</string>
</dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
@@ -66,9 +66,13 @@
<key>CFBundleIconFile</key>
<string>ipe.icns</string>
<key>CFBundleIdentifier</key>
- <string>net.sourceforge.ipe7</string>
+ <string>org.otfried.ipe</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>NSHighResolutionCapable</key>
+ <string>True</string>
<key>CFBundleName</key>
<string>Ipe</string>
<key>CFBundlePackageType</key>
@@ -76,10 +80,10 @@
<key>CFBundleShortVersionString</key>
<string>@VERSION@</string>
<key>CFBundleSignature</key>
- <string>Ipe7</string>
+ <string>Ipe</string>
<key>CFBundleVersion</key>
<string>@VERSION@</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright (C) 1993-2011 Otfried Cheong</string>
+ <string>Copyright (C) 1993-2015 Otfried Cheong</string>
</dict>
</plist>
Deleted: trunk/dports/graphics/ipe/files/ipe-cstdlib.patch
===================================================================
--- trunk/dports/graphics/ipe/files/ipe-cstdlib.patch 2015-07-18 22:19:54 UTC (rev 138776)
+++ trunk/dports/graphics/ipe/files/ipe-cstdlib.patch 2015-07-18 22:34:40 UTC (rev 138777)
@@ -1,74 +0,0 @@
-# HG changeset patch
-# User Dmitriy Morozov <dmitriy at mrzv.org>
-# Date 1386530827 28800
-# Sun Dec 08 11:27:07 2013 -0800
-# Node ID 7735472cbe2e12dad85b8893c868dfef0d04535f
-# Parent dd418d42760b2f48f127c429d6001522c50576c3
-Missing #include <cstdlib>
-
-diff -r dd418d42760b -r 7735472cbe2e ipe6upgrade/ipe6upgrade.cpp
---- ipe6upgrade/ipe6upgrade.cpp Sun Dec 08 11:26:40 2013 -0800
-+++ ipe6upgrade/ipe6upgrade.cpp Sun Dec 08 11:27:07 2013 -0800
-@@ -30,6 +30,7 @@
-
- #include "ipexml.h"
- #include "ipeattributes.h"
-+#include <cstdlib>
-
- using namespace ipe;
-
-diff -r dd418d42760b -r 7735472cbe2e ipeextract/ipeextract.cpp
---- ipeextract/ipeextract.cpp Sun Dec 08 11:26:40 2013 -0800
-+++ ipeextract/ipeextract.cpp Sun Dec 08 11:27:07 2013 -0800
-@@ -31,6 +31,7 @@
- #include "ipexml.h"
- #include "ipeutils.h"
- #include "ipepdfparser.h"
-+#include <cstdlib>
-
- using namespace ipe;
-
-diff -r dd418d42760b -r 7735472cbe2e ipelib/ipebase.cpp
---- ipelib/ipebase.cpp Sun Dec 08 11:26:40 2013 -0800
-+++ ipelib/ipebase.cpp Sun Dec 08 11:27:07 2013 -0800
-@@ -30,6 +30,7 @@
-
- #include "ipebase.h"
- #include <cmath>
-+#include <cstdlib>
-
- using namespace ipe;
-
-diff -r dd418d42760b -r 7735472cbe2e ipelib/ipelatex.cpp
---- ipelib/ipelatex.cpp Sun Dec 08 11:26:40 2013 -0800
-+++ ipelib/ipelatex.cpp Sun Dec 08 11:27:07 2013 -0800
-@@ -34,6 +34,7 @@
-
- #include "ipefontpool.h"
- #include "ipelatex.h"
-+#include <cstdlib>
-
- using namespace ipe;
-
-diff -r dd418d42760b -r 7735472cbe2e ipelib/ipepdfparser.cpp
---- ipelib/ipepdfparser.cpp Sun Dec 08 11:26:40 2013 -0800
-+++ ipelib/ipepdfparser.cpp Sun Dec 08 11:27:07 2013 -0800
-@@ -30,6 +30,7 @@
-
- #include "ipepdfparser.h"
- #include "ipeutils.h"
-+#include <cstdlib>
-
- using namespace ipe;
-
-diff -r dd418d42760b -r 7735472cbe2e ipetoipe/ipetoipe.cpp
---- ipetoipe/ipetoipe.cpp Sun Dec 08 11:26:40 2013 -0800
-+++ ipetoipe/ipetoipe.cpp Sun Dec 08 11:27:07 2013 -0800
-@@ -29,6 +29,7 @@
- */
-
- #include "ipedoc.h"
-+#include <cstdlib>
-
- using ipe::Document;
- using ipe::String;
Deleted: trunk/dports/graphics/ipe/files/patch-ipelets-qvoronoi-qvoronoi.cpp.diff
===================================================================
--- trunk/dports/graphics/ipe/files/patch-ipelets-qvoronoi-qvoronoi.cpp.diff 2015-07-18 22:19:54 UTC (rev 138776)
+++ trunk/dports/graphics/ipe/files/patch-ipelets-qvoronoi-qvoronoi.cpp.diff 2015-07-18 22:34:40 UTC (rev 138777)
@@ -1,12 +0,0 @@
---- ipelets/qvoronoi/qvoronoi.cpp.orig 2015-03-27 12:21:50.000000000 +0100
-+++ ipelets/qvoronoi/qvoronoi.cpp 2015-03-27 12:22:16.000000000 +0100
-@@ -29,7 +29,8 @@
- */
-
- #include <stdio.h>
--#include <stdlib.h>
-+#include <cstdlib>
-+
-
- extern "C" {
- #include "qhull_a.h"
Deleted: trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap.cpp.diff
===================================================================
--- trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap.cpp.diff 2015-07-18 22:19:54 UTC (rev 138776)
+++ trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap.cpp.diff 2015-07-18 22:34:40 UTC (rev 138777)
@@ -1,87 +0,0 @@
---- ipelib/ipebitmap.cpp.orig 2015-03-27 12:12:31.000000000 +0100
-+++ ipelib/ipebitmap.cpp 2015-03-27 12:15:36.000000000 +0100
-@@ -32,7 +32,10 @@
- #include "ipeutils.h"
- #include <zlib.h>
-
--#include <turbojpeg.h>
-+#include <cstdio>
-+#include <csetjmp>
-+#include <jpeglib.h>
-+
- #include <png.h>
-
- using namespace ipe;
-@@ -332,36 +335,47 @@
-
- // --------------------------------------------------------------------
-
-+// The following is error-handling code for decopressing jpeg using the
-+// standard libjpeg API. Taken from the example.c and stackoverflow.
-+struct jpegErrorManager {
-+ struct jpeg_error_mgr pub;
-+ jmp_buf setjmp_buffer;
-+};
-+char jpegLastErrorMsg[JMSG_LENGTH_MAX];
-+void jpegErrorExit (j_common_ptr cinfo) {
-+ jpegErrorManager *myerr = (jpegErrorManager*) cinfo->err;
-+ (*(cinfo->err->format_message)) (cinfo, jpegLastErrorMsg);
-+ longjmp(myerr->setjmp_buffer, 1);
-+}
-+
-+// Decode jpeg image using the standard libjpeg API with errorhandling
- bool dctDecode(Buffer dctData, Buffer pixelData, int components)
- {
-- tjhandle handle = tjInitDecompress();
-- if (!handle) {
-- ipeDebug("tjInitDecompress failed: %s", tjGetErrorStr());
-+ struct jpeg_decompress_struct cinfo;
-+ // Error handling:
-+ struct jpegErrorManager jerr;
-+ cinfo.err = jpeg_std_error(&jerr.pub);
-+ jerr.pub.error_exit = jpegErrorExit;
-+ if (setjmp(jerr.setjmp_buffer)) {
-+ ipeDebug("jpeg decompression failed: %s", jpegLastErrorMsg);
-+ jpeg_destroy_decompress(&cinfo);
- return false;
- }
--
-- int width, height, jpegSubsamp;
-- if (tjDecompressHeader2(handle, (uchar *) dctData.data(), dctData.size(),
-- &width, &height, &jpegSubsamp) < 0) {
-- ipeDebug("tjDecompressHeader2 failed: %s", tjGetErrorStr());
-- tjDestroy(handle);
-- return false;
-- }
--
-- int flags = 0;
-- // if (fast)
-- // flags |= TJFLAG_FASTDCT;
--
-- if (tjDecompress2(handle, (uchar *) dctData.data(), dctData.size(),
-- (uchar *) pixelData.data(),
-- width, components * width, height,
-- (components == 3) ? TJPF_RGB : TJPF_GRAY,
-- flags) < 0) {
-- ipeDebug("tjDecompress2 failed: %s", tjGetErrorStr());
-- tjDestroy(handle);
-- return false;
-+ // Decompression:
-+ jpeg_create_decompress(&cinfo);
-+ jpeg_mem_src(&cinfo, (unsigned char *) dctData.data(), dctData.size());
-+ jpeg_read_header(&cinfo, 1);
-+ cinfo.out_color_space = ((components == 3) ? JCS_RGB : JCS_GRAYSCALE);
-+ jpeg_start_decompress(&cinfo);
-+ while (cinfo.output_scanline < cinfo.output_height) {
-+ int row_stride = cinfo.output_width * cinfo.output_components;
-+ int index = cinfo.output_scanline * row_stride;
-+ unsigned char *buffer[1];
-+ buffer[0] = (unsigned char *) &(pixelData[index]);
-+ jpeg_read_scanlines(&cinfo, buffer, 1);
- }
-- tjDestroy(handle);
-+ jpeg_finish_decompress(&cinfo);
-+ jpeg_destroy_decompress(&cinfo);
- return true;
- }
-
Deleted: trunk/dports/graphics/ipe/files/patch-ipelua-ipeluaipelet.cpp.diff
===================================================================
--- trunk/dports/graphics/ipe/files/patch-ipelua-ipeluaipelet.cpp.diff 2015-07-18 22:19:54 UTC (rev 138776)
+++ trunk/dports/graphics/ipe/files/patch-ipelua-ipeluaipelet.cpp.diff 2015-07-18 22:34:40 UTC (rev 138777)
@@ -1,11 +0,0 @@
---- ipelua/ipeluaipelet.cpp.orig 2015-03-27 13:38:43.000000000 +0100
-+++ ipelua/ipeluaipelet.cpp 2015-03-27 13:39:02.000000000 +0100
-@@ -67,7 +67,7 @@
- #ifdef WIN32
- fname += ".dll";
- #else
-- fname += ".so";
-+ fname += ".dylib";
- #endif
- ipeDebug("Loading dll '%s'", fname.z());
- PNewIpeletFn pIpelet = 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150718/27143f25/attachment-0001.html>
More information about the macports-changes
mailing list