Fix template look up. Fix build with newer Qt4's qdoc3. Needs full

dependency on qt4-tools. Bump revision.

5 files changed, 134 insertions, 7 deletions

diff --git a/x11/qt4-creator/Makefile b/x11/qt4-creator/Makefile
index e88736d9800..fe100854eff 100644
--- a/x11/qt4-creator/Makefile
+++ b/x11/qt4-creator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2012/10/29 05:06:47 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/11/19 23:13:48 joerg Exp $
 
 DISTNAME=	qt-creator-2.0.1-src
 PKGNAME=	${DISTNAME:S/qt-/qt4-/:S/-src//}
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	http://get.qt.nokia.com/qtcreator/
 EXTRACT_SUFX=	.tgz
@@ -20,8 +20,7 @@ INSTALLATION_DIRS=	bin lib/qtcreator lib/qtcreator/plugins/Nokia \
 			share/doc/qtcreator share/pixmaps share/qtcreator \
 			share/qtcreator/translations
 
-BUILD_DEPENDS+=	qt4-tools>=4.7.0:../../x11/qt4-tools \
-		qt4-sqlite3>=4.7.0:../../x11/qt4-sqlite3
+BUILD_DEPENDS+=	qt4-sqlite3>=4.7.0:../../x11/qt4-sqlite3
 
 BUILD_TARGET=	make_default qch_docs
 MAKE_ENV+=	PREFIX=${PREFIX}
@@ -61,5 +60,7 @@ do-install:
                 ${INSTALL_DATA} "${WRKSRC}/share/qtcreator/{}" \
 		"${DESTDIR}${PREFIX}/share/qtcreator/{}" ";"
 
+BUILDLINK_DEPMETHOD.qt4-tools=	full
+
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt4-creator/distinfo b/x11/qt4-creator/distinfo
index 8d7509f5fd4..0c1a43502b0 100644
--- a/x11/qt4-creator/distinfo
+++ b/x11/qt4-creator/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2010/11/18 22:52:04 adam Exp $
+$NetBSD: distinfo,v 1.4 2012/11/19 23:13:48 joerg Exp $
 
 SHA1 (qt-creator-2.0.1-src.tgz) = 605bfe7876c4fa322544bc2314b059767eae407f
 RMD160 (qt-creator-2.0.1-src.tgz) = f33a58c926bd710b4688bb5292fa66c417e78070
 Size (qt-creator-2.0.1-src.tgz) = 18350214 bytes
-SHA1 (patch-aa) = 02e9af5be92a1ed526df1993944804ed51a4c852
+SHA1 (patch-aa) = 57b6fe2b9601aee03790c69e05004edcfd2c896f
 SHA1 (patch-ab) = f0acd533050e7f310dba5981eef0f51992d3a41c
 SHA1 (patch-ac) = 9f2427a642c5c4fb7204da2144bda1c04931e024
 SHA1 (patch-ad) = 2f3349e9e3ef5f1c784e3025ea0a520e4e452089
@@ -19,3 +19,5 @@ SHA1 (patch-am) = 075cfbe1b642f1913976c0cbdf40041e912b308b
 SHA1 (patch-an) = 9b2183299919cea25216143ffdd283e10654fdb7
 SHA1 (patch-ao) = 4359debaebeb4686b8b6b4efefb1f7b480c0287c
 SHA1 (patch-ap) = a96b4a03ce289870fe2a3102e1945e42a57a9459
+SHA1 (patch-src_libs_3rdparty_botan_build_botan_secmem.h) = aa781861ca11bc77486dfa8f95c1dd2dd90874db
+SHA1 (patch-src_plugins_coreplugin_mimedatabase.h) = 33f0d746566247b1866e8262b321bd741c234e0d
diff --git a/x11/qt4-creator/patches/patch-aa b/x11/qt4-creator/patches/patch-aa
index 45fb54bf3e6..b93b7e8050e 100644
--- a/x11/qt4-creator/patches/patch-aa
+++ b/x11/qt4-creator/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2010/11/18 22:52:04 adam Exp $
+$NetBSD: patch-aa,v 1.3 2012/11/19 23:13:48 joerg Exp $
 
 --- doc/doc.pri.orig	2010-08-24 07:46:09.000000000 +0000
 +++ doc/doc.pri
+@@ -21,7 +21,7 @@ HELP_DEP_FILES = $$PWD/qtcreator.qdoc \
+                  $$PWD/qt-html-templates.qdocconf \
+                  $$PWD/qtcreator.qdocconf
+ 
+-html_docs.commands = $$QDOC -creator $$PWD/qtcreator.qdocconf
++html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
+ html_docs.depends += $$HELP_DEP_FILES
+ html_docs.files = $$QHP_FILE
+ 
 @@ -33,7 +33,7 @@ qch_docs.depends += html_docs
  qch_docs.files = $$QCH_FILE
  
diff --git a/x11/qt4-creator/patches/patch-src_libs_3rdparty_botan_build_botan_secmem.h b/x11/qt4-creator/patches/patch-src_libs_3rdparty_botan_build_botan_secmem.h
new file mode 100644
index 00000000000..58ec2e8ebcf
--- /dev/null
+++ b/x11/qt4-creator/patches/patch-src_libs_3rdparty_botan_build_botan_secmem.h
@@ -0,0 +1,96 @@
+$NetBSD: patch-src_libs_3rdparty_botan_build_botan_secmem.h,v 1.1 2012/11/19 23:13:48 joerg Exp $
+
+--- src/libs/3rdparty/botan/build/botan/secmem.h.orig	2012-11-19 11:01:09.000000000 +0000
++++ src/libs/3rdparty/botan/build/botan/secmem.h
+@@ -307,7 +307,7 @@ class MemoryVector : public MemoryRegion
+       * @return a reference to *this
+       */
+       MemoryVector<T>& operator=(const MemoryRegion<T>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+ 
+       /**
+       * Create a buffer of the specified length.
+@@ -323,13 +323,13 @@ class MemoryVector : public MemoryRegion
+       * @param n the size of the arry in
+       */
+       MemoryVector(const T in[], u32bit n)
+-         { MemoryRegion<T>::init(false); set(in, n); }
++         { MemoryRegion<T>::init(false); this->set(in, n); }
+ 
+       /**
+       * Copy constructor.
+       */
+       MemoryVector(const MemoryRegion<T>& in)
+-         { MemoryRegion<T>::init(false); set(in); }
++         { MemoryRegion<T>::init(false); this->set(in); }
+ 
+       /**
+       * Create a buffer whose content is the concatenation of two other
+@@ -338,7 +338,7 @@ class MemoryVector : public MemoryRegion
+       * @param in2 the contents to be appended to in1
+       */
+       MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
+-         { MemoryRegion<T>::init(false); set(in1); append(in2); }
++         { MemoryRegion<T>::init(false); this->set(in1); this->append(in2); }
+    };
+ 
+ /**
+@@ -359,7 +359,7 @@ class SecureVector : public MemoryRegion
+       * @return a reference to *this
+       */
+       SecureVector<T>& operator=(const MemoryRegion<T>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+ 
+       /**
+       * Create a buffer of the specified length.
+@@ -375,7 +375,7 @@ class SecureVector : public MemoryRegion
+       * @param n the size of the array in
+       */
+       SecureVector(const T in[], u32bit n)
+-         { MemoryRegion<T>::init(true); set(in, n); }
++         { MemoryRegion<T>::init(true); this->set(in, n); }
+ 
+       /**
+       * Create a buffer with contents specified contents.
+@@ -383,7 +383,7 @@ class SecureVector : public MemoryRegion
+       * copied into the newly created buffer.
+       */
+       SecureVector(const MemoryRegion<T>& in)
+-         { MemoryRegion<T>::init(true); set(in); }
++         { MemoryRegion<T>::init(true); this->set(in); }
+ 
+       /**
+       * Create a buffer whose content is the concatenation of two other
+@@ -392,7 +392,7 @@ class SecureVector : public MemoryRegion
+       * @param in2 the contents to be appended to in1
+       */
+       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
+-         { MemoryRegion<T>::init(true); set(in1); append(in2); }
++         { MemoryRegion<T>::init(true); this->set(in1); this->append(in2); }
+    };
+ 
+ /**
+@@ -413,7 +413,7 @@ class SecureBuffer : public MemoryRegion
+       * @return a reference to *this
+       */
+       SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+ 
+       /**
+       * Create a buffer of the length L.
+@@ -427,10 +427,10 @@ class SecureBuffer : public MemoryRegion
+       * @param n the size of the array in
+       */
+       SecureBuffer(const T in[], u32bit n)
+-         { MemoryRegion<T>::init(true, L); copy(in, n); }
++         { MemoryRegion<T>::init(true, L); this->copy(in, n); }
+    private:
+       SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+    };
+ 
+ }
diff --git a/x11/qt4-creator/patches/patch-src_plugins_coreplugin_mimedatabase.h b/x11/qt4-creator/patches/patch-src_plugins_coreplugin_mimedatabase.h
new file mode 100644
index 00000000000..9873dc8b284
--- /dev/null
+++ b/x11/qt4-creator/patches/patch-src_plugins_coreplugin_mimedatabase.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_plugins_coreplugin_mimedatabase.h,v 1.1 2012/11/19 23:13:48 joerg Exp $
+
+--- src/plugins/coreplugin/mimedatabase.h.orig	2012-11-19 11:22:27.000000000 +0000
++++ src/plugins/coreplugin/mimedatabase.h
+@@ -35,13 +35,13 @@
+ #include <QtCore/QSharedDataPointer>
+ #include <QtCore/QSharedPointer>
+ #include <QtCore/QByteArray>
++#include <QtCore/QFileInfo>
+ #include <QtCore/QMutex>
+ 
+ QT_BEGIN_NAMESPACE
+ class QIODevice;
+ class QRegExp;
+ class QDebug;
+-class QFileInfo;
+ QT_END_NAMESPACE
+ 
+ namespace Core {