Index: head/graphics/pencil/Makefile =================================================================== --- head/graphics/pencil/Makefile (revision 321961) +++ head/graphics/pencil/Makefile (revision 321962) @@ -1,63 +1,59 @@ -# New ports collection makefile for: pencil -# Date created: 2008-04-16 -# Whom: Ganael Laplanche -# +# Created by: Ganael Laplanche # $FreeBSD$ -# PORTNAME= pencil PORTVERSION= 0.4.4b -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}-planner/Pencil/${PORTVERSION}eta DISTNAME= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFFIX} MAINTAINER= martymac@FreeBSD.org COMMENT= Pencil - a traditional 2D animation software LICENSE= GPLv2 LIB_DEPENDS+= ming:${PORTSDIR}/graphics/ming \ png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ iconv:${PORTSDIR}/converters/libiconv \ expat:${PORTSDIR}/textproc/expat2 \ pcre:${PORTSDIR}/devel/pcre \ drm:${PORTSDIR}/graphics/libdrm USE_ZIP= yes USES= gettext USE_GNOME= glib20 USE_QT4= gui moc_build qmake_build rcc_build xml_build opengl_build USE_XORG= xi xrender xrandr xfixes xcursor xinerama xext x11 xau xdmcp \ xxf86vm xdamage USE_GL= gl glu WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source PLIST_FILES= bin/pencil PORTDOCS= README TODO .include do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${QMAKE} -unix PREFIX=${PREFIX} \ INCLUDEPATH+=${LOCALBASE}/include/ming \ ${PORTNAME}.pro post-patch: @${MKDIR} ${WRKSRC}/src/external/freebsd @${CP} ${FILESDIR}/src-external-freebsd-freebsd.cpp \ ${WRKSRC}/src/external/freebsd/freebsd.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Pencil ${PREFIX}/bin/pencil .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} .endfor .endif .include Index: head/graphics/pencil/files/patch-pencil.pro =================================================================== --- head/graphics/pencil/files/patch-pencil.pro (revision 321961) +++ head/graphics/pencil/files/patch-pencil.pro (revision 321962) @@ -1,12 +1,16 @@ ---- pencil.pro.orig 2008-04-16 14:23:57.000000000 +0000 -+++ pencil.pro 2008-04-16 14:19:45.000000000 +0000 -@@ -86,5 +86,9 @@ +--- pencil.pro.orig 2008-01-20 10:04:02.000000000 +0100 ++++ pencil.pro 2013-06-26 15:47:47.000000000 +0200 +@@ -86,5 +86,13 @@ SOURCES += src/external/linux/linux.cpp LIBS += -Lliblinux -lming -lpng } +freebsd-g++ { ++ SOURCES += src/external/freebsd/freebsd.cpp ++ LIBS += -lming -lpng ++} ++freebsd-clang { + SOURCES += src/external/freebsd/freebsd.cpp + LIBS += -lming -lpng +} RESOURCES += pencil.qrc QT += xml opengl Property changes on: head/graphics/pencil/files/patch-pencil.pro ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp =================================================================== --- head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp (nonexistent) +++ head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp (revision 321962) @@ -0,0 +1,15 @@ +--- src/graphics/vector/beziercurve.cpp.orig 2013-06-26 10:46:07.000000000 +0200 ++++ src/graphics/vector/beziercurve.cpp 2013-06-26 10:40:02.000000000 +0200 +@@ -700,9 +700,9 @@ + R1.setTopLeft(P1); R1.setBottomRight(Q1); + R2.setTopLeft(P2); R2.setBottomRight(Q2); + +- //QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point +- //QPointF* intersection = &intersectionPoint; +- QPointF* cubicIntersection = &QPointF(50.0, 50.0); // bogus point ++ QPointF tmpIntersectionPoint = QPointF(50.0, 50.0); // bogus point ++ QPointF* cubicIntersection = &tmpIntersectionPoint; ++ //QPointF* cubicIntersection = &QPointF(50.0, 50.0); // bogus point + if( R1.intersects(R2) || L2.intersect(L1, cubicIntersection) == QLineF::BoundedIntersection ) { + //if(L2.intersect(L1, intersection) == QLineF::BoundedIntersection) { + //qDebug() << " FOUND rectangle intersection "; Property changes on: head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property