Added workaround for missing std::vector.at() in libc++-2. Approved by wiz.

2 files changed, 54 insertions, 3 deletions

diff --git a/graphics/kphotools/patches/patch-aa b/graphics/kphotools/patches/patch-aa
index 39b83e491b9..6d234f12fcf 100644
--- a/graphics/kphotools/patches/patch-aa
+++ b/graphics/kphotools/patches/patch-aa
@@ -1,7 +1,35 @@
-$NetBSD: patch-aa,v 1.1 2004/07/31 22:30:12 markd Exp $
+$NetBSD: patch-aa,v 1.2 2005/03/16 20:03:57 rillig Exp $
 
---- src/GalleryThrd.cpp.orig	2004-06-13 03:14:01.000000000 +1200
-+++ src/GalleryThrd.cpp
+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 @@
+  ***************************************************************************/
+ #include <qdir.h> 
+ #include "GalleryThrd.h"
+-
++#include <pkgsrc_fixes.h>
+  
+ void GalleryThrd::run()
+ {
+@@ -105,14 +105,14 @@ void GalleryThrd::begin()
+ 	for(uint i = 0; i<files;i++)
+ 	{
+ 		//try loading image
+-		image = imlib_load_image_without_cache(m_pvecFileList->at(i)->fileName);
++		image = imlib_load_image_without_cache(at_replacement(*m_pvecFileList, i)->fileName);
+ 		//if files was loaded:
+ 		if (image)
+ 		{   
+ 			//set the context to this image
+ 			imlib_context_set_image(image);
+ 			//rotate it as needed
+-			imlib_image_orientate(m_pvecFileList->at(i)->rotation);
++			imlib_image_orientate(at_replacement(*m_pvecFileList, i)->rotation);
+ 			//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
  		if(strFiles[i][0] == 'f')//if is file copy it
  		{
diff --git a/graphics/kphotools/patches/patch-ai b/graphics/kphotools/patches/patch-ai
new file mode 100644
index 00000000000..0be27991d39
--- /dev/null
+++ b/graphics/kphotools/patches/patch-ai
@@ -0,0 +1,23 @@
+$NetBSD: patch-ai,v 1.1 2005/03/16 20:03:57 rillig Exp $
+
+c++-2.95.3 does not know vector::at().
+
+--- src/AlbumWid.ui.h.orig	Thu Jun  3 20:53:22 2004
++++ src/AlbumWid.ui.h	Wed Mar 16 20:22:58 2005
+@@ -26,6 +26,7 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ 
++#include <pkgsrc_fixes.h>
+ 
+ void AlbumWid::init()
+ {
+@@ -88,7 +89,7 @@ void AlbumWid::onRemoveAll()
+ 	//run through the vector and delete each item
+ 	for(uint i = 0;i<m_vecFileList.size();i++)
+ 	{
+-		delete m_vecFileList.at(i);
++		delete at_replacement(m_vecFileList, i);
+ 	}
+ 	//clear vector
+ 	m_vecFileList.clear();