- Update to 7.1.5

PR:		190899

graphics/ipe/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ipe
-PORTVERSION=	7.1.4
+PORTVERSION=	7.1.5
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}${PORTVERSION:R:R}/${PORTNAME}/${PORTVERSION:R}
@@ -12,18 +12,18 @@ COMMENT=	Extensible vector graphics editor with Latex text support
 
 LICENSE=	GPLv3 # (or later)
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		liblua-5.2.so:${PORTSDIR}/lang/lua52
+LIB_DEPENDS=	liblua-5.2.so:${PORTSDIR}/lang/lua52
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
-OPTIONS_DEFINE=	DOCS
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-USES=		gmake iconv pkgconfig
+USES=		dos2unix gmake iconv pkgconfig
+DOS2UNIX_FILES=	ipelib/Makefile
+USE_GNOME=	cairo
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 USE_TEX=	latex
-MAKE_ENV=	DLL_CFLAGS="-fPIC" \
+MAKE_ENV=	DL_LIBS="" \
+		DLL_CFLAGS="-fPIC" \
 		ICONV_CFLAGS="-I${ICONV_PREFIX}/include" \
 		ICONV_LIBS="-L${ICONV_PREFIX}/lib ${ICONV_LIB}" \
 		INSTALL_DIR="${MKDIR}" \
@@ -35,6 +35,8 @@ MAKE_ENV=	DLL_CFLAGS="-fPIC" \
 		IPEDOCDIR="${DOCSDIR}" \
 		IPEMANDIR="${MANPREFIX}/man/man1" \
 		IPEPREFIX="${PREFIX}" \
+		JPEG_CFLAGS="-I${LOCALBASE}/include" \
+		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
 		LUA_CFLAGS="-I${LOCALBASE}/include/lua52" \
 		LUA_LIBS="-L${LOCALBASE}/lib -llua-5.2" \
 		MOC="${MOC}"
@@ -47,7 +49,7 @@ PORTDOCS=	*
 DESKTOP_ENTRIES="Ipe" "" "${DATADIR}/${PORTVERSION}/ipe.png" \
 		"${PORTNAME}" "" true
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@cd ${WRKSRC}/../fontmaps && ${SED} -e \
@@ -63,6 +65,8 @@ post-patch:
 		'/$$(INSTALL_ROOT)$$(IPEDOCDIR)/s|^|#|' ${WRKSRC}/ipe/Makefile
 	@${REINPLACE_CMD} -e \
 		'/%s/s|gnome-open|xdg-open|' ${WRKSRC}/ipe/lua/prefs.lua
+	@${REINPLACE_CMD} -e \
+		's|QT__H|QT_H|' ${WRKSRC}/ipeui/ipeui_qt.h
 
 post-install:
 	(cd ${WRKSRC}/../fontmaps && ${INSTALL_DATA} fontmap.xml \

graphics/ipe/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ipe-7.1.4-src.tar.gz) = 50ccd74064595a7bbaa93ef8f8a9988fd4be31fd545ce9c6e85c604e0c8a44eb
-SIZE (ipe-7.1.4-src.tar.gz) = 1502198
+SHA256 (ipe-7.1.5-src.tar.gz) = fe63a0511bd52d4e256b06f35ce8abc5610267a10594280ca0aaaf15c6e27b1a
+SIZE (ipe-7.1.5-src.tar.gz) = 1609566

graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp

@@ -1,11 +0,0 @@
---- ipe6upgrade/ipe6upgrade.cpp.orig
-+++ ipe6upgrade/ipe6upgrade.cpp
-@@ -30,6 +30,8 @@
- 
- #include "ipexml.h"
- #include "ipeattributes.h"
-+#include <cstdlib>
-+#include <sys/types.h>
- 
- using namespace ipe;
- 

graphics/ipe/files/patch-ipeextract__ipeextract.cpp

@@ -1,10 +0,0 @@
---- ipeextract/ipeextract.cpp.orig
-+++ ipeextract/ipeextract.cpp
-@@ -31,6 +31,7 @@
- #include "ipexml.h"
- #include "ipeutils.h"
- #include "ipepdfparser.h"
-+#include <cstdlib>
- 
- using namespace ipe;
- 

graphics/ipe/files/patch-ipelib__Makefile

@@ -0,0 +1,10 @@
+--- ipelib/Makefile.orig
++++ ipelib/Makefile
+@@ -27,6 +27,7 @@
+ 	ipexml.cpp \
+ 	ipeattributes.cpp \
+ 	ipebitmap.cpp \
++	ipedct.cpp \
+ 	ipeshape.cpp \
+ 	ipegroup.cpp \
+ 	ipeimage.cpp \

graphics/ipe/files/patch-ipelib__ipebase.cpp

@@ -1,12 +0,0 @@
---- ipelib/ipebase.cpp.orig
-+++ ipelib/ipebase.cpp
-@@ -29,7 +29,9 @@
- */
- 
- #include "ipebase.h"
-+#include <cstdlib>
- #include <cmath>
-+#include <sys/types.h>
- 
- using namespace ipe;
- 

graphics/ipe/files/patch-ipelib__ipebitmap.cpp

@@ -0,0 +1,47 @@
+--- ipelib/ipebitmap.cpp.orig
++++ ipelib/ipebitmap.cpp
+@@ -32,10 +32,16 @@
+ #include "ipeutils.h"
+ #include <zlib.h>
+ 
++#if 0
+ #include <turbojpeg.h>
++#endif
+ 
+ using namespace ipe;
+ 
++#if 1
++extern bool dctDecode(Buffer dctData, Buffer pixelData);
++#endif
++
+ // --------------------------------------------------------------------
+ 
+ /*! \class ipe::Bitmap::MRenderData
+@@ -331,6 +337,7 @@
+ 
+ // --------------------------------------------------------------------
+ 
++#if 0
+ bool dctDecode(Buffer dctData, Buffer pixelData, int components)
+ {
+   tjhandle handle = tjInitDecompress();
+@@ -363,6 +370,7 @@
+   tjDestroy(handle);
+   return true;
+ }
++#endif
+ 
+ //! Convert bitmap data to a height x width pixel array in rgb format.
+ /*! Returns empty buffer if it cannot decode the bitmap information.
+@@ -387,7 +395,11 @@
+       return Buffer();
+   } else if (filter() == EDCTDecode) {
+     pixels = Buffer(width() * height() * components());
++#if 0
+     if (!dctDecode(stream, pixels, components()))
++#else
++    if (!dctDecode(stream, pixels))
++#endif
+       return Buffer();
+   }
+   Buffer data(height() * width() * sizeof(uint));

graphics/ipe/files/patch-ipelib__ipepdfparser.cpp

@@ -1,10 +0,0 @@
---- ipelib/ipepdfparser.cpp.orig
-+++ ipelib/ipepdfparser.cpp
-@@ -30,6 +30,7 @@
- 
- #include "ipepdfparser.h"
- #include "ipeutils.h"
-+#include <cstdlib>
- 
- using namespace ipe;
- 

graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp

@@ -1,10 +0,0 @@
---- ipetoipe/ipetoipe.cpp.orig
-+++ ipetoipe/ipetoipe.cpp
-@@ -29,6 +29,7 @@
- */
- 
- #include "ipedoc.h"
-+#include <cstdlib>
- 
- using ipe::Document;
- using ipe::String;