Fix build with GCC 4.5

4 files changed, 44 insertions, 11 deletions

diff --git a/graphics/kphotools/distinfo b/graphics/kphotools/distinfo
index 8608980bcba..b4f3efab48e 100644
--- a/graphics/kphotools/distinfo
+++ b/graphics/kphotools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/03/16 20:03:57 rillig Exp $
+$NetBSD: distinfo,v 1.5 2011/11/25 21:58:42 joerg Exp $
 
 SHA1 (kphotools-0.2.1.tar.bz2) = 51769be5e6d3533e409b4c24bfcc94fc46c9e169
 RMD160 (kphotools-0.2.1.tar.bz2) = 80d342fd45d0f1f19fc6a951f2127ee0542d4d3e
 Size (kphotools-0.2.1.tar.bz2) = 703387 bytes
-SHA1 (patch-aa) = 4b254fb9f0a9a1765f33dafdf76316962c4d562c
+SHA1 (patch-aa) = 80b988a8c24f36451a8a272b532e91ed8642dfcd
 SHA1 (patch-ab) = ef9ff406ff7fded74b82edcc67e7f684dfe8a227
 SHA1 (patch-ac) = 36c45d2e8321e94f3842cd59cceb5c64c26ac661
 SHA1 (patch-ad) = 005991fbd92a6a55f856cbcbb8440acc51a6c7fe
@@ -12,3 +12,5 @@ SHA1 (patch-af) = c45640848e877ad8ad455a1e9cfa225eb8d253a8
 SHA1 (patch-ag) = 02767da467413439844e6167ef1a470ffdebfca1
 SHA1 (patch-ah) = e145a89db623351c204f73acc38cb8062f66bdde
 SHA1 (patch-ai) = cb2343c51bf96928c7eb973e57ef50ef068f5f23
+SHA1 (patch-src_AlbumWid.h) = e464a1505a2338a04e51ed36ce650bfc4a9bb19d
+SHA1 (patch-src_GalleryThrd.h) = 9a7e26d0149423402c792a66df6c6d422ee4d0a6
diff --git a/graphics/kphotools/patches/patch-aa b/graphics/kphotools/patches/patch-aa
index 6d234f12fcf..17a6fa56b20 100644
--- a/graphics/kphotools/patches/patch-aa
+++ b/graphics/kphotools/patches/patch-aa
@@ -1,19 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2005/03/16 20:03:57 rillig Exp $
+$NetBSD: patch-aa,v 1.3 2011/11/25 21:58:42 joerg Exp $
 
 c++-2.95.3 does not know vector::at().
 
---- src/GalleryThrd.cpp.orig	Sat Jun 12 17:14:01 2004
-+++ src/GalleryThrd.cpp	Wed Mar 16 20:11:05 2005
-@@ -19,7 +19,7 @@
+--- src/GalleryThrd.cpp.orig	2004-06-12 15:14:01.000000000 +0000
++++ src/GalleryThrd.cpp
+@@ -19,7 +19,8 @@
   ***************************************************************************/
  #include <qdir.h> 
  #include "GalleryThrd.h"
 -
++#include <cstdlib>
 +#include <pkgsrc_fixes.h>
   
  void GalleryThrd::run()
  {
-@@ -105,14 +105,14 @@ void GalleryThrd::begin()
+@@ -105,14 +106,14 @@ void GalleryThrd::begin()
  	for(uint i = 0; i<files;i++)
  	{
  		//try loading image
@@ -30,21 +31,21 @@ c++-2.95.3 does not know vector::at().
  			//load sizes of the current image
  			orig_height = imlib_image_get_height();
  			orig_width = imlib_image_get_width();
-@@ -305,7 +305,7 @@ void GalleryThrd::doCreateWebsite(uint f
+@@ -305,7 +306,7 @@ void GalleryThrd::doCreateWebsite(uint f
  		if(strFiles[i][0] == 'f')//if is file copy it
  		{
  			strFiles[i].remove(0,1);
 -			system("cp /usr/share/kphotools/styles/"+m_strStyle+"/"+strFiles[i]+"  "+m_strLocation+"/"+strFiles[i]);
-+			system("cp @kphotoolsdir@/styles/"+m_strStyle+"/"+strFiles[i]+"  "+m_strLocation+"/"+strFiles[i]);
++			system("cp /usr/pkg/share/kde/apps/kphotools/styles/"+m_strStyle+"/"+strFiles[i]+"  "+m_strLocation+"/"+strFiles[i]);
  		}else if(strFiles[i][0] == 'd')//if is dir create it
  		{
  			strFiles[i].remove(0,1);
-@@ -319,7 +319,7 @@ void GalleryThrd::doCreateWebsite(uint f
+@@ -319,7 +320,7 @@ void GalleryThrd::doCreateWebsite(uint f
  QStringList GalleryThrd::readConfig()
  {
  	//load configuration for style
 -	QFile* pFile = new QFile("/usr/share/kphotools/styles/"+m_strStyle+"/config");
-+	QFile* pFile = new QFile("@kphotoolsdir@/styles/"+m_strStyle+"/config");
++	QFile* pFile = new QFile("/usr/pkg/share/kde/apps/kphotools/styles/"+m_strStyle+"/config");
  	pFile->open(IO_ReadOnly);
  	QStringList strList;
  	QString strLine = "";
diff --git a/graphics/kphotools/patches/patch-src_AlbumWid.h b/graphics/kphotools/patches/patch-src_AlbumWid.h
new file mode 100644
index 00000000000..015e1eee1ca
--- /dev/null
+++ b/graphics/kphotools/patches/patch-src_AlbumWid.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_AlbumWid.h,v 1.1 2011/11/25 21:58:42 joerg Exp $
+
+--- src/AlbumWid.h.orig	2011-11-25 19:16:22.000000000 +0000
++++ src/AlbumWid.h
+@@ -15,7 +15,7 @@
+ #include <qwidget.h>
+ #include <qdir.h>
+ #include <qfiledialog.h>
+-#include <vector.h>
++#include <vector>
+ #include <qwmatrix.h>
+ #include <qtabwidget.h>
+ #include <qcheckbox.h>
diff --git a/graphics/kphotools/patches/patch-src_GalleryThrd.h b/graphics/kphotools/patches/patch-src_GalleryThrd.h
new file mode 100644
index 00000000000..40465453e91
--- /dev/null
+++ b/graphics/kphotools/patches/patch-src_GalleryThrd.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_GalleryThrd.h,v 1.1 2011/11/25 21:58:42 joerg Exp $
+
+--- src/GalleryThrd.h.orig	2011-11-25 19:15:55.000000000 +0000
++++ src/GalleryThrd.h
+@@ -34,9 +34,11 @@
+ 
+ //needed datatypes
+ #include "FileItem.h"
+-#include <vector.h>
++#include <vector>
+ #include <qfile.h>
+ 
++using std::vector;
++
+ //class definition
+  class GalleryThrd  : public QThread{
+  	//private member vars