- Chase libming shared lib version bump

- Fix compile caused by libming update
- Fix potential crash
- Pet portlint while here

3 files changed, 94 insertions, 3 deletions

diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index bcb2d5c329ba..5e9572a974b0 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pencil
 PORTVERSION=	0.4.4b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}-planner/Pencil/${PORTVERSION}eta
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFFIX}
@@ -15,6 +15,8 @@ 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 \
 		png:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
@@ -25,8 +27,6 @@ LIB_DEPENDS+=	ming:${PORTSDIR}/graphics/ming \
 		pcre:${PORTSDIR}/devel/pcre \
 		drm:${PORTSDIR}/graphics/libdrm
 
-LICENSE=	GPLv2
-
 USE_ZIP=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	glib20
diff --git a/graphics/pencil/files/patch-src_external_flash_flash.cpp b/graphics/pencil/files/patch-src_external_flash_flash.cpp
new file mode 100644
index 000000000000..4e2177782b68
--- /dev/null
+++ b/graphics/pencil/files/patch-src_external_flash_flash.cpp
@@ -0,0 +1,76 @@
+--- src/external/flash/flash.cpp.orig	2011-08-10 01:23:59.000000000 +0000
++++ src/external/flash/flash.cpp	2011-08-10 01:39:01.000000000 +0000
+@@ -34,7 +34,7 @@
+ 	movie->setRate(fps); // 12 frames per seconds
+ 	
+   //SWFShape *shape = new SWFShape();
+-	SWFSprite *objectSprite = new SWFSprite();
++	SWFMovieClip *objectSprite = new SWFMovieClip();
+ 	
+ 	for(int i=0; i < object->getLayerCount(); i++) {
+ 		Layer* layer = object->getLayer(i);
+@@ -42,14 +42,14 @@
+ 			// paints the bitmap images
+ 			if(layer->type == Layer::BITMAP) {
+ 				LayerBitmap* layerBitmap = (LayerBitmap*)layer;
+-				SWFSprite *layerSprite = new SWFSprite();
++				SWFMovieClip *layerSprite = new SWFMovieClip();
+ 				SWFDisplayItem *previousItem = NULL;
+ 				for(int frameNumber = startFrame; frameNumber <= endFrame; frameNumber++) {
+ 					BitmapImage* bitmapImage = layerBitmap->getBitmapImageAtFrame(frameNumber);
+ 					if(bitmapImage != NULL) {
+ 						if(previousItem != NULL) layerSprite->remove( previousItem );
+-						SWFSprite *imageSprite = new SWFSprite();
+-						convertToSWFSprite( bitmapImage, object, view, imageSprite);
++						SWFMovieClip *imageSprite = new SWFMovieClip();
++						convertToSWFMovieClip( bitmapImage, object, view, imageSprite);
+ 						previousItem = layerSprite->add( imageSprite );
+ 					}
+ 					layerSprite->nextFrame();
+@@ -61,14 +61,14 @@
+ 			// paints the vector images
+ 			if(layer->type == Layer::VECTOR) {
+ 				LayerVector* layerVector = (LayerVector*)layer;
+-				SWFSprite *layerSprite = new SWFSprite();
++				SWFMovieClip *layerSprite = new SWFMovieClip();
+ 				SWFDisplayItem *previousItem = NULL;
+ 				for(int frameNumber = startFrame; frameNumber <= endFrame; frameNumber++) {
+ 					VectorImage* vectorImage = layerVector->getVectorImageAtFrame(frameNumber);
+ 					if(vectorImage != NULL) {
+ 						if(previousItem != NULL) layerSprite->remove( previousItem );
+-						SWFSprite *sprite = new SWFSprite();
+-						convertToSWFSprite( vectorImage, object, view, sprite);
++						SWFMovieClip *sprite = new SWFMovieClip();
++						convertToSWFMovieClip( vectorImage, object, view, sprite);
+ 						previousItem = layerSprite->add( sprite );
+ 					}
+ 					layerSprite->nextFrame();
+@@ -98,8 +98,8 @@
+ }
+ 
+ 
+-void Flash::convertToSWFSprite( BitmapImage* bitmapImage, Object* object, QMatrix view, SWFSprite* sprite ) {
+-	QString tempPath = QDir::tempPath()+"penciltemp.png";
++void Flash::convertToSWFMovieClip( BitmapImage* bitmapImage, Object* object, QMatrix view, SWFMovieClip* sprite ) {
++	QString tempPath = QDir::tempPath()+"/penciltemp.png";
+ 	QByteArray tempPath2( tempPath.toLatin1());
+ 	bitmapImage->image->save( tempPath , "PNG");
+ 	SWFShape *shape = new SWFShape();
+@@ -118,7 +118,7 @@
+ }
+ 
+ 
+-void Flash::convertToSWFSprite( VectorImage* vectorImage, Object* object, QMatrix view, SWFSprite* sprite ) {
++void Flash::convertToSWFMovieClip( VectorImage* vectorImage, Object* object, QMatrix view, SWFMovieClip* sprite ) {
+ 	
+ 	// add filled areas
+ 	for(int i=0; i< vectorImage->area.size(); i++) {
+@@ -146,7 +146,7 @@
+ 
+ 
+ 
+-void Flash::addShape( SWFSprite* sprite, QPainterPath path, QColor fillColour, QColor borderColour, qreal width, bool fill ) {
++void Flash::addShape( SWFMovieClip* sprite, QPainterPath path, QColor fillColour, QColor borderColour, qreal width, bool fill ) {
+ 	SWFShape* shape = new SWFShape();
+ 	//float widthf = static_cast< float >(width);
+ 	if(width == 0.0) {
diff --git a/graphics/pencil/files/patch-src_external_flash_flash.h b/graphics/pencil/files/patch-src_external_flash_flash.h
new file mode 100644
index 000000000000..3509722a32e3
--- /dev/null
+++ b/graphics/pencil/files/patch-src_external_flash_flash.h
@@ -0,0 +1,15 @@
+--- src/external/flash/flash.h.orig	2007-07-01 16:43:08.000000000 +0000
++++ src/external/flash/flash.h	2011-08-10 01:34:57.000000000 +0000
+@@ -33,9 +33,9 @@
+ {	
+ 	public:
+ 		static void exportFlash(Object* object, int startFrame, int endFrame, QMatrix view, QSize exportSize, QString filePath, int fps, int compression);
+-		static void convertToSWFSprite( BitmapImage* image, Object* object, QMatrix view, SWFSprite* sprite );
+-		static void convertToSWFSprite( VectorImage* vectorImage, Object* object, QMatrix view, SWFSprite* sprite );
+-		static void addShape( SWFSprite* sprite, QPainterPath path, QColor fillColour, QColor borderColour, qreal width, bool fill );
++		static void convertToSWFMovieClip( BitmapImage* image, Object* object, QMatrix view, SWFMovieClip* sprite );
++		static void convertToSWFMovieClip( VectorImage* vectorImage, Object* object, QMatrix view, SWFMovieClip* sprite );
++		static void addShape( SWFMovieClip* sprite, QPainterPath path, QColor fillColour, QColor borderColour, qreal width, bool fill );
+ };
+ 
+ #endif