From owner-svn-ports-head@FreeBSD.ORG Fri Jun 28 13:50:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D70A7C69; Fri, 28 Jun 2013 13:50:26 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B94511E19; Fri, 28 Jun 2013 13:50:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5SDoQA8071767; Fri, 28 Jun 2013 13:50:26 GMT (envelope-from martymac@svn.freebsd.org) Received: (from martymac@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5SDoPlN071763; Fri, 28 Jun 2013 13:50:25 GMT (envelope-from martymac@svn.freebsd.org) Message-Id: <201306281350.r5SDoPlN071763@svn.freebsd.org> From: Ganael LAPLANCHE Date: Fri, 28 Jun 2013 13:50:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321962 - in head/graphics/pencil: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2013 13:50:26 -0000 Author: martymac Date: Fri Jun 28 13:50:25 2013 New Revision: 321962 URL: http://svnweb.freebsd.org/changeset/ports/321962 Log: - Switch to new Makefile header format - Fix build with clang Added: head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp (contents, props changed) Modified: head/graphics/pencil/Makefile head/graphics/pencil/files/patch-pencil.pro (contents, props changed) Modified: head/graphics/pencil/Makefile ============================================================================== --- head/graphics/pencil/Makefile Fri Jun 28 13:10:29 2013 (r321961) +++ head/graphics/pencil/Makefile Fri Jun 28 13:50:25 2013 (r321962) @@ -1,13 +1,9 @@ -# 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} Modified: head/graphics/pencil/files/patch-pencil.pro ============================================================================== --- head/graphics/pencil/files/patch-pencil.pro Fri Jun 28 13:10:29 2013 (r321961) +++ head/graphics/pencil/files/patch-pencil.pro Fri Jun 28 13:50:25 2013 (r321962) @@ -1,6 +1,6 @@ ---- 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 } @@ -8,5 +8,9 @@ + 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 Added: head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp Fri Jun 28 13:50:25 2013 (r321962) @@ -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 ";